ILLUSIONS: Remove old TODOs

(cherry picked from commit bb95440)

14 files changed, 0 insertions, 46 deletions

diff --git a/engines/illusions/actor.cpp b/engines/illusions/actor.cpp
index a38814c3dc..8c9b28ed88 100644
--- a/engines/illusions/actor.cpp
+++ b/engines/illusions/actor.cpp
@@ -115,15 +115,6 @@ Actor::Actor(IllusionsEngine *vm)
 	_pathPointsCount = 0;
 	_pathNode = 0;
 
-#if 0 // TODO
-	_field2 = 0;
-	_field164 = 0;
-	_field18C = 0;
-	_field190 = 0;
-	_field192 = 0;
-	_field198 = 0;
-#endif
-
 }
 
 Actor::~Actor() {
@@ -732,11 +723,7 @@ void Control::startMoveActor(uint32 sequenceId, Common::Point destPt, uint32 cal
 	_actor->_pathFlag50 = false;
 	_actor->_seqCodeValue3 = 0;
 	_actor->_seqCodeValue1 = 0;
-	// TODO _actor->_field_BC = _actor->_position.x;
-	// TODO _actor->_field_BE = _actor->_position.x;
 	_actor->_pathInitialPosFlag = true;
-	// TODO _actor->_field_C0 = destPt.x;
-	// TODO _actor->_field_C2 = destPt.y;
 
 	uint newFacing;
 	if (_vm->calcPointDirection(_actor->_position, destPt, newFacing))
@@ -819,7 +806,6 @@ void Control::updateActorMovement(uint32 deltaTime) {
 
 		if (!_actor->_pathFlag50) {
 
-			// TODO Move to own function
 			FixedPoint16 angle;
 			if (currPt.x == prevPt.x) {
 				if (prevPt.y >= currPt.y)
@@ -831,7 +817,6 @@ void Control::updateActorMovement(uint32 deltaTime) {
 			}
 			_actor->_pathAngle = angle;
 
-			// TODO Move to own function
 			int16 v13 = (fixedTrunc(fixedMul(angle, 0x394BB8)) + 360) % 360; // 0x394BB8 is 180 / pi
 			if (deltaX >= 0)
 				v13 += 180;
@@ -1008,7 +993,6 @@ void Control::startSequenceActorIntern(uint32 sequenceId, int value, byte *entry
 }
 
 void Control::execSequenceOpcode(OpCall &opCall) {
-	// TODO Clean this up
 	_vm->_controls->_sequenceOpcodes->execOpcode(this, opCall);
 }
 
diff --git a/engines/illusions/actor.h b/engines/illusions/actor.h
index 0f76050d7c..046a963141 100644
--- a/engines/illusions/actor.h
+++ b/engines/illusions/actor.h
@@ -244,7 +244,6 @@ public:
 	Common::Point _feetPt;
 	Common::Point _position;
 	Common::Point _subobjectsPos[kSubObjectsCount];
-	// TODO 0000001C - 00000054 unknown
 	void startSequenceActorIntern(uint32 sequenceId, int value, byte *entryTblPtr, uint32 notifyThreadId);
 	void execSequenceOpcode(OpCall &opCall);
 };
diff --git a/engines/illusions/bbdou/bbdou_foodctl.h b/engines/illusions/bbdou/bbdou_foodctl.h
index 5a3177765e..70247bf943 100644
--- a/engines/illusions/bbdou/bbdou_foodctl.h
+++ b/engines/illusions/bbdou/bbdou_foodctl.h
@@ -30,7 +30,6 @@ namespace Illusions {
 
 class IllusionsEngine_BBDOU;
 
-// TODO Merge counts?
 const uint kFoodMaxPropertyIdsCount = 15;
 const uint kFoodCount = 16;
 
diff --git a/engines/illusions/bbdou/illusions_bbdou.cpp b/engines/illusions/bbdou/illusions_bbdou.cpp
index 78315c404c..7e443e2361 100644
--- a/engines/illusions/bbdou/illusions_bbdou.cpp
+++ b/engines/illusions/bbdou/illusions_bbdou.cpp
@@ -186,7 +186,6 @@ Common::Error IllusionsEngine_BBDOU::run() {
 	_scriptOpcodes = new ScriptOpcodes_BBDOU(this);
 	_stack = new ScriptStack();
 
-	// TODO Move to own class
 	_resGetCtr = 0;
 	_unpauseControlActorFlag = false;
 	_lastUpdateTime = 0;
@@ -266,7 +265,6 @@ bool IllusionsEngine_BBDOU::hasFeature(EngineFeature f) const {
 }
 
 void IllusionsEngine_BBDOU::initInput() {
-	// TODO Check if these are correct...
 	_input->setInputEvent(kEventLeftClick, 0x01)
 		.addMouseButton(MOUSE_LEFT_BUTTON)
 		.addKey(Common::KEYCODE_RETURN);
diff --git a/engines/illusions/bbdou/scriptopcodes_bbdou.cpp b/engines/illusions/bbdou/scriptopcodes_bbdou.cpp
index 9dd9c9aac4..d81cf0dac9 100644
--- a/engines/illusions/bbdou/scriptopcodes_bbdou.cpp
+++ b/engines/illusions/bbdou/scriptopcodes_bbdou.cpp
@@ -504,7 +504,6 @@ void ScriptOpcodes_BBDOU::opStartMoveActor(ScriptThread *scriptThread, OpCall &o
 	ARG_UINT32(namedPointId);
 	// NOTE Skipped checking for stalled sequence, not sure if needed
 	Control *control = _vm->_dict->getObjectControl(objectId);
-	//if (!control) { opCall._deltaOfs = 0; return; }// TODO CHECKME
 	if (!control) { return; }// TODO CHECKME
 	Common::Point pos = _vm->getNamedPointPosition(namedPointId);
 	control->startMoveActor(sequenceId, pos, opCall._callerThreadId, opCall._threadId);
diff --git a/engines/illusions/duckman/duckman_specialcode.cpp b/engines/illusions/duckman/duckman_specialcode.cpp
index dd4e68916a..a7f301ff1b 100644
--- a/engines/illusions/duckman/duckman_specialcode.cpp
+++ b/engines/illusions/duckman/duckman_specialcode.cpp
@@ -66,7 +66,6 @@ typedef Common::Functor1Mem<OpCall&, void, DuckmanSpecialCode> SpecialCodeFuncti
 #define SPECIAL(id, func) _specialCodeMap[id] = new SpecialCodeFunctionDM(this, &DuckmanSpecialCode::func);
 
 void DuckmanSpecialCode::init() {
-	// TODO
 	SPECIAL(0x00160001, spcStartScreenShaker);
 	SPECIAL(0x00160002, spcSetCursorHandMode);
 	SPECIAL(0x00160003, spcResetChinesePuzzle);
diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp
index c6ae20c675..912c4f6975 100644
--- a/engines/illusions/illusions.cpp
+++ b/engines/illusions/illusions.cpp
@@ -142,7 +142,6 @@ uint32 IllusionsEngine::getElapsedUpdateTime() {
 }
 
 int IllusionsEngine::updateActors(uint flags) {
-	// TODO Move to Controls class
 	uint32 deltaTime = getElapsedUpdateTime();
 	for (Controls::ItemsIterator it = _controls->_controls.begin(); it != _controls->_controls.end(); ++it) {
 		Control *control = *it;
@@ -153,7 +152,6 @@ int IllusionsEngine::updateActors(uint flags) {
 }
 
 int IllusionsEngine::updateSequences(uint flags) {
-	// TODO Move to Controls class
 	for (Controls::ItemsIterator it = _controls->_controls.begin(); it != _controls->_controls.end(); ++it) {
 		Control *control = *it;
 		if (control->_pauseCtr == 0 && control->_actor && control->_actor->_seqCodeIp) {
@@ -171,7 +169,6 @@ int IllusionsEngine::updateGraphics(uint flags) {
 	_camera->update(currTime);
 	updateFader();
 
-	// TODO Move to BackgroundInstanceList class
 	BackgroundInstance *backgroundItem = _backgroundInstances->findActiveBackgroundInstance();
 	if (backgroundItem) {
 		BackgroundResource *bgRes = backgroundItem->_bgRes;
@@ -185,7 +182,6 @@ int IllusionsEngine::updateGraphics(uint flags) {
 		}
 	}
 
-	// TODO Move to Controls class
 	for (Controls::ItemsIterator it = _controls->_controls.begin(); it != _controls->_controls.end(); ++it) {
 		Control *control = *it;
 		Actor *actor = control->_actor;
@@ -198,12 +194,6 @@ int IllusionsEngine::updateGraphics(uint flags) {
 					frame->_compressedPixels, actor->_surface);
 				actor->_flags &= ~Illusions::ACTOR_FLAG_2000;
 			}
-			/* Unused
-			if (actor->_flags & 0x4000) {
-				nullsub_1(&actor->drawFlags);
-				actor->flags &= ~0x4000;
-			}
-			*/
 			if (actor->_surfInfo._dimensions._width && actor->_surfInfo._dimensions._height) {
 				uint32 priority = control->getDrawPriority();
 				_screen->_drawQueue->insertSprite(&actor->_drawFlags, actor->_surface,
@@ -214,7 +204,6 @@ int IllusionsEngine::updateGraphics(uint flags) {
 	}
 
 	if (_screenText->_surface) {
-		// TODO Make nicer
 		uint32 priority = getGameId() == kGameIdDuckman ? getPriorityFromBase(19) : getPriorityFromBase(99);
 		_screen->_drawQueue->insertTextSurface(_screenText->_surface, _screenText->_dimensions,
 			_screenText->_position, priority);
diff --git a/engines/illusions/input.cpp b/engines/illusions/input.cpp
index 12d8436e86..1374e44ce3 100644
--- a/engines/illusions/input.cpp
+++ b/engines/illusions/input.cpp
@@ -97,7 +97,6 @@ Input::Input() {
 }
 
 void Input::processEvent(Common::Event event) {
-	// TODO
 	switch (event.type) {
 	case Common::EVENT_KEYDOWN:
 		handleKey(event.kbd.keycode, MOUSE_NONE, true);
diff --git a/engines/illusions/resources/fontresource.h b/engines/illusions/resources/fontresource.h
index 1a433a2e51..f583ffcfb0 100644
--- a/engines/illusions/resources/fontresource.h
+++ b/engines/illusions/resources/fontresource.h
@@ -40,8 +40,6 @@ protected:
 	IllusionsEngine *_vm;
 };
 
-// TODO
-
 struct CharInfo {
 	int16 _width;
 	int16 _field_2;
diff --git a/engines/illusions/resourcesystem.h b/engines/illusions/resourcesystem.h
index 56e5f2dc22..6f61ee6080 100644
--- a/engines/illusions/resourcesystem.h
+++ b/engines/illusions/resourcesystem.h
@@ -83,8 +83,6 @@ public:
 	virtual bool isFlag(int flag) = 0;
 };
 
-// TODO Possibly split resource loaders from the system?
-
 class ResourceSystem {
 public:
 	ResourceSystem(IllusionsEngine *vm);
diff --git a/engines/illusions/screentext.cpp b/engines/illusions/screentext.cpp
index fd2ef51bc2..f4281144c2 100644
--- a/engines/illusions/screentext.cpp
+++ b/engines/illusions/screentext.cpp
@@ -60,7 +60,6 @@ void ScreenText::updateTextInfoPosition(Common::Point position) {
 }
 
 void ScreenText::clipTextInfoPosition(Common::Point &position) {
-	// TODO Move values outside
 	if (_vm->getGameId() == kGameIdBBDOU) {
 		// BBDOU
 		if (position.x < 2)
diff --git a/engines/illusions/thread.cpp b/engines/illusions/thread.cpp
index afc3a6d2d4..084b28d949 100644
--- a/engines/illusions/thread.cpp
+++ b/engines/illusions/thread.cpp
@@ -137,12 +137,10 @@ ThreadList::ThreadList(IllusionsEngine *vm)
 }
 
 void ThreadList::startThread(Thread *thread) {
-	// TODO sceneId has to be set by the Thread class
 	_threads.push_back(thread);
 }
 
 void ThreadList::updateThreads() {
-	// TODO Move outer loop to caller
 	while (1) {
 		Iterator it = _threads.begin();
 		while (it != _threads.end()) {
diff --git a/engines/illusions/threads/talkthread.cpp b/engines/illusions/threads/talkthread.cpp
index 9966308107..34abda89a8 100644
--- a/engines/illusions/threads/talkthread.cpp
+++ b/engines/illusions/threads/talkthread.cpp
@@ -110,10 +110,8 @@ int TalkThread::onUpdate() {
 		_entryText = talkEntry->_text;
 		_entryTblPtr = talkEntry->_tblPtr;
 		if (_sequenceId1) {
-			// TODO _field30 = v6;
 			_pauseCtr = 0;
 		} else {
-			// TODO _field30 = 0;
 			_flags |= 2;
 			_flags |= 1;
 		}
@@ -358,7 +356,6 @@ void TalkThread::onKill() {
 }
 
 uint32 TalkThread::sendMessage(int msgNum, uint32 msgValue) {
-	// TODO
 	switch (msgNum) {
 	case kMsgQueryTalkThreadActive:
 		if (_status != 1 && _status != 2)
@@ -367,7 +364,6 @@ uint32 TalkThread::sendMessage(int msgNum, uint32 msgValue) {
 	case kMsgClearSequenceId1:
 		_sequenceId1 = 0;
 		_flags |= 3;
-		// TODO _field30 = 0;
 		break;
 	case kMsgClearSequenceId2:
 		_sequenceId2 = 0;
diff --git a/engines/illusions/threads/talkthread_duckman.cpp b/engines/illusions/threads/talkthread_duckman.cpp
index 2b1294c846..0b67248832 100644
--- a/engines/illusions/threads/talkthread_duckman.cpp
+++ b/engines/illusions/threads/talkthread_duckman.cpp
@@ -268,7 +268,6 @@ uint32 TalkThread_Duckman::sendMessage(int msgNum, uint32 msgValue) {
 	case kMsgClearSequenceId1:
 		_sequenceId1 = 0;
 		_flags |= 3;
-		// TODO _pauseCtrPtr = 0;
 		break;
 	case kMsgClearSequenceId2:
 		_sequenceId2 = 0;