openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Turns out we never actually need to check which window is in front

Browse Source
This commit is contained in:
Celtic Minstrel
2014-04-19 09:01:13 -04:00
parent 19c2b37464
commit 6f040e2c56
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osx/boe.main.cpp
View File

@@ -294,12 +294,12 @@ void Handle_One_Event()
//(cur_time - last_anim_time > 42)
if((animTimer.getElapsedTime().asMilliseconds() >= fortyTicks) && (overall_mode != MODE_STARTUP) && (anim_onscreen == true) && (PSD[SDF_NO_TER_ANIM] == 0)
&& (isFrontWindow(mainPtr) || isFrontWindow(mini_map)) && (!gInBackground)) {
&& (!gInBackground)) {
animTimer.restart();
draw_terrain();
}
if((animTimer.getElapsedTime().asMilliseconds() > twentyTicks) && (overall_mode == MODE_STARTUP)
&& app_started_normally && isFrontWindow(mainPtr)) {
&& app_started_normally) {
animTimer.restart();
draw_startup_anim(true);
}
@@ -347,7 +347,7 @@ void Handle_One_Event()
// which hides the mouse cursor until it's moved.
// SFML's hide cursor function is always permanent, so this is here to balance that out.
mainPtr.setMouseCursorVisible(true);
if(!gInBackground && (isFrontWindow(mainPtr) || isFrontWindow(mini_map))) {
if(!gInBackground) {
location where(event.mouseMove.x, event.mouseMove.y);
change_cursor(where);
// TODO: Probably don't actually need the conditional here?