aboutsummaryrefslogtreecommitdiffstats
path: root/src/player.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-11-27 16:28:51 -0500
committerClyne Sullivan <tullivan99@gmail.com>2016-11-27 16:28:51 -0500
commit3437e928e978939aa4c85369ab597e08f00ab93b (patch)
tree761f06a34bd8de78440c31026cf2c96df1ccad4f /src/player.cpp
parent21ce3f06312a02c23d6b3c89f64f84222f54fe6d (diff)
world draw fix; offset fix
Diffstat (limited to 'src/player.cpp')
-rw-r--r--src/player.cpp26
1 files changed, 8 insertions, 18 deletions
diff --git a/src/player.cpp b/src/player.cpp
index 2694a54..a88734a 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1,7 +1,6 @@
#include <player.hpp>
#include <brice.hpp>
-#include <engine.hpp>
#include <ui.hpp>
#include <gametime.hpp>
#include <world.hpp>
@@ -71,10 +70,7 @@ void PlayerSystem::receive(const KeyUpEvent &kue)
p->inv->selected = false;
p->inv->mouseSel = false;
- }
-
- // disable action ui
- ui::action::disable();*/
+ }*/
}
}
@@ -114,23 +110,17 @@ void PlayerSystem::receive(const KeyDownEvent &kde)
} else if (kc == getControl(4)) {
speed = .5;
} else if (kc == getControl(5)) {
- /*static int heyOhLetsGo = 0;
-
+ //static int heyOhLetsGo = 0;
//edown = true;
-
// start hover counter?
- if (!heyOhLetsGo) {
- heyOhLetsGo = game::time::getTickCount();
- p->inv->mouseSel = false;
- }
+ //if (!heyOhLetsGo) {
+ // heyOhLetsGo = game::time::getTickCount();
+ // p->inv->mouseSel = false;
+ //}
// run hover thing
- if (game::time::getTickCount() - heyOhLetsGo >= 2 && !(p->inv->invOpen) && !(p->inv->selected)) {
- p->inv->invHover = true;
-
- // enable action ui
- ui::action::enable();
- }*/
+ //if (game::time::getTickCount() - heyOhLetsGo >= 2 && !(p->inv->invOpen) && !(p->inv->selected))
+ // p->inv->invHover = true;
}
} else if (kc == SDLK_DELETE) {
game::endGame();