[Scummvm-git-logs] scummvm master -> aca61ca2080a4f4830c12c239c79602f95cca8d1

dreammaster dreammaster at scummvm.org
Mon Mar 12 23:56:31 CET 2018


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
aca61ca208 TITANIC: Removed unused arrays and fields


Commit: aca61ca2080a4f4830c12c239c79602f95cca8d1
    https://github.com/scummvm/scummvm/commit/aca61ca2080a4f4830c12c239c79602f95cca8d1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-12T18:56:25-04:00

Commit Message:
TITANIC: Removed unused arrays and fields

Changed paths:
    engines/titanic/game/code_wheel.cpp
    engines/titanic/pet_control/pet_inventory.h
    engines/titanic/true_talk/bellbot_script.cpp


diff --git a/engines/titanic/game/code_wheel.cpp b/engines/titanic/game/code_wheel.cpp
index 29ae8e6..348864d 100644
--- a/engines/titanic/game/code_wheel.cpp
+++ b/engines/titanic/game/code_wheel.cpp
@@ -40,17 +40,6 @@ static const int END_FRAMES_EN[15] = {
 	5, 10, 15, 19, 24, 28, 33, 38, 42, 47, 52, 57, 61, 66, 70
 };
 
-static const int START_FRAMES_DE2[28] = {
-	390, 383, 375, 368, 361, 353, 346, 339, 331, 324,
-	317, 309, 302, 295, 287, 280, 272, 265, 258, 251,
-	244, 236, 229, 221, 214, 207, 199, 0
-};
-static const int END_FRAMES_DE2[28] = {
-	397, 390, 383, 375, 368, 361, 353, 346, 339, 331,
-	324, 317, 309, 302, 295, 287, 280, 272, 265, 258,
-	251, 244, 236, 229, 221, 214, 207, 0
-};
-
 static const int CORRECT_VALUES_DE[3][8] = {
 	{ 2, 7, 4, 8, 18, 18, 4, 17 },
 	{ 12, 0, 6, 10, 11, 20, 6, 18 },
diff --git a/engines/titanic/pet_control/pet_inventory.h b/engines/titanic/pet_control/pet_inventory.h
index 32f5eb4..c72145e 100644
--- a/engines/titanic/pet_control/pet_inventory.h
+++ b/engines/titanic/pet_control/pet_inventory.h
@@ -38,7 +38,6 @@ private:
 	CTextControl _text;
 	CPetInventoryGlyphs _items;
 	CGameObject *_itemBackgrounds[46];
-	CGameObject *_itemGlyphs[46];
 	CGameObject *_movie;
 	bool _isLoading;
 	int _titaniaBitFlags;
diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp
index 0256b97..46c5775 100644
--- a/engines/titanic/true_talk/bellbot_script.cpp
+++ b/engines/titanic/true_talk/bellbot_script.cpp
@@ -42,10 +42,6 @@ static const RoomDialogueId ROOM_DIALOGUE_IDS[] = {
 	{ 0, 0 }
 };
 
-static const uint PRERESPONSE_IDS_DE[] = {
-	0
-};
-
 BellbotScript::BellbotScript(int val1, const char *charClass, int v2,
 		const char *charName, int v3, int val2) :
 		TTnpcScript(val1, charClass, v2, charName, v3, val2, -1, -1, -1, 0),





More information about the Scummvm-git-logs mailing list