aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2011-04-13 19:11:22 +0200
committerJohannes Schickel2011-04-13 19:13:12 +0200
commit5c87136b5f045d5ddcaf534185fb2259264cbabd (patch)
treea7c57975d49caf945bee22191aa50b5ee9df6dc6
parentfc59a52e7a58db857c7f83e9dc17c04fccb1960b (diff)
downloadscummvm-rg350-5c87136b5f045d5ddcaf534185fb2259264cbabd.tar.gz
scummvm-rg350-5c87136b5f045d5ddcaf534185fb2259264cbabd.tar.bz2
scummvm-rg350-5c87136b5f045d5ddcaf534185fb2259264cbabd.zip
TSAGE: Fix compilation on NDS.
It is not safe to assume one can construct a va_list by using NULL. Instead I created a temporary (uninitialized!) dummy, which is passed in the call to the Action::attached implementation. I added a TODO to resolve this temporary hack.
-rw-r--r--engines/tsage/converse.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 260308a784..82ee298e0b 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -320,7 +320,12 @@ void SequenceManager::attached(EventHandler *newOwner, EventHandler *fmt, va_lis
}
setup();
- Action::attached(newOwner, fmt, NULL);
+ // TODO: This is not particulary nice, since dummy is uninitialized.
+ // Since the default Action implementation does not access the va_list
+ // parameter it should be fine though. Still it would be nice to find
+ // a better solution to this.
+ va_list dummy;
+ Action::attached(newOwner, fmt, dummy);
}
/**