Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve mouse on mobile devices #326

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improve mouse on mobile devices #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df2a2e3
Fix the bug that the mouse occasionally disappears after the round ends
sonilyan Jun 18, 2023
ac495cf
Fixed mouse freezing in combat during NPC turns when using touchscreen
sonilyan Jun 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/combat.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2629,7 +2629,7 @@ static void _combat_begin(Object* a1)
reg_anim_end();

while (animationIsBusy(v1)) {
_process_bk();
inputGetInput();
}
}
}
Expand Down Expand Up @@ -2796,7 +2796,7 @@ static void _combat_over()
reg_anim_end();

while (animationIsBusy(critter)) {
_process_bk();
inputGetInput();
}
}
}
Expand Down Expand Up @@ -3113,7 +3113,7 @@ void _combat_turn_run()
while (_combat_turn_running > 0) {
sharedFpsLimiter.mark();

_process_bk();
inputGetInput();

renderPresent();
sharedFpsLimiter.throttle();
Expand Down
2 changes: 1 addition & 1 deletion src/game_mouse.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down