[Scummvm-cvs-logs] scummvm master -> ce40801f5b80aaf8786b7ac790588bd83250372b
bluegr
bluegr at gmail.com
Sun Dec 7 14:51:44 CET 2014
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
815851e959 MADS: Remove unused reference to MADSEngine
2325183751 NEVERHOOD: Remove duplicate defines
0e763f6aa2 NEVERHOOD: Remove duplicate file hash definition
ce40801f5b MOHAWK: Comment out unused constant
Commit: 815851e959bb46b2b9fd0de7ff9d04c9097d6908
https://github.com/scummvm/scummvm/commit/815851e959bb46b2b9fd0de7ff9d04c9097d6908
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-07T15:39:11+02:00
Commit Message:
MADS: Remove unused reference to MADSEngine
Thanks to fingolfin for finding out the unused reference
Changed paths:
engines/mads/msurface.h
engines/mads/scene.cpp
diff --git a/engines/mads/msurface.h b/engines/mads/msurface.h
index ebfb1f4..650d7fd 100644
--- a/engines/mads/msurface.h
+++ b/engines/mads/msurface.h
@@ -223,8 +223,6 @@ public:
};
class DepthSurface : public MSurface {
-private:
- MADSEngine *_vm;
public:
/**
* Depth style
@@ -234,7 +232,7 @@ public:
/**
* Constructor
*/
- DepthSurface(MADSEngine *vm) : _vm(vm), _depthStyle(0) {}
+ DepthSurface() : _depthStyle(0) {}
/**
* Returns the depth at a given position
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 18ceb3c..d2b4b29 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -31,7 +31,7 @@
namespace MADS {
Scene::Scene(MADSEngine *vm)
- : _vm(vm), _action(_vm), _depthSurface(vm),
+ : _vm(vm), _action(_vm), _depthSurface(),
_dirtyAreas(_vm), _dynamicHotspots(vm), _hotspots(vm),
_kernelMessages(vm), _sequences(vm), _sprites(vm), _spriteSlots(vm),
_textDisplay(vm), _userInterface(vm) {
@@ -182,7 +182,7 @@ void Scene::loadScene(int sceneId, const Common::String &prefix, bool palFlag) {
flags |= ANIMFLAG_LOAD_BACKGROUND_ONLY;
_animationData = Animation::init(_vm, this);
- DepthSurface depthSurface(_vm);
+ DepthSurface depthSurface;
_animationData->load(_userInterface, depthSurface, prefix, flags, nullptr, nullptr);
_vm->_palette->_paletteUsage.load(&_scenePaletteUsage);
@@ -611,7 +611,7 @@ void Scene::loadAnimation(const Common::String &resName, int trigger) {
if (_activeAnimation)
freeAnimation();
- DepthSurface depthSurface(_vm);
+ DepthSurface depthSurface;
UserInterface interfaceSurface(_vm);
_activeAnimation = Animation::init(_vm, this);
Commit: 2325183751e14a50b59f4a9cf5950396f52fed2a
https://github.com/scummvm/scummvm/commit/2325183751e14a50b59f4a9cf5950396f52fed2a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-07T15:45:43+02:00
Commit Message:
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
Changed paths:
engines/neverhood/modules/module2700_sprites.cpp
engines/neverhood/modules/module2800.cpp
engines/neverhood/modules/module2800_sprites.cpp
engines/neverhood/modules/module3000.cpp
engines/neverhood/modules/module3000_sprites.cpp
diff --git a/engines/neverhood/modules/module2700_sprites.cpp b/engines/neverhood/modules/module2700_sprites.cpp
index e17cddc..079e0b7 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 a59c3f8..ab22390 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 f9a58de..ad814d2 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 ¶m,
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 d480961..0f84dbd 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 3f883ea..23a388e 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
Commit: 0e763f6aa209613cbbbb4d4e3e2c1b8938c4f865
https://github.com/scummvm/scummvm/commit/0e763f6aa209613cbbbb4d4e3e2c1b8938c4f865
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-07T15:46:08+02:00
Commit Message:
NEVERHOOD: Remove duplicate file hash definition
Changed paths:
engines/neverhood/modules/module2400.cpp
diff --git a/engines/neverhood/modules/module2400.cpp b/engines/neverhood/modules/module2400.cpp
index 3acb952..4bfc10a 100644
--- a/engines/neverhood/modules/module2400.cpp
+++ b/engines/neverhood/modules/module2400.cpp
@@ -168,11 +168,6 @@ static const uint32 kScene2401FileHashes2[] = {
0xD0910068, 0xD09100A8, 0
};
-static const uint32 kScene2401FileHashes3[] = {
- 0xD0910020, 0xD0910038, 0xD0910008,
- 0xD0910068, 0xD09100A8, 0
-};
-
static const NRect kScene2401Rects[] = {
{ 369, 331, 394, 389 },
{ 395, 331, 419, 389 },
@@ -264,11 +259,11 @@ void Scene2401::update() {
} else if (_pipeStatus >= 5) {
_ssWaterPipes[_pipeStatus]->setVisible(true);
_countdown1 = 8;
- playPipeSound(kScene2401FileHashes3[getSubVar(VA_CURR_WATER_PIPES_LEVEL, _pipeStatus - 5)]);
+ playPipeSound(kScene2401FileHashes2[getSubVar(VA_CURR_WATER_PIPES_LEVEL, _pipeStatus - 5)]);
} else {
_ssWaterPipes[_pipeStatus]->setVisible(true);
_countdown1 = _pipeStatus == 4 ? 16 : 8;
- playPipeSound(kScene2401FileHashes3[getSubVar(VA_GOOD_WATER_PIPES_LEVEL, _pipeStatus)]);
+ playPipeSound(kScene2401FileHashes2[getSubVar(VA_GOOD_WATER_PIPES_LEVEL, _pipeStatus)]);
}
_pipeStatus++;
}
Commit: ce40801f5b80aaf8786b7ac790588bd83250372b
https://github.com/scummvm/scummvm/commit/ce40801f5b80aaf8786b7ac790588bd83250372b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-07T15:48:11+02:00
Commit Message:
MOHAWK: Comment out unused constant
Thanks to fingolfin for finding this unused code
Changed paths:
engines/mohawk/riven_external.cpp
diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp
index 3d0bccc..cda0683 100644
--- a/engines/mohawk/riven_external.cpp
+++ b/engines/mohawk/riven_external.cpp
@@ -2513,7 +2513,7 @@ void RivenExternal::xthideinventory(uint16 argc, uint16 *argv) {
static const uint32 kMarbleCount = 6;
static const int kSmallMarbleWidth = 4;
static const int kSmallMarbleHeight = 2;
-static const int kLargeMarbleSize = 8;
+//static const int kLargeMarbleSize = 8;
static const int kMarbleHotspotSize = 13;
static const char *s_marbleNames[] = { "tred", "torange", "tyellow", "tgreen", "tblue", "tviolet" };
More information about the Scummvm-git-logs
mailing list