[Scummvm-cvs-logs] SF.net SVN: scummvm: [24063] scummvm/trunk/engines/agos

[kirben at users.sourceforge.net]

Revision: 24063
          http://svn.sourceforge.net/scummvm/?rev=24063&view=rev
Author:   kirben
Date:     2006-10-01 23:22:05 -0700 (Sun, 01 Oct 2006)

Log Message:
-----------
Add more changes for swampy

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/agos/items.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2006-10-02 06:11:05 UTC (rev 24062)
+++ scummvm/trunk/engines/agos/agos.cpp	2006-10-02 06:22:05 UTC (rev 24063)
@@ -552,7 +552,7 @@
 		_numTextBoxes = 40;
 		_numVideoOpcodes = 85;
 #ifndef PALMOS_68K
-		_vgaMemSize = 7000000;
+		_vgaMemSize = 7500000;
 #else
 		_vgaMemSize = gVars->memory[kMemSimon2Games];
 #endif
@@ -564,7 +564,7 @@
 		_numTextBoxes = 40;
 		_numVideoOpcodes = 85;
 #ifndef PALMOS_68K
-		_vgaMemSize = 7000000;
+		_vgaMemSize = 7500000;
 #else
 		_vgaMemSize = gVars->memory[kMemSimon2Games];
 #endif
@@ -1201,8 +1201,10 @@
 			if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) && _keyPressed == 35)
 				displayBoxStars();
 			processSpecialKeys();
-			if (_keyPressed != 0)
-				break;
+			if (getGameType() == GType_PP && _keyPressed != 0) {
+				_needHitAreaRecalc++;
+				return;
+			}
 			if (_lastHitArea3 == (HitArea *) -1)
 				goto startOver;
 			if (_lastHitArea3 != 0)
@@ -1408,6 +1410,7 @@
 			_vgaMemPtr = blockEnd;
 			return block;
 		}
+		debug(1, "allocBlock: size %d vgaMemSize %d", size, vgaMemSize);
 	} while (vgaMemSize--);
 
 	error("allocBlock: Couldn't find free block");

Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp	2006-10-02 06:11:05 UTC (rev 24062)
+++ scummvm/trunk/engines/agos/items.cpp	2006-10-02 06:22:05 UTC (rev 24063)
@@ -2486,11 +2486,13 @@
 
 void AGOSEngine::o4_message() {
 	// 63: show string nl
+
 	if (getBitFlag(105)) {
 		// Swampy adventures
+		getStringPtrByID(getNextStringID());
 //		printInfoText(getStringPtrByID(getNextStringID()));
 	} else {
-		o_message();
+		showMessageFormat("%s\n", getStringPtrByID(getNextStringID()));
 	}
 }
 


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