mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-26 03:30:46 +00:00
Move "EVENT_DISPLAYREST" after "EVENT_DISPLAYCROSSHAIR".
Patch from Fox. git-svn-id: https://svn.eduke32.com/eduke32@6715 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
293491644f
commit
1adf766fac
1 changed files with 7 additions and 7 deletions
|
@ -1147,13 +1147,6 @@ void G_DisplayRest(int32_t smoothratio)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (VM_HaveEvent(EVENT_DISPLAYREST))
|
|
||||||
{
|
|
||||||
int32_t vr=viewingrange, asp=yxaspect;
|
|
||||||
VM_OnEvent_(EVENT_DISPLAYREST, g_player[screenpeek].ps->i, screenpeek);
|
|
||||||
setaspect(vr, asp);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (g_player[myconnectindex].ps->newowner == -1 && ud.overhead_on == 0 && ud.crosshair && ud.camerasprite == -1)
|
if (g_player[myconnectindex].ps->newowner == -1 && ud.overhead_on == 0 && ud.crosshair && ud.camerasprite == -1)
|
||||||
{
|
{
|
||||||
ud.returnvar[0] = (160<<16) - (g_player[myconnectindex].ps->look_ang<<15);
|
ud.returnvar[0] = (160<<16) - (g_player[myconnectindex].ps->look_ang<<15);
|
||||||
|
@ -1230,6 +1223,13 @@ void G_DisplayRest(int32_t smoothratio)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (VM_HaveEvent(EVENT_DISPLAYREST))
|
||||||
|
{
|
||||||
|
int32_t vr=viewingrange, asp=yxaspect;
|
||||||
|
VM_OnEvent_(EVENT_DISPLAYREST, g_player[screenpeek].ps->i, screenpeek);
|
||||||
|
setaspect(vr, asp);
|
||||||
|
}
|
||||||
|
|
||||||
if (ud.pause_on==1 && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0)
|
if (ud.pause_on==1 && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0)
|
||||||
menutext_center(100, "Game Paused");
|
menutext_center(100, "Game Paused");
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue