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

Merge ac495cf7ad into 9fb917c357

This commit is contained in:
sonilyan 2024-04-22 10:09:26 +08:00 committed by GitHub
parent 9fb917c357 ac495cf7ad
commit 456965b3ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/combat.cc
View File

@ -2629,7 +2629,7 @@ static void _combat_begin(Object* attacker)
reg_anim_end(); reg_anim_end();
while (animationIsBusy(v1)) { while (animationIsBusy(v1)) {
_process_bk(); inputGetInput();
} }
} }
} }
@ -2796,7 +2796,7 @@ static void _combat_over()
reg_anim_end(); reg_anim_end();
while (animationIsBusy(critter)) { while (animationIsBusy(critter)) {
_process_bk(); inputGetInput();
} }
} }
} }
@ -3123,7 +3123,7 @@ void _combat_turn_run()
while (_combat_turn_running > 0) { while (_combat_turn_running > 0) {
sharedFpsLimiter.mark(); sharedFpsLimiter.mark();
_process_bk(); inputGetInput();
renderPresent(); renderPresent();
sharedFpsLimiter.throttle(); sharedFpsLimiter.throttle();

2
src/game_mouse.cc
View File

@ -1280,7 +1280,7 @@ int gameMouseSetCursor(int cursor)
} }
unsigned int delay = 1000 / artGetFramesPerSecond(mouseCursorFrm); unsigned int delay = 1000 / artGetFramesPerSecond(mouseCursorFrm);
if (getTicksBetween(tick, gGameMouseAnimatedCursorLastUpdateTimestamp) < delay) { if (getTicksBetween(tick, gGameMouseAnimatedCursorLastUpdateTimestamp) < delay && cursor == gGameMouseCursor) {
shouldUpdate = false; shouldUpdate = false;
} else { } else {
if (artGetFrameCount(mouseCursorFrm) <= gGameMouseAnimatedCursorNextFrame) { if (artGetFrameCount(mouseCursorFrm) <= gGameMouseAnimatedCursorNextFrame) {