summaryrefslogtreecommitdiff
path: root/src/cat/LuaScriptInterface.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-02-15 04:31:31 (GMT)
committer jacob1 <jfu614@gmail.com>2013-02-15 04:31:31 (GMT)
commit01cd146ee910fb9e62859583842c9842b539565b (patch)
treed87346317f1a7c7110ffa993b0680a0d393d1198 /src/cat/LuaScriptInterface.cpp
parent5807602cc1ec326f3ca33f3130d35b22082378ec (diff)
downloadpowder-01cd146ee910fb9e62859583842c9842b539565b.zip
powder-01cd146ee910fb9e62859583842c9842b539565b.tar.gz
fix mac compiling, fix renderer, fix other minor compiling issues
Diffstat (limited to 'src/cat/LuaScriptInterface.cpp')
-rw-r--r--src/cat/LuaScriptInterface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cat/LuaScriptInterface.cpp b/src/cat/LuaScriptInterface.cpp
index b4ce48a..a3fe00b 100644
--- a/src/cat/LuaScriptInterface.cpp
+++ b/src/cat/LuaScriptInterface.cpp
@@ -25,6 +25,7 @@
#include "game/Tool.h"
#include "LuaScriptHelper.h"
#include "client/HTTP.h"
+#include "PowderToy.h"
//#include "virtualmachine/VirtualMachine.h"
#include "pim/Parser.h"
@@ -43,7 +44,6 @@
#ifndef WIN
#include <unistd.h>
#endif
-#include "SDL.h"
extern "C"
{
@@ -1888,7 +1888,7 @@ bool LuaScriptInterface::OnMouseWheel(int x, int y, int d)
bool LuaScriptInterface::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{
- return luacon_keyevent(key, SDL_GetModState(), LUACON_KDOWN);
+ return luacon_keyevent(key, GetModifiers(), LUACON_KDOWN);
}
bool LuaScriptInterface::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt)