aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/script_tim.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-07-10 11:25:43 +0000
committerJohannes Schickel2008-07-10 11:25:43 +0000
commit092d9f38c5080da66b4edc2ec52a204448ab9a4f (patch)
treec9be8ad7ab55528d643898eefbd98ea7a602381f /engines/kyra/script_tim.cpp
parent03cd937b13d5629f84f52b05c6374e5a3373be15 (diff)
downloadscummvm-rg350-092d9f38c5080da66b4edc2ec52a204448ab9a4f.tar.gz
scummvm-rg350-092d9f38c5080da66b4edc2ec52a204448ab9a4f.tar.bz2
scummvm-rg350-092d9f38c5080da66b4edc2ec52a204448ab9a4f.zip
Workaround for gcc 2.95 compiler bug.
svn-id: r32986
Diffstat (limited to 'engines/kyra/script_tim.cpp')
-rw-r--r--engines/kyra/script_tim.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 6b82ba06de..8725f6def9 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -34,6 +34,7 @@ namespace Kyra {
TIMInterpreter::TIMInterpreter(KyraEngine_v1 *vm, OSystem *system) : _vm(vm), _system(system), _currentTim(0) {
#define COMMAND(x) { &TIMInterpreter::x, #x }
#define COMMAND_UNIMPL() { 0, 0 }
+#define cmd_return(n) cmd_return_##n
static const CommandEntry commandProcs[] = {
// 0x00
COMMAND(cmd_initFunc0),
@@ -66,15 +67,16 @@ TIMInterpreter::TIMInterpreter(KyraEngine_v1 *vm, OSystem *system) : _vm(vm), _s
COMMAND_UNIMPL(),
COMMAND(cmd_resetAllRuntimes),
// 0x18
- COMMAND(cmd_return<1>),
+ COMMAND(cmd_return(1)),
COMMAND(cmd_execOpcode),
COMMAND(cmd_initFuncNow),
COMMAND(cmd_stopFuncNow),
// 0x1C
- COMMAND(cmd_return<1>),
- COMMAND(cmd_return<1>),
- COMMAND(cmd_return<-1>)
+ COMMAND(cmd_return(1)),
+ COMMAND(cmd_return(1)),
+ COMMAND(cmd_return(n1))
};
+#undef cmd_return
_commands = commandProcs;
_commandsSize = ARRAYSIZE(commandProcs);