aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-10-02 06:22:05 +0000
committerTravis Howell2006-10-02 06:22:05 +0000
commit6bcd0183c0934e581b2f5e0f9bb5a26b27229a35 (patch)
tree30376cd42480a4100d88d350741b997b4ff587ee
parent97cf93d2757073312e738bfac0b3381aad9add2d (diff)
downloadscummvm-rg350-6bcd0183c0934e581b2f5e0f9bb5a26b27229a35.tar.gz
scummvm-rg350-6bcd0183c0934e581b2f5e0f9bb5a26b27229a35.tar.bz2
scummvm-rg350-6bcd0183c0934e581b2f5e0f9bb5a26b27229a35.zip
Add more changes for swampy
svn-id: r24063
-rw-r--r--engines/agos/agos.cpp11
-rw-r--r--engines/agos/items.cpp4
2 files changed, 10 insertions, 5 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index d86b7e9a48..211f10b2a2 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -552,7 +552,7 @@ void AGOSEngine::setupGame() {
_numTextBoxes = 40;
_numVideoOpcodes = 85;
#ifndef PALMOS_68K
- _vgaMemSize = 7000000;
+ _vgaMemSize = 7500000;
#else
_vgaMemSize = gVars->memory[kMemSimon2Games];
#endif
@@ -564,7 +564,7 @@ void AGOSEngine::setupGame() {
_numTextBoxes = 40;
_numVideoOpcodes = 85;
#ifndef PALMOS_68K
- _vgaMemSize = 7000000;
+ _vgaMemSize = 7500000;
#else
_vgaMemSize = gVars->memory[kMemSimon2Games];
#endif
@@ -1201,8 +1201,10 @@ startOver:
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 @@ byte *AGOSEngine::allocBlock(uint32 size) {
_vgaMemPtr = blockEnd;
return block;
}
+ debug(1, "allocBlock: size %d vgaMemSize %d", size, vgaMemSize);
} while (vgaMemSize--);
error("allocBlock: Couldn't find free block");
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp
index 356b552c22..e40560d93d 100644
--- a/engines/agos/items.cpp
+++ b/engines/agos/items.cpp
@@ -2486,11 +2486,13 @@ void AGOSEngine::o4_loadMouseImage() {
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()));
}
}