MADS: Remove some redundant TODOs

10 files changed, 1 insertions, 54 deletions

diff --git a/engines/mads/msurface.cpp b/engines/mads/msurface.cpp
index 4fae799c28..3ebbc6b79d 100644
--- a/engines/mads/msurface.cpp
+++ b/engines/mads/msurface.cpp
@@ -310,7 +310,7 @@ void MSurface::copyFrom(MSurface *src, const Common::Point &destPos, int depth,
 
 	int destRight = this->getWidth() - 1;
 	int destBottom = this->getHeight() - 1;
-	bool normalFrame = true;	// TODO: false for negative frame numbers
+	bool normalFrame = true;
 	int frameWidth = src->getWidth();
 	int frameHeight = src->getHeight();
 
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index b2076a2b7c..950552148f 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -1400,8 +1400,6 @@ void Scene205::synchronize(Common::Serializer &s) {
 	s.syncAsUint32LE(_chickenTime);
 	s.syncAsByte(_beingKicked);
 	s.syncAsSint16LE(_kernelMessage);
-
-	_dialog1.synchronize(s);
 }
 
 /*****************************************************************************/
@@ -4501,14 +4499,6 @@ void Scene210::synchronize(Common::Serializer &s) {
 	s.syncAsSint32LE(_doorway);
 
 	s.syncString(_subQuote2);
-
-	_conv1.synchronize(s);
-	_conv2.synchronize(s);
-	_conv3.synchronize(s);
-	_conv5.synchronize(s);
-	_conv6.synchronize(s);
-	_conv7.synchronize(s);
-	_conv8.synchronize(s);
 }
 
 /*------------------------------------------------------------------------*/
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 9237c62f48..5391b5f93d 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -1157,9 +1157,6 @@ void Scene307::synchronize(Common::Serializer &s) {
 	s.syncAsUint32LE(_prisonerTimer);
 
 	s.syncString(_subQuote2);
-
-	_dialog1.synchronize(s);
-	_dialog2.synchronize(s);
 }
 
 /*------------------------------------------------------------------------*/
@@ -2954,8 +2951,6 @@ void Scene318::synchronize(Common::Serializer &s) {
 	s.syncAsUint32LE(_lastFrameCounter);
 
 	s.syncString(_subQuote2);
-
-	_dialog1.synchronize(s);
 }
 
 /*------------------------------------------------------------------------*/
@@ -3421,10 +3416,6 @@ void Scene319::actions() {
 void Scene319::synchronize(Common::Serializer &s) {
 	Scene3xx::synchronize(s);
 
-	_dialog1.synchronize(s);
-	_dialog2.synchronize(s);
-	_dialog3.synchronize(s);
-
 	s.syncAsUint32LE(_animMode);
 	s.syncAsUint32LE(_animFrame);
 	s.syncAsUint32LE(_nextAction1);
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index 586d59d2b5..4156842c0e 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -284,11 +284,6 @@ void Scene402::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_roxMode);
 	s.syncAsSint16LE(_rexMode);
 	s.syncAsSint16LE(_talkTimer);
-
-	_dialog1.synchronize(s);
-	_dialog2.synchronize(s);
-	_dialog3.synchronize(s);
-	_dialog4.synchronize(s);
 }
 
 void Scene402::setDialogNode(int node) {
@@ -3968,11 +3963,6 @@ void Scene411::synchronize(Common::Serializer &s) {
 
 	s.syncAsByte(_killRox);
 	s.syncAsByte(_makeMushroomCloud);
-
-	_dialog1.synchronize(s);
-	_dialog2.synchronize(s);
-	_dialog3.synchronize(s);
-	_dialog4.synchronize(s);
 }
 
 /*------------------------------------------------------------------------*/
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 6f802b22dc..4313366e08 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -3016,9 +3016,6 @@ void Scene611::synchronize(Common::Serializer &s) {
 
 	s.syncAsSint16LE(_defaultDialogPos.x);
 	s.syncAsSint16LE(_defaultDialogPos.y);
-
-	_dialog1.synchronize(s);
-	_dialog2.synchronize(s);
 }
 
 void Scene611::handleRatMoves() {
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 895c4ec78e..e9d8f7f4cb 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -567,8 +567,6 @@ void Scene703::synchronize(Common::Serializer &s) {
 
 	s.syncAsUint32LE(_lastFrameTime);
 	s.syncAsUint32LE(_monsterTime);
-
-	_dialog1.synchronize(s);
 }
 
 void Scene703::handleBottleInterface() {
@@ -1108,8 +1106,6 @@ void Scene704::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_boatDirection);
 
 	s.syncAsByte(_takeBottleFl);
-
-	_dialog1.synchronize(s);
 }
 
 void Scene704::handleBottleInterface() {
@@ -1451,8 +1447,6 @@ void Scene705::setup() {
 
 void Scene705::synchronize(Common::Serializer &s) {
 	Scene7xx::synchronize(s);
-
-	_dialog1.synchronize(s);
 }
 
 void Scene705::handleBottleInterface() {
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 23e889566e..c34f2c63d7 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -400,7 +400,6 @@ void Fader::fadeToGrey(byte palette[PALETTE_SIZE], byte *paletteMap,
 
 		setFullPalette(palette);
 
-		// TODO: Adjust waiting
 		_vm->_events->waitForNextFrame();
 	}
 
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 0c241eb9ab..0e3960c0f8 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -187,8 +187,6 @@ void Scene::loadScene(int sceneId, const Common::String &prefix, bool palFlag) {
 
 	_vm->_game->_screenObjects._category = CAT_NONE;
 	_vm->_events->showCursor();
-
-	warning("TODO: inventory_anim_allocate");
 }
 
 void Scene::loadHotspots() {
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index 4d8ed82f98..3fab30a0ab 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -838,7 +838,6 @@ void UserInterface::addConversationMessage(int vocabId, const Common::String &ms
 void UserInterface::loadInventoryAnim(int objectId) {
 	Scene &scene = _vm->_game->_scene;
 	noInventoryAnim();
-	bool flag = true;
 
 	if (_vm->_invObjectsAnimated) {
 		Common::String resName = Common::String::format("*OB%.3dI", objectId);
@@ -846,13 +845,8 @@ void UserInterface::loadInventoryAnim(int objectId) {
 		_invSpritesIndex = scene._sprites.add(asset, 1);
 		if (_invSpritesIndex >= 0) {
 			_invFrameNumber = 1;
-			flag = false;
 		}
 	}
-
-	if (flag) {
-		// TODO: Use of inv_object_data?
-	}
 }
 
 void UserInterface::noInventoryAnim() {
diff --git a/engines/mads/user_interface.h b/engines/mads/user_interface.h
index 2fdc80bf86..827fa3041f 100644
--- a/engines/mads/user_interface.h
+++ b/engines/mads/user_interface.h
@@ -128,12 +128,6 @@ public:
 	 * Starts the conversation
 	 */
 	void start();
-
-	/**
-	 * Synchronize the conversation
-	 */
-	void synchronize(Common::Serializer &s) { warning("TODO: Synchronize Conversation"); };
-
 };
 
 class UserInterface : public MSurface {