[Scummvm-cvs-logs] SF.net SVN: scummvm: [23996] scummvm/trunk/engines/simon

kirben at users.sourceforge.net kirben at users.sourceforge.net
Fri Sep 29 03:00:17 CEST 2006


Revision: 23996
          http://svn.sourceforge.net/scummvm/?rev=23996&view=rev
Author:   kirben
Date:     2006-09-28 18:00:11 -0700 (Thu, 28 Sep 2006)

Log Message:
-----------
Fix startup of PP games

Modified Paths:
--------------
    scummvm/trunk/engines/simon/res.cpp
    scummvm/trunk/engines/simon/simon.cpp

Modified: scummvm/trunk/engines/simon/res.cpp
===================================================================
--- scummvm/trunk/engines/simon/res.cpp	2006-09-29 00:50:22 UTC (rev 23995)
+++ scummvm/trunk/engines/simon/res.cpp	2006-09-29 01:00:11 UTC (rev 23996)
@@ -323,7 +323,7 @@
 
 	in.close();
 
-	if (getGameId() == GID_SWAMPY)
+	if (getGameType() == GType_PP)
 		return;
 
 	/* Read list of TABLE resources */
@@ -345,7 +345,7 @@
 	_tablesHeapPtrOrg = _tablesHeapPtr;
 	_tablesHeapCurPosOrg = _tablesHeapCurPos;
 
-	if (getGameType() == GType_ELVIRA || getGameType() == GType_FF || getGameType() == GType_PP)
+	if (getGameType() == GType_ELVIRA || getGameType() == GType_FF)
 		return;
 
 	/* Read list of TEXT resources */

Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-09-29 00:50:22 UTC (rev 23995)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-09-29 01:00:11 UTC (rev 23996)
@@ -791,7 +791,7 @@
 }
 
 uint SimonEngine::getVarWrapper() {
-	if (getGameId() == GID_SWAMPY)
+	if (getGameType() == GType_PP)
 		return getVarOrWord();
 	else
 		return getVarOrByte();


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