[Scummvm-cvs-logs] scummvm master -> 69290ef7aeba8e67a1d537fff20825b9f39a1d86

[dreammaster]

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:
69290ef7ae TSAGE: Remove out of date TODO comments where applicable


Commit: 69290ef7aeba8e67a1d537fff20825b9f39a1d86
    https://github.com/scummvm/scummvm/commit/69290ef7aeba8e67a1d537fff20825b9f39a1d86
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-06-22T02:13:36-07:00

Commit Message:
TSAGE: Remove out of date TODO comments where applicable

Changed paths:
    engines/tsage/core.cpp
    engines/tsage/graphics.cpp
    engines/tsage/ringworld_logic.cpp
    engines/tsage/ringworld_scenes1.cpp
    engines/tsage/scenes.cpp
    engines/tsage/scenes.h
    engines/tsage/sound.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 4603379..76714a6 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2869,8 +2869,6 @@ void Region::draw() {
 }
 
 void Region::uniteLine(int yp, LineSliceSet &sliceSet) {
-	// TODO: More properly implement like the original
-
 	// First expand the bounds as necessary to fit in the row
 	if (_ySlices.empty()) {
 		_bounds = Rect(sliceSet.items[0].xs, yp, sliceSet.items[sliceSet.items.size() - 1].xe, yp + 1);
@@ -3024,13 +3022,12 @@ void WalkRegion::loadProcessList(byte *dataP, int dataSize, int &dataIndex, int
 		int yp = READ_LE_UINT16(dataP + idx * 4 + 2);
 		if (yp != y1) {
 			/*
-			 * Commented out: doesn't seem to be used
+			 * Commented out: v doesn't seem to be used
 			int v;
 			if (idx == (dataSize - 1))
 				v = READ_LE_UINT16(dataP + 2);
 			else
 				v = process1(idx, dataP, dataSize);
-			warning("TODO: v not used? - %d", v);
 			*/
 			process2(dataIndex, x1, y1, xp, yp);
 			++dataIndex;
@@ -3547,9 +3544,10 @@ void SceneHandler::dispatch() {
 	if (_globals->_sceneManager._scene)
 		_globals->_sceneManager._scene->dispatch();
 
-	//TODO: Figure out purpose of the given list
-	//_globals->_regions.forEach(SceneHandler::handleListener);
+	// Not actually used
+	//_eventListeners.forEach(SceneHandler::handleListener);
 
+	// Handle pending eents
 	Event event;
 	while (_globals->_events.getEvent(event))
 		process(event);
@@ -3573,7 +3571,6 @@ void SceneHandler::dispatchObject(EventHandler *obj) {
 }
 
 void SceneHandler::saveListener(Serializer &ser) {
-	warning("TODO: SceneHandler::saveListener");
 }
 
 } // End of namespace tSage
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 23f5f22..1d43272 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -895,7 +895,7 @@ bool GfxButton::process(Event &event) {
 
 	case EVENT_KEYPRESS:
 		if (!event.handled && (event.kbd.keycode == _keycode)) {
-			// TODO: Ensure momentary click operation displays
+			// Highlight the button momentarily
 			highlight();
 			g_system->delayMillis(20);
 			highlight();
diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp
index eece4ab..1dd905b 100644
--- a/engines/tsage/ringworld_logic.cpp
+++ b/engines/tsage/ringworld_logic.cpp
@@ -667,7 +667,6 @@ void SpeakerQL::setText(const Common::String &msg) {
 /*--------------------------------------------------------------------------*/
 
 SpeakerSR::SpeakerSR() {
-	// TODO: check initialization of object3
 	_speakerName = "SR";
 	_newSceneNumber = 2811;
 	_textPos = Common::Point(10, 30);
diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index 717841d..29b7c9b 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -1255,8 +1255,7 @@ void Scene40::Action7::signal() {
 
 	switch (_actionIndex++) {
 	case 0:
-		// TODO: check if it's rand(500) or rand(499)+500
-		setDelay(_globals->_randomSource.getRandomNumber(500));
+		setDelay(_globals->_randomSource.getRandomNumber(499) + 500);
 		break;
 	case 1:
 		scene->_object7.postInit();
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index a820a20..6352918 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -105,8 +105,6 @@ void SceneManager::sceneChange() {
 	// Set the next scene to be active
 	_sceneNumber = _nextSceneNumber;
 
-	// TODO: Unknown check of word_45CD3 / call to saver method
-
 	// Free any regions
 	disposeRegions();
 
@@ -208,7 +206,6 @@ void SceneManager::setBackSurface() {
 }
 
 void SceneManager::saveListener(int saveMode) {
-	warning("TODO: SceneManager::saveLIstener");
 }
 
 void SceneManager::loadNotifier(bool postFlag) {
diff --git a/engines/tsage/scenes.h b/engines/tsage/scenes.h
index b3c009c..5845efa 100644
--- a/engines/tsage/scenes.h
+++ b/engines/tsage/scenes.h
@@ -71,7 +71,9 @@ public:
 
 class SceneManager : public GameHandler, public SaveListener {
 private:
-	void disposeRegions() { warning("TODO: disposeRegions()"); }
+	void disposeRegions() { 
+		// No need to do anything, since regions will be freed automatically when the scene is	
+	}
 	Scene *getNewScene();
 public:
 	Scene *_scene;
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index d57aa87..dc7b659 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -1869,7 +1869,6 @@ void Sound::_soServiceTrackType0(int trackIndex, const byte *channelData) {
 
 				if (channelNum != -1) {
 					if (voiceType == VOICETYPE_1) {
-						// TODO: sub_25E32/sub_25DD8
 						if (chFlags & 0x10)
 							_soProc42(vtStruct, channelNum, chVoiceType, v);
 						else