support the uhhh localskin setup with 3d models
This commit is contained in:
1 parent
193f9630ea
commit
f2e959a515
1 file changed
+28
-6
+28
-6
@@ -9892,12 +9892,12 @@ static void M_DrawLocalSkinMenu(void)
|
||||
// skin 0 is default player sprite
|
||||
skintodisplay = R_AnySkinAvailable(cv_fakelocalskin.string);
|
||||
|
||||
if (skintodisplay == -1)
|
||||
if (skintodisplay < 0)
|
||||
{
|
||||
// ATTEMPT TO FIND REAL SKIN
|
||||
skintodisplay = R_AnySkinAvailable(cv_skin.string);
|
||||
|
||||
if (skintodisplay == -1) // STILL NOTHIN? use sonic instead
|
||||
if (skintodisplay < 0) // STILL NOTHIN? use sonic instead
|
||||
{
|
||||
skintodisplay = 0;
|
||||
}
|
||||
@@ -9930,6 +9930,7 @@ static void M_DrawLocalSkinMenu(void)
|
||||
|
||||
// draw box around guy
|
||||
V_DrawFill(mx + 220 - (charw/2), my+54, charw, 84, 239);
|
||||
#undef charw
|
||||
|
||||
// draw player sprite
|
||||
UINT8 *colormap = R_GetLocalTranslationColormap(&skins[displayskin.localnum], (displayskin.localskin ? &localskins[displayskin.localnum] : NULL), cv_playercolor.value, GTC_MENUCACHE, displayskin.localskin);
|
||||
@@ -9944,13 +9945,34 @@ static void M_DrawLocalSkinMenu(void)
|
||||
else
|
||||
V_DrawString(mx+20, my+118, V_ALLOWLOWERCASE|highlightflags, displayskin.realname);
|
||||
|
||||
if (displayskin.flags & SF_HIRES)
|
||||
// draw player sprite
|
||||
#ifdef HWRENDER
|
||||
md2_t *md2 = (displayskin.localskin ? &md2_localplayermodels[skintodisplay] : &md2_playermodels[skintodisplay]);
|
||||
|
||||
// if we have 3d models enabled and a model exists
|
||||
// try to show it instead of the sprite
|
||||
if (rendermode == render_opengl && cv_glmdls.value
|
||||
&& !md2->error && !md2->notfound)
|
||||
{
|
||||
V_DrawFixedPatch((mx+220)<<FRACBITS, (my+120)<<FRACBITS, displayskin.highresscale, flags, patch, colormap);
|
||||
mx += 220;
|
||||
my += 120;
|
||||
|
||||
const angle_t ROTATE_PER_TIC = (UINT64)ANGLE_45 * cv_skinselectspin.value / TICRATE;
|
||||
|
||||
angle_t angle = I_GetTime()*ROTATE_PER_TIC + FixedMul(cv_uncappedhud.value ? renderdeltatics : FRACUNIT, ROTATE_PER_TIC);
|
||||
|
||||
HWR_Draw2DModel(md2, mx, my, skintodisplay, (skincolors_t)cv_playercolor.value, colormap, 8*FRACUNIT/3, frame, angle);
|
||||
}
|
||||
else
|
||||
V_DrawMappedPatch(mx+220, my+120, flags, patch, colormap);
|
||||
#undef charw
|
||||
#endif
|
||||
{
|
||||
if (displayskin.flags & SF_HIRES)
|
||||
{
|
||||
V_DrawFixedPatch((mx+220)<<FRACBITS, (my+120)<<FRACBITS, displayskin.highresscale, flags, patch, colormap);
|
||||
}
|
||||
else
|
||||
V_DrawMappedPatch(mx+220, my+120, flags, patch, colormap);
|
||||
}
|
||||
}
|
||||
|
||||
// Draw the video modes list, a-la-Quake
|
||||
|
||||
Reference in new issue
Block a user