[Scummvm-cvs-logs] SF.net SVN: scummvm: [28447] scummvm/trunk/engines/kyra/script.cpp

[buddha_ at users.sourceforge.net]

Revision: 28447
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28447&view=rev
Author:   buddha_
Date:     2007-08-04 05:23:28 -0700 (Sat, 04 Aug 2007)

Log Message:
-----------
Fixes compilation error C2677: binary '&&' : no global operator found which takes type 'const Kyra::Opcode' (or there is no acceptable conversion) on Windows (VS2003), Xbox (VS2003) and Xbox 360 (VS2005).
For some reason the compilers didn't automatically use the operator bool() in the Kyra::Opcode so now doing it explicitly.
Thanks to Carch for reporting the compilation problems.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script.cpp

Modified: scummvm/trunk/engines/kyra/script.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script.cpp	2007-08-04 12:16:10 UTC (rev 28446)
+++ scummvm/trunk/engines/kyra/script.cpp	2007-08-04 12:23:28 UTC (rev 28447)
@@ -386,7 +386,7 @@
 	assert(script->dataPtr->opcodes);
 	assert(opcode < script->dataPtr->opcodes->size());
 
-	if ((*script->dataPtr->opcodes)[opcode] && *(*script->dataPtr->opcodes)[opcode]) {
+	if ((*script->dataPtr->opcodes)[opcode] && (bool) *(*script->dataPtr->opcodes)[opcode]) {
 		script->retValue = (*(*script->dataPtr->opcodes)[opcode])(script);
 	} else {
 		script->retValue = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.