zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make the scuba HUD be affected by hud_weaponscale, tweak for fake multi.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2933 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-08-19 13:01:24 +00:00
parent 04ff274f77
commit 1ac7dd16be
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
polymer/eduke32/source/game.c
View file

@ -2643,12 +2643,13 @@ void G_DisplayRest(int32_t smoothratio)
else else
{ {
P_DisplayWeapon(screenpeek); P_DisplayWeapon(screenpeek);
if (pp2) // HACK
if (g_fakeMultiMode && ud.multimode==2) // HACK
P_DisplayWeapon(1); P_DisplayWeapon(1);
if (pp->over_shoulder_on == 0) if (pp->over_shoulder_on == 0)
P_DisplayScuba(screenpeek); P_DisplayScuba(screenpeek);
if (pp2 && pp2->over_shoulder_on == 0) // HACK
P_DisplayScuba(1);
} }
G_MoveClouds(); G_MoveClouds();
} }

5
polymer/eduke32/source/player.c
View file

@ -2257,8 +2257,9 @@ void P_DisplayScuba(int32_t snum)
{ {
int32_t p = get_hud_pal(g_player[snum].ps); int32_t p = get_hud_pal(g_player[snum].ps);
rotatesprite_win(43<<16,(200-tilesizy[SCUBAMASK])<<16,65536,0,SCUBAMASK,0,p,2+16); g_snum = snum;
rotatesprite_win((320-43)<<16,(200-tilesizy[SCUBAMASK])<<16,65536,1024,SCUBAMASK,0,p,2+4+16); G_DrawTileScaled(43, (200-tilesizy[SCUBAMASK]), SCUBAMASK, 0, 2+16+DRAWEAP_CENTER, p);
G_DrawTileScaled(320-43, (200-tilesizy[SCUBAMASK]), SCUBAMASK, 0, 2+4+16+DRAWEAP_CENTER, p);
} }
} }