[Scummvm-cvs-logs] scummvm master -> 5c87136b5f045d5ddcaf534185fb2259264cbabd

lordhoto lordhoto at gmail.com
Wed Apr 13 19:12:26 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5c87136b5f TSAGE: Fix compilation on NDS.


Commit: 5c87136b5f045d5ddcaf534185fb2259264cbabd
    https://github.com/scummvm/scummvm/commit/5c87136b5f045d5ddcaf534185fb2259264cbabd
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-04-13T10:13:12-07:00

Commit Message:
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.

Changed paths:
    engines/tsage/converse.cpp



diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 260308a..82ee298 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);
 }
 
 /**






More information about the Scummvm-git-logs mailing list