zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-21 19:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Backport framelimitter fix

Browse source 
# Conflicts:
#	source/rr/src/demo.cpp
#	source/rr/src/game.cpp
#	source/rr/src/net.cpp
#	source/rr/src/screens.cpp
This commit is contained in:
nukeykt 2019-07-28 19:15:35 +09:00 committed by Christoph Oelckers
parent 6fea4bf527
commit 3458a88f8e
10 changed files with 46 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/blood/src/blood.cpp
View file

@ -459,6 +459,7 @@ void PreloadCache(void)
{
Bsprintf(tempbuf, "Loaded %d%% (%d/%d textures)\n", percentDisplayed, cnt, nPrecacheCount);
viewLoadingScreenUpdate(tempbuf, percentDisplayed);
videoNextPage();
timerUpdate();
if (totalclock - clock >= 1)
@ -1694,6 +1695,7 @@ RESTART:
default:
break;
}
videoNextPage();
}
//scrNextPage();
if (TestBitString(gotpic, 2342))

1
source/blood/src/demo.cpp
View file

@ -411,6 +411,7 @@ _DEMOPLAYBACK:
viewDrawScreen();
if (gInputMode == INPUT_MODE_1 && CGameMenuMgr::m_bActive)
gGameMenuMgr.Draw();
videoNextPage();
}
if (TestBitString(gotpic, 2342))
{

4
source/blood/src/menu.cpp
View file

@ -2071,6 +2071,7 @@ void SaveGame(CGameMenuItemZEditBitmap *pItem, CGameMenuEvent *event)
sprintf(gGameOptions.szSaveGameName, "%s", strSaveGameName);
gGameOptions.nSaveGameSlot = nSlot;
viewLoadingScreen(2518, "Saving", "Saving Your Game", strRestoreGameStrings[nSlot]);
videoNextPage();
gSaveGameNum = nSlot;
LoadSave::SaveGame(strSaveGameName);
gQuickSaveSlot = nSlot;
@ -2092,6 +2093,7 @@ void QuickSaveGame(void)
sprintf(gGameOptions.szSaveGameName, "%s", strSaveGameName);
gGameOptions.nSaveGameSlot = gQuickSaveSlot;
viewLoadingScreen(2518, "Saving", "Saving Your Game", strRestoreGameStrings[gQuickSaveSlot]);
videoNextPage();
LoadSave::SaveGame(strSaveGameName);
gGameOptions.picEntry = gSavedOffset;
gSaveGameOptions[gQuickSaveSlot] = gGameOptions;
@ -2110,6 +2112,7 @@ void LoadGame(CGameMenuItemZEditBitmap *pItem, CGameMenuEvent *event)
if (!testkopen(strLoadGameName, 0))
return;
viewLoadingScreen(2518, "Loading", "Loading Saved Game", strRestoreGameStrings[nSlot]);
videoNextPage();
LoadSave::LoadGame(strLoadGameName);
gGameMenuMgr.Deactivate();
gQuickLoadSlot = nSlot;
@ -2124,6 +2127,7 @@ void QuickLoadGame(void)
if (!testkopen(strLoadGameName, 0))
return;
viewLoadingScreen(2518, "Loading", "Loading Saved Game", strRestoreGameStrings[gQuickLoadSlot]);
videoNextPage();
LoadSave::LoadGame(strLoadGameName);
gGameMenuMgr.Deactivate();
}

5
source/blood/src/network.cpp
View file

