[Scummvm-cvs-logs] SF.net SVN: scummvm:[49353] scummvm/trunk/engines/sci/engine/vm.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon May 31 14:43:28 CEST 2010
Revision: 49353
http://scummvm.svn.sourceforge.net/scummvm/?rev=49353&view=rev
Author: thebluegr
Date: 2010-05-31 12:43:28 +0000 (Mon, 31 May 2010)
Log Message:
-----------
Fixed operator precedence warning
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/vm.cpp
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2010-05-31 12:38:15 UTC (rev 49352)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2010-05-31 12:43:28 UTC (rev 49353)
@@ -594,10 +594,11 @@
//warning("callk %s", kernelFunc.orig_name.c_str());
// TODO: SCI2.1 equivalent
- if (g_loadFromLauncher >= 0 &&
+ if (g_loadFromLauncher >= 0 && (
(kernelFuncNum == 0x8 && getSciVersion() <= SCI_VERSION_1_1) || // DrawPic
- (kernelFuncNum == 0x3d && getSciVersion() == SCI_VERSION_2)) { // GetSaveDir
- //(kernelFuncNum == 0x28 && getSciVersion() == SCI_VERSION_2_1)) { // AddPlane
+ (kernelFuncNum == 0x3d && getSciVersion() == SCI_VERSION_2) // GetSaveDir
+ //(kernelFuncNum == 0x28 && getSciVersion() == SCI_VERSION_2_1) // AddPlane
+ )) {
// A game is being loaded from the launcher, and the game is about to draw something on
// screen, hence all initialization has taken place (i.e. menus have been constructed etc).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list