Merge ac495cf7ad
into 9fb917c357
This commit is contained in:
commit
456965b3ab
|
@ -2629,7 +2629,7 @@ static void _combat_begin(Object* attacker)
|
|||
reg_anim_end();
|
||||
|
||||
while (animationIsBusy(v1)) {
|
||||
_process_bk();
|
||||
inputGetInput();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2796,7 +2796,7 @@ static void _combat_over()
|
|||
reg_anim_end();
|
||||
|
||||
while (animationIsBusy(critter)) {
|
||||
_process_bk();
|
||||
inputGetInput();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3123,7 +3123,7 @@ void _combat_turn_run()
|
|||
while (_combat_turn_running > 0) {
|
||||
sharedFpsLimiter.mark();
|
||||
|
||||
_process_bk();
|
||||
inputGetInput();
|
||||
|
||||
renderPresent();
|
||||
sharedFpsLimiter.throttle();
|
||||
|
|
|
@ -1280,7 +1280,7 @@ int gameMouseSetCursor(int cursor)
|
|||
}
|
||||
|
||||
unsigned int delay = 1000 / artGetFramesPerSecond(mouseCursorFrm);
|
||||
if (getTicksBetween(tick, gGameMouseAnimatedCursorLastUpdateTimestamp) < delay) {
|
||||
if (getTicksBetween(tick, gGameMouseAnimatedCursorLastUpdateTimestamp) < delay && cursor == gGameMouseCursor) {
|
||||
shouldUpdate = false;
|
||||
} else {
|
||||
if (artGetFrameCount(mouseCursorFrm) <= gGameMouseAnimatedCursorNextFrame) {
|
||||
|
|
Loading…
Reference in New Issue