@ -996,6 +996,7 @@ void netInitialize(bool bConsole)
char buffer[128];
sprintf(buffer, "Waiting for players (%i\\%i)", numplayers, gNetPlayers);
viewLoadingScreen(2518, "Network Game", NULL, buffer);
videoNextPage();
}
while (numplayers < gNetPlayers)
{
@ -1037,6 +1038,7 @@ void netInitialize(bool bConsole)
char buffer[128];
sprintf(buffer, "Waiting for players (%i\\%i)", numplayers, gNetPlayers);
viewLoadingScreen(2518, "Network Game", NULL, buffer);
videoNextPage();
}
break;
}
@ -1068,6 +1070,7 @@ void netInitialize(bool bConsole)
char buffer[128];
sprintf(buffer, "Waiting for players (%i\\%i)", numplayers, gNetPlayers);
viewLoadingScreen(2518, "Network Game", NULL, buffer);
videoNextPage();
}
break;
}
@ -1129,6 +1132,7 @@ void netInitialize(bool bConsole)
if (!bConsole)
{
viewLoadingScreen(2518, "Network Game", NULL, buffer);
videoNextPage();
}
gNetENetClient = enet_host_create(NULL, 1, BLOOD_ENET_CHANNEL_MAX, 0, 0);
enet_address_set_host(&gNetENetAddress, gNetAddress);
@ -1153,6 +1157,7 @@ void netInitialize(bool bConsole)
if (!bConsole)
{
viewLoadingScreen(2518, "Network Game", NULL, "Waiting for server response");
videoNextPage();
}
while (bWaitServer)
{

32
source/blood/src/view.cpp
View file

@ -2918,24 +2918,27 @@ double g_frameDelay = 0.0;
int viewFPSLimit(void)
{
static auto nextPageTicks = (double)timerGetTicksU64();
static unsigned frameWaiting = 0;
static double nextPageDelay = g_frameDelay;
static uint64_t lastFrameTicks = timerGetTicksU64() - (uint64_t) g_frameDelay;
int frameWaiting = 0;
if (frameWaiting)
uint64_t const frameTicks = timerGetTicksU64();
uint64_t elapsedTime = frameTicks-lastFrameTicks;
if (!r_maxfps || elapsedTime >= (uint64_t) nextPageDelay)
{
frameWaiting--;
videoNextPage();
if (elapsedTime >= (uint64_t) (nextPageDelay + g_frameDelay))
{
//If we missed a frame, reset any cumulated remainder from rendering frames early
nextPageDelay = g_frameDelay;
}
else
{
nextPageDelay += g_frameDelay - elapsedTime;
}
auto const frameTicks = (double)timerGetTicksU64();
if (!r_maxfps || frameTicks >= nextPageTicks)
{
if (frameTicks >= nextPageTicks + g_frameDelay)
nextPageTicks = frameTicks;
nextPageTicks += g_frameDelay;
frameWaiting++;
lastFrameTicks = frameTicks;
++frameWaiting;
}
return frameWaiting;
@ -3588,7 +3591,6 @@ void viewLoadingScreenUpdate(const char *pzText4, int nPercent)
TileHGauge(2260, 86, 110, nPercent, 100, 0, 131072);
viewDrawText(3, "Please Wait", 160, 134, -128, 0, 1, 1);
scrNextPage();
}
void viewLoadingScreen(int nTile, const char *pText, const char *pText2, const char *pText3)

3
source/rr/src/gameexec.cpp
View file

@ -1147,8 +1147,7 @@ void Screen_Play(void)
if (I_CheckAllInput())
running = 0;
// nextpage();
videoNextPage();
I_ClearAllInput();
videoNextPage();
} while (running);

4
source/rr/src/net.cpp
View file

@ -170,9 +170,9 @@ void Net_WaitForEverybody(void)
if (G_FPSLimit())
{
display_betascreen();
gametext_center_shade(170, "Waiting for server", 14);
gametext_center_shade(170, "Waiting for players", 14);
videoNextPage();
}
};
G_HandleAsync();
Net_GetPackets();

3
source/rr/src/screens.cpp
View file

@ -1723,6 +1723,7 @@ void G_DisplayLogo(void)
P_SetGamePalette(g_player[myconnectindex].ps, g_player[myconnectindex].ps->palette, 0);
g_restorePalette = 0;
}
videoNextPage();
}
@ -1911,6 +1912,7 @@ static void G_BonusCutscenes(void)
rotatesprite_fs(breathe[t+3]<<16, breathe[t+4]<<16, 65536L, 0, breathe[t+2], 0, 0, 2+8+16+64+128+BGSTRETCH);
}
}
videoNextPage();
}
@ -3190,7 +3192,6 @@ void G_BonusScreenRRRA(int32_t bonusonly)
}
else
break;
videoNextPage();
}
} while (1);