eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix usages of getTicks() once the condition is done

This commit is contained in:
Martin Janiczek 2022-10-19 00:08:06 +02:00
parent 220c30a788
commit 0ad39d8fb8
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/animation.cc
View File

@ -2787,7 +2787,7 @@ void _object_animate()
Object* object = sad->obj; Object* object = sad->obj;
unsigned int time = getMultipliedTicks(); unsigned int time = getTicks();
if (getTicksBetween(time, sad->animationTimestamp) < sad->ticksPerFrame) { if (getTicksBetween(time, sad->animationTimestamp) < sad->ticksPerFrame) {
continue; continue;
} }

18
src/input.cc
View File

@ -328,7 +328,7 @@ void tickersExecute()
return; return;
} }
gTickerLastTimestamp = SDL_GetTicks(); gTickerLastTimestamp = getTicks();
TickerListNode* curr = gTickerListHead; TickerListNode* curr = gTickerListHead;
TickerListNode** currPtr = &(gTickerListHead); TickerListNode** currPtr = &(gTickerListHead);
@ -630,15 +630,9 @@ void screenshotHandlerConfigure(int keyCode, ScreenshotHandler* handler)
} }
// 0x4C9370 // 0x4C9370
// Returns the original tick count (unaffected by the sfall speed patch). // Since implementing sfall SpeedPatch, this returns a potentially sped up
// (multiplied) tick count. For the original tick count, call SDL_GetTicks();
unsigned int getTicks() unsigned int getTicks()
{
return SDL_GetTicks();
}
// sfall SpeedPatch.cpp
// Returns the potentially sped up (multiplied) tick count.
unsigned int getMultipliedTicks()
{ {
unsigned int newTickCount = SDL_GetTicks(); unsigned int newTickCount = SDL_GetTicks();
if (newTickCount == gLastTickCount) return gStoredTickCount; if (newTickCount == gLastTickCount) return gStoredTickCount;
@ -684,7 +678,7 @@ time_t getLocalTimeAfterSpeedup()
void inputPauseForTocks(unsigned int delay) void inputPauseForTocks(unsigned int delay)
{ {
// NOTE: Uninline. // NOTE: Uninline.
unsigned int start = getMultipliedTicks(); unsigned int start = getTicks();
unsigned int end = getTicks(); unsigned int end = getTicks();
// NOTE: Uninline. // NOTE: Uninline.
@ -702,7 +696,7 @@ void inputPauseForTocks(unsigned int delay)
// 0x4C93B8 // 0x4C93B8
void inputBlockForTocks(unsigned int ms) void inputBlockForTocks(unsigned int ms)
{ {
unsigned int start = SDL_GetTicks(); unsigned int start = getTicks();
unsigned int diff; unsigned int diff;
do { do {
// NOTE: Uninline // NOTE: Uninline
@ -713,7 +707,7 @@ void inputBlockForTocks(unsigned int ms)
// 0x4C93E0 // 0x4C93E0
unsigned int getTicksSince(unsigned int start) unsigned int getTicksSince(unsigned int start)
{ {
unsigned int end = getMultipliedTicks(); unsigned int end = getTicks();
// NOTE: Uninline. // NOTE: Uninline.
return getTicksBetween(end, start); return getTicksBetween(end, start);

1
src/input.h
View File

@ -28,7 +28,6 @@ void takeScreenshot();
int screenshotHandlerDefaultImpl(int width, int height, unsigned char* data, unsigned char* palette); int screenshotHandlerDefaultImpl(int width, int height, unsigned char* data, unsigned char* palette);
void screenshotHandlerConfigure(int keyCode, ScreenshotHandler* handler); void screenshotHandlerConfigure(int keyCode, ScreenshotHandler* handler);
unsigned int getTicks(); unsigned int getTicks();
unsigned int getMultipliedTicks();
time_t getLocalTimeAfterSpeedup(); time_t getLocalTimeAfterSpeedup();
void inputPauseForTocks(unsigned int ms); void inputPauseForTocks(unsigned int ms);
void inputBlockForTocks(unsigned int ms); void inputBlockForTocks(unsigned int ms);

2
src/main.cc
View File

@ -1026,7 +1026,7 @@ static int mainMenuWindowHandleEvents()
mouseShowCursor(); mouseShowCursor();
} }
unsigned int tick = getMultipliedTicks(); unsigned int tick = getTicks();
int rc = -1; int rc = -1;
while (rc == -1) { while (rc == -1) {