G_HandleAsync() -> gameHandleEvents()

git-svn-id: https://svn.eduke32.com/eduke32@8140 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-10-19 23:41:40 +00:00 committed by Christoph Oelckers
parent 802f69d324
commit 85dd8e31a5
8 changed files with 25 additions and 25 deletions

View file

@ -398,7 +398,7 @@ int32_t Anim_Play(const char *fn)
do do
{ {
G_HandleAsync(); gameHandleEvents();
if (VM_OnEventWithReturn(EVENT_SKIPCUTSCENE, g_player[screenpeek].ps->i, screenpeek, I_GeneralTrigger())) if (VM_OnEventWithReturn(EVENT_SKIPCUTSCENE, g_player[screenpeek].ps->i, screenpeek, I_GeneralTrigger()))
{ {
@ -491,7 +491,7 @@ int32_t Anim_Play(const char *fn)
goto end_anim_restore_gl; goto end_anim_restore_gl;
} }
G_HandleAsync(); gameHandleEvents();
if (totalclock < ototalclock - 1) if (totalclock < ototalclock - 1)
continue; continue;

View file

@ -941,7 +941,7 @@ nextdemo_nomenu:
// NOTE: We must prevent handleevents() and Net_GetPackets() from // NOTE: We must prevent handleevents() and Net_GetPackets() from
// updating totalclock when profiling (both via sampletimer()): // updating totalclock when profiling (both via sampletimer()):
if (!Demo_IsProfiling()) if (!Demo_IsProfiling())
G_HandleAsync(); gameHandleEvents();
if (g_player[myconnectindex].ps->gm == MODE_GAME) if (g_player[myconnectindex].ps->gm == MODE_GAME)
{ {

View file

@ -6817,7 +6817,7 @@ MAIN_LOOP_RESTART:
do //main loop do //main loop
{ {
if (G_HandleAsync() && quitevent) if (gameHandleEvents() && quitevent)
{ {
KB_KeyDown[sc_Escape] = 1; KB_KeyDown[sc_Escape] = 1;
quitevent = 0; quitevent = 0;

View file

@ -440,7 +440,7 @@ extern int G_StartRTS(int lumpNum, int localPlayer);
extern void G_MaybeAllocPlayer(int32_t pnum); extern void G_MaybeAllocPlayer(int32_t pnum);
static inline int32_t G_HandleAsync(void) static inline int32_t gameHandleEvents(void)
{ {
Net_GetPackets(); Net_GetPackets();
return handleevents(); return handleevents();

View file

@ -4429,7 +4429,7 @@ void Net_WaitForInitialSnapshot()
{ {
while (g_netMapRevisionNumber < cStartingRevisionIndex) while (g_netMapRevisionNumber < cStartingRevisionIndex)
{ {
G_HandleAsync(); gameHandleEvents();
} }
} }
@ -4709,7 +4709,7 @@ void Net_WaitForServer(void)
} }
G_HandleAsync(); gameHandleEvents();
if (g_player[0].pingcnt > serverReady) if (g_player[0].pingcnt > serverReady)
{ {

View file

@ -470,7 +470,7 @@ void G_CacheMapData(void)
MUSIC_Update(); MUSIC_Update();
if ((++cnt & 7) == 0) if ((++cnt & 7) == 0)
G_HandleAsync(); gameHandleEvents();
if (videoGetRenderMode() != REND_CLASSIC && totalclock - clock > (TICRATE>>2)) if (videoGetRenderMode() != REND_CLASSIC && totalclock - clock > (TICRATE>>2))
{ {
@ -1337,12 +1337,12 @@ void G_NewGame(int volumeNum, int levelNum, int skillNum)
{ {
auto &p0 = *g_player[0].ps; auto &p0 = *g_player[0].ps;
G_HandleAsync(); gameHandleEvents();
if (ud.skill_voice > 0 && ud.config.SoundToggle) if (ud.skill_voice > 0 && ud.config.SoundToggle)
{ {
while (FX_SoundActive(ud.skill_voice)) while (FX_SoundActive(ud.skill_voice))
G_HandleAsync(); gameHandleEvents();
} }
ready2send = 0; ready2send = 0;

View file

@ -55,7 +55,7 @@ static void G_HandleEventsWhileNoInput(void)
I_ClearAllInput(); I_ClearAllInput();
while (!I_GeneralTrigger()) while (!I_GeneralTrigger())
G_HandleAsync(); gameHandleEvents();
I_ClearAllInput(); I_ClearAllInput();
} }
@ -66,7 +66,7 @@ static int32_t G_PlaySoundWhileNoInput(int32_t soundnum)
I_ClearAllInput(); I_ClearAllInput();
while (S_CheckSoundPlaying(soundnum)) while (S_CheckSoundPlaying(soundnum))
{ {
G_HandleAsync(); gameHandleEvents();
if (I_GeneralTrigger()) if (I_GeneralTrigger())
{ {
I_ClearAllInput(); I_ClearAllInput();
@ -1357,7 +1357,7 @@ void G_FadePalette(int32_t r, int32_t g, int32_t b, int32_t e)
int32_t tc = (int32_t) totalclock; int32_t tc = (int32_t) totalclock;
while (totalclock < tc + 4) while (totalclock < tc + 4)
G_HandleAsync(); gameHandleEvents();
} }
// START and END limits are always inclusive! // START and END limits are always inclusive!
@ -1438,7 +1438,7 @@ void gameDisplayTENScreen()
rotatesprite_fs(160 << 16, 100 << 16, 65536L, 0, TENSCREEN, 0, 0, 2 + 8 + 64 + BGSTRETCH); rotatesprite_fs(160 << 16, 100 << 16, 65536L, 0, TENSCREEN, 0, 0, 2 + 8 + 64 + BGSTRETCH);
fadepaltile(0, 0, 0, 252, 0, -28, TENSCREEN); fadepaltile(0, 0, 0, 252, 0, -28, TENSCREEN);
while (!I_GeneralTrigger() && totalclock < 2400) while (!I_GeneralTrigger() && totalclock < 2400)
G_HandleAsync(); gameHandleEvents();
fadepaltile(0, 0, 0, 0, 252, 28, TENSCREEN); fadepaltile(0, 0, 0, 0, 252, 28, TENSCREEN);
I_ClearAllInput(); I_ClearAllInput();
@ -1461,14 +1461,14 @@ void gameDisplaySharewareScreens()
rotatesprite_fs(160 << 16, 100 << 16, 65536L, 0, 3291, 0, 0, 2 + 8 + 64 + BGSTRETCH); rotatesprite_fs(160 << 16, 100 << 16, 65536L, 0, 3291, 0, 0, 2 + 8 + 64 + BGSTRETCH);
fadepaltile(0, 0, 0, 252, 0, -28, 3291); fadepaltile(0, 0, 0, 252, 0, -28, 3291);
while (!I_GeneralTrigger()) while (!I_GeneralTrigger())
G_HandleAsync(); gameHandleEvents();
fadepaltile(0, 0, 0, 0, 252, 28, 3291); fadepaltile(0, 0, 0, 0, 252, 28, 3291);
I_ClearAllInput(); I_ClearAllInput();
rotatesprite_fs(160 << 16, 100 << 16, 65536L, 0, 3290, 0, 0, 2 + 8 + 64 + BGSTRETCH); rotatesprite_fs(160 << 16, 100 << 16, 65536L, 0, 3290, 0, 0, 2 + 8 + 64 + BGSTRETCH);
fadepaltile(0, 0, 0, 252, 0, -28, 3290); fadepaltile(0, 0, 0, 252, 0, -28, 3290);
while (!I_GeneralTrigger()) while (!I_GeneralTrigger())
G_HandleAsync(); gameHandleEvents();
#ifdef __ANDROID__ #ifdef __ANDROID__
inExtraScreens = 0; inExtraScreens = 0;
@ -1524,7 +1524,7 @@ void gameDisplay3DRScreen()
{ {
videoClearScreen(0); videoClearScreen(0);
rotatesprite_fs(160 << 16, 100 << 16, 65536L, 0, DREALMS, 0, 0, 2 + 8 + 64 + BGSTRETCH); rotatesprite_fs(160 << 16, 100 << 16, 65536L, 0, DREALMS, 0, 0, 2 + 8 + 64 + BGSTRETCH);
G_HandleAsync(); gameHandleEvents();
if (g_restorePalette) if (g_restorePalette)
{ {
@ -1645,7 +1645,7 @@ void gameDisplayTitleScreen(void)
#endif #endif
} }
G_HandleAsync(); gameHandleEvents();
} }
} }
@ -1752,7 +1752,7 @@ void G_DoOrderScreen(void)
rotatesprite_fs(160<<16, 100<<16, 65536L, 0, ORDERING+i, 0, 0, 2+8+64+BGSTRETCH); rotatesprite_fs(160<<16, 100<<16, 65536L, 0, ORDERING+i, 0, 0, 2+8+64+BGSTRETCH);
fadepal(0, 0, 0, 252, 0, -28); fadepal(0, 0, 0, 252, 0, -28);
while (!I_CheckAllInput()) while (!I_CheckAllInput())
G_HandleAsync(); gameHandleEvents();
} }
I_ClearAllInput(); I_ClearAllInput();
@ -1848,7 +1848,7 @@ static void G_BonusCutscenes(void)
videoNextPage(); videoNextPage();
} }
G_HandleAsync(); gameHandleEvents();
if (I_GeneralTrigger()) break; if (I_GeneralTrigger()) break;
} while (1); } while (1);
@ -2005,7 +2005,7 @@ static void G_BonusCutscenes(void)
I_ClearAllInput(); I_ClearAllInput();
ototalclock = totalclock+200; ototalclock = totalclock+200;
while (totalclock < ototalclock) while (totalclock < ototalclock)
G_HandleAsync(); gameHandleEvents();
videoClearScreen(0L); videoClearScreen(0L);
videoNextPage(); videoNextPage();
@ -2033,7 +2033,7 @@ static void G_BonusCutscenes(void)
if (PLUTOPAK || (G_GetLogoFlags() & LOGO_NODUKETEAMPIC)) if (PLUTOPAK || (G_GetLogoFlags() & LOGO_NODUKETEAMPIC))
{ {
while (totalclock < 120 && !I_GeneralTrigger()) while (totalclock < 120 && !I_GeneralTrigger())
G_HandleAsync(); gameHandleEvents();
I_ClearAllInput(); I_ClearAllInput();
} }
@ -2263,7 +2263,7 @@ void G_BonusScreen(int32_t bonusonly)
while (totalclock < TICRATE*10) while (totalclock < TICRATE*10)
{ {
G_HandleAsync(); gameHandleEvents();
MUSIC_Update(); MUSIC_Update();
if (G_FPSLimit()) if (G_FPSLimit())
@ -2307,7 +2307,7 @@ void G_BonusScreen(int32_t bonusonly)
{ {
int32_t yy = 0, zz; int32_t yy = 0, zz;
G_HandleAsync(); gameHandleEvents();
MUSIC_Update(); MUSIC_Update();
if (G_FPSLimit()) if (G_FPSLimit())

View file

@ -480,7 +480,7 @@ void cacheAllSounds(void)
{ {
j++; j++;
if ((j&7) == 0) if ((j&7) == 0)
G_HandleAsync(); gameHandleEvents();
S_LoadSound(i); S_LoadSound(i);
} }