diff options
| author | Travis Howell | 2005-04-07 10:54:36 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-07 10:54:36 +0000 |
| commit | 682df447a3986ff3ba0ac83b9cf4f79da0d8d64e (patch) | |
| tree | eac54ceb4e39d706df33613b4bd8a7e100902ddc /scumm | |
| parent | 6ced0d698a9298450c00e6141bb94049e2d7cdea (diff) | |
| download | scummvm-rg350-682df447a3986ff3ba0ac83b9cf4f79da0d8d64e.tar.gz scummvm-rg350-682df447a3986ff3ba0ac83b9cf4f79da0d8d64e.tar.bz2 scummvm-rg350-682df447a3986ff3ba0ac83b9cf4f79da0d8d64e.zip | |
The reverse actor layering only applies to pajama3
svn-id: r17432
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v100he.cpp | 3 | ||||
| -rw-r--r-- | scumm/script_v72he.cpp | 7 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 4 | ||||
| -rw-r--r-- | scumm/scumm.h | 3 |
4 files changed, 10 insertions, 7 deletions
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index 1e74d4971b..609b1558f5 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -475,8 +475,7 @@ void ScummEngine_v100he::o100_actorOps() { a->_needRedraw = true; break; case 59: - // Uses reverse order of layering, so we adjust - a->_layer = -pop(); + a->_layer = pop(); a->_needRedraw = true; break; case 63: diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index 4ad0803763..79ae29e9c1 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -1074,8 +1074,11 @@ void ScummEngine_v72he::o72_actorOps() { debug(1,"o72_actorOps: case 24 (%d)", k); break; case 43: // HE 90+ - // Uses reverse order of layering, so we adjust - a->_layer = -pop(); + a->_layer = pop(); + if (_gameId == GID_PAJAMA3) { + // pajama3 uses reverse order of layering, so we adjust + a->_layer = -a->_layer; + } a->_needRedraw = true; break; case 64: diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 632c24841e..5a3f6a4940 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -352,9 +352,9 @@ static const ScummGameSettings scumm_settings[] = { // Humongous Entertainment Scumm Version ? {"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_HEGAME, 6, 99, 61, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, 0, 0}, - {"pj3-demo", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Demo)", GID_HEGAME, 6, 99, 61, MDT_NONE, + {"pj3-demo", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Demo)", GID_PAJAMA3, 6, 99, 61, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0}, - {"pajama3", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet", GID_HEGAME, 6, 99, 61, MDT_NONE, + {"pajama3", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet", GID_PAJAMA3, 6, 99, 61, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0}, {"SamsFunShop", "Pajama Sam's One-Stop Fun Shop", GID_HEGAME, 6, 99, 61, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0}, diff --git a/scumm/scumm.h b/scumm/scumm.h index d76edcd4d5..a18e59852a 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -254,7 +254,8 @@ enum ScummGameId { GID_PUTTMOON, GID_FBEAR, GID_FUNPACK, - GID_FREDDI4 + GID_FREDDI4, + GID_PAJAMA3 }; struct SentenceTab { |