aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-08-26 00:44:49 +0000
committerTravis Howell2004-08-26 00:44:49 +0000
commit0d8488d6057e3eda7104b713d766f9d92da02abc (patch)
treed009222e2525672bf0aff1a957495044ad497d67
parent09e07912d04bf88091f7503891721c32d74549f0 (diff)
downloadscummvm-rg350-0d8488d6057e3eda7104b713d766f9d92da02abc.tar.gz
scummvm-rg350-0d8488d6057e3eda7104b713d766f9d92da02abc.tar.bz2
scummvm-rg350-0d8488d6057e3eda7104b713d766f9d92da02abc.zip
Add game id for Pajama Sam, since it uses different amount of actors
svn-id: r14758
-rw-r--r--scumm/scumm.cpp10
-rw-r--r--scumm/scumm.h2
2 files changed, 7 insertions, 5 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 19ffd79306..1de096cae1 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -237,7 +237,7 @@ static const ScummGameSettings scumm_settings[] = {
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, 0, 0},
{"catalog", "Humongous Interactive Catalog", GID_HEGAME, 6, 71, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
- {"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_FREDDEMO, 6, 71, MDT_NONE,
+ {"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_HEGAME, 6, 71, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, 0, 0},
// Humongous Entertainment Scumm Version 7.2
@@ -265,12 +265,12 @@ static const ScummGameSettings scumm_settings[] = {
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
{"water", "Freddi Fish and Luther's Water Worries", GID_HEGAME, 6, 72, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
- {"pjs-demo", "Pajama Sam 1: No Need to Hide When It's Dark Outside (Demo)", GID_HEGAME, 6, 72, MDT_NONE,
+ {"pjs-demo", "Pajama Sam 1: No Need to Hide When It's Dark Outside (Demo)", GID_PAJAMA, 6, 72, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
{"socks", "Pajama Sam's Sock Works", GID_HEGAME, 6, 72, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
// Resource changed for pajama
- {"pajama", "Pajama Sam 1: No Need to Hide When It's Dark Outside", GID_HEGAME, 6, 72, MDT_NONE,
+ {"pajama", "Pajama Sam 1: No Need to Hide When It's Dark Outside", GID_PAJAMA, 6, 72, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
#ifdef HEGAMES
@@ -374,7 +374,7 @@ static const ScummGameSettings he_md5_settings[] = {
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0, 0},
{"8d479e36f35e80257dfc102cf4b8a912", "Let's Explore the Farm with Buzzy (Demo) (farm cd)", GID_HEGAME, 6, 72, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
- {"566165a7338fa11029e7c14d94fa70d0", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo) (spyfox cd)", GID_FREDDEMO, 6, 72, MDT_NONE,
+ {"566165a7338fa11029e7c14d94fa70d0", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo) (spyfox cd)", GID_HEGAME, 6, 72, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
{"8ffd618a776a4c0d8922bb28b09f8ce8", "Let's Explore the Airport with Buzzy (Demo) (farm cd)", GID_HEGAME, 6, 72, MDT_NONE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
@@ -1080,6 +1080,8 @@ void ScummEngine::launch() {
_numActors = 30;
else if (_gameId == GID_MANIAC)
_numActors = 25;
+ else if (_gameId == GID_PAJAMA)
+ _numActors = 62;
else
_numActors = 13;
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 86f5b2750b..4f9d0c6e65 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -257,7 +257,7 @@ enum ScummGameId {
GID_PUTTDEMO,
GID_FBEAR,
GID_FUNPACK,
- GID_FREDDEMO
+ GID_PAJAMA
};
#define _baseRooms res.address[rtRoom]