aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2014-12-07 15:45:43 +0200
committerFilippos Karapetis2014-12-07 15:45:43 +0200
commit2325183751e14a50b59f4a9cf5950396f52fed2a (patch)
tree17da4008a94ded1f42ed0eb0f6284f67fd4b72be
parent815851e959bb46b2b9fd0de7ff9d04c9097d6908 (diff)
downloadscummvm-rg350-2325183751e14a50b59f4a9cf5950396f52fed2a.tar.gz
scummvm-rg350-2325183751e14a50b59f4a9cf5950396f52fed2a.tar.bz2
scummvm-rg350-2325183751e14a50b59f4a9cf5950396f52fed2a.zip
NEVERHOOD: Remove duplicate defines
These have been left behind after the split of the scenes and the scene sprites. Thanks to fingolfin for pointing out the duplicate defines
-rw-r--r--engines/neverhood/modules/module2700_sprites.cpp56
-rw-r--r--engines/neverhood/modules/module2800.cpp15
-rw-r--r--engines/neverhood/modules/module2800_sprites.cpp10
-rw-r--r--engines/neverhood/modules/module3000.cpp12
-rw-r--r--engines/neverhood/modules/module3000_sprites.cpp36
5 files changed, 0 insertions, 129 deletions
diff --git a/engines/neverhood/modules/module2700_sprites.cpp b/engines/neverhood/modules/module2700_sprites.cpp
index e17cddc834..079e0b7afe 100644
--- a/engines/neverhood/modules/module2700_sprites.cpp
+++ b/engines/neverhood/modules/module2700_sprites.cpp
@@ -24,62 +24,6 @@
namespace Neverhood {
-static const NRect kScene2710ClipRect = { 0, 0, 626, 480 };
-
-static const uint32 kScene2710StaticSprites[] = {
- 0x0D2016C0,
- 0
-};
-
-static const NRect kScene2711ClipRect = { 0, 0, 521, 480 };
-
-static const uint32 kScene2711FileHashes1[] = {
- 0,
- 0x100801A1,
- 0x201081A0,
- 0x006800A4,
- 0x40390120,
- 0x000001B1,
- 0x001000A1,
- 0
-};
-
-static const uint32 kScene2711FileHashes2[] = {
- 0,
- 0x40403308,
- 0x71403168,
- 0x80423928,
- 0x224131A8,
- 0x50401328,
- 0x70423328,
- 0
-};
-
-static const uint32 kScene2711FileHashes3[] = {
- 0,
- 0x1088A021,
- 0x108120E5,
- 0x18A02321,
- 0x148221A9,
- 0x10082061,
- 0x188820E1,
- 0
-};
-
-static const NRect kScene2724ClipRect = { 0, 141, 640, 480 };
-
-static const uint32 kScene2724StaticSprites[] = {
- 0xC20D00A5,
- 0
-};
-
-static const NRect kScene2725ClipRect = { 0, 0, 640, 413 };
-
-static const uint32 kScene2725StaticSprites[] = {
- 0xC20E00A5,
- 0
-};
-
static const NPoint kCarShadowOffsets[] = {
{-63, 3}, {-48, 40}, {-33, 58},
{ 0, 65}, { 40, 53}, { 56, 27},
diff --git a/engines/neverhood/modules/module2800.cpp b/engines/neverhood/modules/module2800.cpp
index a59c3f8156..ab22390c7d 100644
--- a/engines/neverhood/modules/module2800.cpp
+++ b/engines/neverhood/modules/module2800.cpp
@@ -1477,21 +1477,6 @@ static const uint32 kScene2808FileHashes2[] = {
0xB0196098
};
-static const uint32 kClass428FileHashes[] = {
- 0x140022CA,
- 0x4C30A602,
- 0xB1633402,
- 0x12982135,
- 0x0540B728,
- 0x002A81E3,
- 0x08982841,
- 0x10982841,
- 0x20982841,
- 0x40982841,
- 0x80982841,
- 0x40800711
-};
-
Scene2808::Scene2808(NeverhoodEngine *vm, Module *parentModule, int which)
: Scene(vm, parentModule), _countdown(0), _testTubeSetNum(which), _leaveResult(0), _isFlowing(false) {
diff --git a/engines/neverhood/modules/module2800_sprites.cpp b/engines/neverhood/modules/module2800_sprites.cpp
index f9a58de92d..ad814d2b5b 100644
--- a/engines/neverhood/modules/module2800_sprites.cpp
+++ b/engines/neverhood/modules/module2800_sprites.cpp
@@ -574,16 +574,6 @@ uint32 AsScene2806Spew::handleMessage(int messageNum, const MessageParam &param,
return messageResult;
}
-static const uint32 kScene2808FileHashes1[] = {
- 0x90B0392,
- 0x90B0192
-};
-
-static const uint32 kScene2808FileHashes2[] = {
- 0xB0396098,
- 0xB0196098
-};
-
static const uint32 kClass428FileHashes[] = {
0x140022CA,
0x4C30A602,
diff --git a/engines/neverhood/modules/module3000.cpp b/engines/neverhood/modules/module3000.cpp
index d4809611ad..0f84dbd18d 100644
--- a/engines/neverhood/modules/module3000.cpp
+++ b/engines/neverhood/modules/module3000.cpp
@@ -666,18 +666,6 @@ static const uint32 kScene3010ButtonNameHashes[] = {
0x01180951
};
-static const uint32 kScene3010DeadBoltButtonFileHashes1[] = {
- 0x301024C2,
- 0x20280580,
- 0x30200452
-};
-
-static const uint32 kScene3010DeadBoltButtonFileHashes2[] = {
- 0x50C025A8,
- 0x1020A0A0,
- 0x5000A7E8
-};
-
Scene3010::Scene3010(NeverhoodEngine *vm, Module *parentModule, int which)
: Scene(vm, parentModule), _countdown(0), _doorUnlocked(false), _checkUnlocked(false) {
diff --git a/engines/neverhood/modules/module3000_sprites.cpp b/engines/neverhood/modules/module3000_sprites.cpp
index 3f883eaa72..23a388efe4 100644
--- a/engines/neverhood/modules/module3000_sprites.cpp
+++ b/engines/neverhood/modules/module3000_sprites.cpp
@@ -46,42 +46,6 @@ enum {
kCTSCount = 14
};
-static const uint32 kScene3009CannonScopeVideos[] = {
- 0x1010000D,
- 0x340A0049,
- 0x340A0049,
- 0x0282081D,
- 0x0082080D,
- 0x0882080D,
- 0x0882080D,
- 0x0282081D,
- 0x004B000B,
- 0x014B000B,
- 0x044B000B,
- 0x0282081D,
- 0x0282081D,
- 0x0282081D,
- 0x340A0049
-};
-
-static const uint32 kScene3009CannonActionVideos[] = {
- 0x00000000,
- 0x8004001B, // 1 Fire cannon at wall, it breaks (lowered)
- 0x0004001A, // 2 Fire cannon at wall, nothing happens (lowered)
- 0x1048404B, // 3 Fire cannon at emptyness (raised)
- 0x50200109, // 4 Fire cannon, robot missed (raised)
- 0x12032109, // 5 Fire cannon, robot hit (raised)
- 0x10201109, // 6 Fire cannon, no robot (raised)
- 0x000A2030, // 7 Raise the cannon
- 0x000A0028, // 8
- 0x000A0028, // 9
- 0x000A0028, // 10
- 0x040A1069, // 11
- 0x040A1069, // 12
- 0x040A1069, // 13
- 0x240A1101 // 14 Lower the cannon
-};
-
static const uint32 kSsScene3009SymbolEdgesFileHashes[] = {
0x618827A0,
0xB1A92322