aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/input/inputengine_script.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2010-08-10 12:16:31 +0000
committerEugene Sandulenko2010-10-12 22:38:23 +0000
commitad5b74c9de1eb3d6eda91e1bf21b24c87a78391e (patch)
tree8e2591e31c02ba29ad6c6927fbf1a0a4292973e0 /engines/sword25/input/inputengine_script.cpp
parentab85540a1bb59d7f69b89868805d1fe2a2adc89c (diff)
downloadscummvm-rg350-ad5b74c9de1eb3d6eda91e1bf21b24c87a78391e.tar.gz
scummvm-rg350-ad5b74c9de1eb3d6eda91e1bf21b24c87a78391e.tar.bz2
scummvm-rg350-ad5b74c9de1eb3d6eda91e1bf21b24c87a78391e.zip
SWORD25: Clean compile!
Under MinGW, with OpenGL and tinyxml. svn-id: r53225
Diffstat (limited to 'engines/sword25/input/inputengine_script.cpp')
-rw-r--r--engines/sword25/input/inputengine_script.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp
index 70c26e5282..6b91c4b73e 100644
--- a/engines/sword25/input/inputengine_script.cpp
+++ b/engines/sword25/input/inputengine_script.cpp
@@ -298,28 +298,28 @@ static int UnregisterCommandCallback(lua_State *L) {
static const char *PACKAGE_LIBRARY_NAME = "Input";
static const luaL_reg PACKAGE_FUNCTIONS[] = {
- "Init", Init,
- "Update", Update,
- "IsLeftMouseDown", IsLeftMouseDown,
- "IsRightMouseDown", IsRightMouseDown,
- "WasLeftMouseDown", WasLeftMouseDown,
- "WasRightMouseDown", WasRightMouseDown,
- "IsLeftDoubleClick", IsLeftDoubleClick,
- "GetMouseX", GetMouseX,
- "GetMouseY", GetMouseY,
- "SetMouseX", SetMouseX,
- "SetMouseY", SetMouseY,
- "IsKeyDown", IsKeyDown,
- "WasKeyDown", WasKeyDown,
- "RegisterCharacterCallback", RegisterCharacterCallback,
- "UnregisterCharacterCallback", UnregisterCharacterCallback,
- "RegisterCommandCallback", RegisterCommandCallback,
- "UnregisterCommandCallback", UnregisterCommandCallback,
- 0, 0,
+ {"Init", Init},
+ {"Update", Update},
+ {"IsLeftMouseDown", IsLeftMouseDown},
+ {"IsRightMouseDown", IsRightMouseDown},
+ {"WasLeftMouseDown", WasLeftMouseDown},
+ {"WasRightMouseDown", WasRightMouseDown},
+ {"IsLeftDoubleClick", IsLeftDoubleClick},
+ {"GetMouseX", GetMouseX},
+ {"GetMouseY", GetMouseY},
+ {"SetMouseX", SetMouseX},
+ {"SetMouseY", SetMouseY},
+ {"IsKeyDown", IsKeyDown},
+ {"WasKeyDown", WasKeyDown},
+ {"RegisterCharacterCallback", RegisterCharacterCallback},
+ {"UnregisterCharacterCallback", UnregisterCharacterCallback},
+ {"RegisterCommandCallback", RegisterCommandCallback},
+ {"UnregisterCommandCallback", UnregisterCommandCallback},
+ {0, 0}
};
-#define X(k) "KEY_" #k, BS_InputEngine::KEY_##k
-#define Y(k) "KEY_COMMAND_" #k, BS_InputEngine::KEY_COMMAND_##k
+#define X(k) {"KEY_" #k, BS_InputEngine::KEY_##k}
+#define Y(k) {"KEY_COMMAND_" #k, BS_InputEngine::KEY_COMMAND_##k}
static const lua_constant_reg PACKAGE_CONSTANTS[] = {
X(BACKSPACE), X(TAB), X(CLEAR), X(RETURN), X(PAUSE), X(CAPSLOCK), X(ESCAPE), X(SPACE), X(PAGEUP), X(PAGEDOWN), X(END), X(HOME), X(LEFT),
X(UP), X(RIGHT), X(DOWN), X(PRINTSCREEN), X(INSERT), X(DELETE), X(0), X(1), X(2), X(3), X(4), X(5), X(6), X(7), X(8), X(9), X(A), X(B),