summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-06-18 18:44:01 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-06-18 18:44:01 +0300
commit5d1ae85ab9829ab38b96277a8cd63e4539774e06 (patch)
tree3ad291a2a650da85750ae894f8300cb605172d11 /src/game.cpp
parent13f469073e58d4626dde9ff33cbf6d2125daca01 (diff)
downloadminetest-5d1ae85ab9829ab38b96277a8cd63e4539774e06.tar.gz
minetest-5d1ae85ab9829ab38b96277a8cd63e4539774e06.tar.bz2
minetest-5d1ae85ab9829ab38b96277a8cd63e4539774e06.zip
Hand-picked Mac OSX cursor and bundle path fixes from https://bitbucket.org/toabi/minetest-mac
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 1ab3d7962..f3fac0c84 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1366,7 +1366,11 @@ void the_game(
if((device->isWindowActive() && noMenuActive()) || random_input)
{
if(!random_input)
- device->getCursorControl()->setVisible(false);
+ {
+ // Mac OSX gets upset if this is set every frame
+ if(device->getCursorControl()->isVisible())
+ device->getCursorControl()->setVisible(false);
+ }
if(first_loop_after_window_activation){
//std::cout<<"window active, first loop"<<std::endl;
@@ -1397,7 +1401,9 @@ void the_game(
input->setMousePos(displaycenter.X, displaycenter.Y);
}
else{
- device->getCursorControl()->setVisible(true);
+ // Mac OSX gets upset if this is set every frame
+ if(device->getCursorControl()->isVisible() == false)
+ device->getCursorControl()->setVisible(true);
//std::cout<<"window inactive"<<std::endl;
first_loop_after_window_activation = true;