NEVERHOOD: Use hardcoded values as width/height of several sprites (in the original the values were loaded from the entry's extData but since all values are constant anyway it shouldn't matter)

8 files changed, 14 insertions, 25 deletions

diff --git a/engines/neverhood/module1100.cpp b/engines/neverhood/module1100.cpp
index e46ed262ec..b825ced051 100644
--- a/engines/neverhood/module1100.cpp
+++ b/engines/neverhood/module1100.cpp
@@ -353,8 +353,7 @@ void SsScene1105SymbolDie::hide() {
 AsScene1105TeddyBear::AsScene1105TeddyBear(NeverhoodEngine *vm, Scene *parentScene)
 	: AnimatedSprite(vm, 1100), _parentScene(parentScene) {
 	
-	// TODO createSurface3(100, dword_4AF4C0);
-	createSurface(100, 640, 480); //TODO: Remeove once the line above is done
+	createSurface(100, 556, 328);
 	_x = 320;
 	_y = 240;
 	SetUpdateHandler(&AnimatedSprite::update);
diff --git a/engines/neverhood/module1300.cpp b/engines/neverhood/module1300.cpp
index c81cbaa144..3f606e7e4b 100644
--- a/engines/neverhood/module1300.cpp
+++ b/engines/neverhood/module1300.cpp
@@ -581,8 +581,7 @@ uint32 Scene1302::handleMessage(int messageNum, const MessageParam &param, Entit
 AsScene1303Balloon::AsScene1303Balloon(NeverhoodEngine *vm, Scene *parentScene)
 	: AnimatedSprite(vm, 1100), _parentScene(parentScene) {
 	
-	// TODO createSurface3(200, dword_4AF9F8);
-	createSurface(200, 640, 480); //TODO: Remeove once the line above is done
+	createSurface(200, 128, 315);
 	_x = 289;
 	_y = 390;
 	SetUpdateHandler(&AnimatedSprite::update);
@@ -1119,8 +1118,7 @@ AsScene1307Key::AsScene1307Key(NeverhoodEngine *vm, Scene *parentScene, uint ind
 	_x = pt.x;
 	_y = pt.y;
 	
-	// TODO createSurface3(kAsScene1307KeySurfacePriorities[getSubVar(VA_CURR_KEY_SLOT_NUMBERS, _index) % 4], fileHashes);
-	createSurface(kAsScene1307KeySurfacePriorities[getSubVar(VA_CURR_KEY_SLOT_NUMBERS, _index) % 4], 640, 480); //TODO: Remeove once the line above is done
+	createSurface(kAsScene1307KeySurfacePriorities[getSubVar(VA_CURR_KEY_SLOT_NUMBERS, _index) % 4], 190, 148);
 	
 	SetUpdateHandler(&AnimatedSprite::update);
 	SetMessageHandler(&AsScene1307Key::handleMessage);
diff --git a/engines/neverhood/module1400.cpp b/engines/neverhood/module1400.cpp
index 82ac01d783..e4e2550967 100644
--- a/engines/neverhood/module1400.cpp
+++ b/engines/neverhood/module1400.cpp
@@ -137,8 +137,7 @@ void Module1400::updateScene() {
 AsScene1401Pipe::AsScene1401Pipe(NeverhoodEngine *vm)
 	: AnimatedSprite(vm, 1100), _countdown1(0), _countdown2(0) {
 	
-	// TODO createSurface3(900, dword_4B6768);
-	createSurface(900, 640, 480); //TODO: Remeove once the line above is done
+	createSurface(900, 152, 147);
 	_x = 454;
 	_y = 217;
 	SetMessageHandler(&AsScene1401Pipe::handleMessage);
@@ -224,8 +223,7 @@ void AsScene1401Pipe::stSuckInProjector() {
 AsScene1401Mouse::AsScene1401Mouse(NeverhoodEngine *vm)
 	: AnimatedSprite(vm, 1100) {
 	
-	// TODO createSurface3(100, dword_4B6778);
-	createSurface(100, 640, 480); //TODO: Remeove once the line above is done
+	createSurface(100, 71, 41);
 	_x = 478;
 	_y = 433;
 	SetUpdateHandler(&AnimatedSprite::update);
@@ -271,8 +269,7 @@ void AsScene1401Mouse::stSuckedIn() {
 AsScene1401Cheese::AsScene1401Cheese(NeverhoodEngine *vm)
 	: AnimatedSprite(vm, 1100) {
 
-	// TODO createSurface3(200, dword_4B6768);
-	createSurface(200, 640, 480); //TODO: Remeove once the line above is done
+	createSurface(200, 152, 147);
 	_x = 427;
 	_y = 433;
 	SetUpdateHandler(&AnimatedSprite::update);
@@ -388,8 +385,7 @@ AsCommonProjector::AsCommonProjector(NeverhoodEngine *vm, Scene *parentScene, Sp
 	: AnimatedSprite(vm, 1100), _parentScene(parentScene), _klayman(klayman), _asPipe(asPipe) {
 
 	_asProjectorItem = &kAsCommonProjectorItems[getGlobalVar(V_PROJECTOR_LOCATION)];
-	// TODO createSurface3(990, dword_4B26D8);
-	createSurface(990, 640, 480); //TODO: Remeove once the line above is done
+	createSurface(990, 101, 182);
 	startAnimation(0x10E3042B, 0, -1);
 	SetUpdateHandler(&AnimatedSprite::update);
 	SetMessageHandler(&AsCommonProjector::handleMessage);
@@ -803,8 +799,7 @@ SsScene1402BridgePart::SsScene1402BridgePart(NeverhoodEngine *vm, uint32 fileHas
 AsScene1402PuzzleBox::AsScene1402PuzzleBox(NeverhoodEngine *vm, Scene *parentScene, int which)
 	: AnimatedSprite(vm, 1100), _parentScene(parentScene) {
 
-	// TODO createSurface3(900, dword_4B6768);
-	createSurface(900, 640, 480); //TODO: Remeove once the line above is done
+	createSurface(900, 152, 147);
 
 	SetFilterY(&Sprite::defFilterY);
 	SetUpdateHandler(&AnimatedSprite::update);
@@ -1105,8 +1100,7 @@ static const struct {
 AsScene1407Mouse::AsScene1407Mouse(NeverhoodEngine *vm, Scene *parentScene)
 	: AnimatedSprite(vm, 1100), _parentScene(parentScene), _currSectionIndex(0) {
 	
-	// TODO createSurface3(100, dword_4B05B0);
-	createSurface(100, 640, 480); //TODO: Remeove once the line above is done
+	createSurface(100, 117, 45);
 
 	SetUpdateHandler(&AnimatedSprite::update);
 	_x = 108;
diff --git a/engines/neverhood/module1600.cpp b/engines/neverhood/module1600.cpp
index ae8fd7fabc..a69b8d0140 100644
--- a/engines/neverhood/module1600.cpp
+++ b/engines/neverhood/module1600.cpp
@@ -186,8 +186,7 @@ AsCommonCar::AsCommonCar(NeverhoodEngine *vm, Scene *parentScene, int16 x, int16
 	SetMessageHandler(&AsCommonCar::handleMessage);
 	SetSpriteUpdate(NULL);
 
-	// TODO createSurface2(200, dword_4AF4C0);
-	createSurface(200, 640, 480); //TODO: Remove once the line above is done
+	createSurface(200, 556, 328);
 	_x = x;
 	_y = y;
 	
diff --git a/engines/neverhood/module2100.cpp b/engines/neverhood/module2100.cpp
index 700f0cdbd8..950b64d229 100644
--- a/engines/neverhood/module2100.cpp
+++ b/engines/neverhood/module2100.cpp
@@ -80,8 +80,7 @@ void Module2100::updateScene() {
 AsScene2101Door::AsScene2101Door(NeverhoodEngine *vm, bool flag)
 	: AnimatedSprite(vm, 1100) {
 
-	// TODO createSurface3(100, dword_4B9018);
-	createSurface(100, 640, 480); //TODO: Remove once the line above is done
+	createSurface(100, 328, 347);
 	_x = 320;
 	_y = 240;
 	SetUpdateHandler(&AnimatedSprite::update);
diff --git a/engines/neverhood/module2400.cpp b/engines/neverhood/module2400.cpp
index c75e85b2bf..f791c8ea13 100644
--- a/engines/neverhood/module2400.cpp
+++ b/engines/neverhood/module2400.cpp
@@ -635,7 +635,7 @@ void AsScene2402Door::stDoorClosingFinished() {
 AsScene2402TV::AsScene2402TV(NeverhoodEngine *vm, Klayman *klayman)
 	: AnimatedSprite(vm, 1100), _klayman(klayman), _countdown1(0), _countdown2(0) {
 
-	createSurface(100, 640, 480); // TODO Use correct size	from the two hashes
+	createSurface(100, 127, 90);
 	SetMessageHandler(&Sprite::handleMessage);
 	_x = 260;
 	_y = 210;
diff --git a/engines/neverhood/module2700.cpp b/engines/neverhood/module2700.cpp
index 9bac035a38..9ff0da1424 100644
--- a/engines/neverhood/module2700.cpp
+++ b/engines/neverhood/module2700.cpp
@@ -523,7 +523,7 @@ AsCommonCarShadow::AsCommonCarShadow(NeverhoodEngine *vm, AnimatedSprite *asCar,
 	: AnimatedSprite(vm, 1100), _asCar(asCar), _index(index), _animFileHash(0) {
 
 	SetUpdateHandler(&AsCommonCarShadow::update);
-	createShadowSurface(shadowSurface, 320, 240, 100); // TODO Use actual dimensions from resource
+	createShadowSurface(shadowSurface, 211, 147, 100);
 	updateShadow();
 } 
 
diff --git a/engines/neverhood/module2800.cpp b/engines/neverhood/module2800.cpp
index a1a93bd1de..1b039685c6 100644
--- a/engines/neverhood/module2800.cpp
+++ b/engines/neverhood/module2800.cpp
@@ -675,7 +675,7 @@ AsScene2803LightCord::AsScene2803LightCord(NeverhoodEngine *vm, Scene *parentSce
 	: AnimatedSprite(vm, 1100), _parentScene(parentScene), _fileHash1(fileHash1), _fileHash2(fileHash2),
 	_isPulled(false), _isBusy(false) {
 
-	createSurface(1010, 640, 480); // TODO Use correct size	from the two hashes
+	createSurface(1010, 28, 379);
 	SetUpdateHandler(&AnimatedSprite::update);
 	SetSpriteUpdate(&AnimatedSprite::updateDeltaXY);
 	_x = x;