[Scummvm-cvs-logs] scummvm master -> c8b418036f6215729edfcfa373053f88fa3f2129

[Strangerke]

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

Summary:
c2d66be88d TSAGE: Suppress some dead code, rename a variable (thanks fuzzie for pointing that)
c8b418036f TSAGE: Replace the recently added error() by a warning(), allowing to play the CD version


Commit: c2d66be88d3841e12ecf7b02a751d15161f8cf54
    https://github.com/scummvm/scummvm/commit/c2d66be88d3841e12ecf7b02a751d15161f8cf54
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-04-13T13:40:58-07:00

Commit Message:
TSAGE: Suppress some dead code, rename a variable (thanks fuzzie for pointing that)

Changed paths:
    engines/tsage/ringworld_scenes10.cpp
    engines/tsage/ringworld_scenes10.h



diff --git a/engines/tsage/ringworld_scenes10.cpp b/engines/tsage/ringworld_scenes10.cpp
index 30a0ffd..7b3d00d 100644
--- a/engines/tsage/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld_scenes10.cpp
@@ -1676,18 +1676,18 @@ void Scene9900::strAction1::signal() {
 void Scene9900::strAction2::signal() {
 	switch (_actionIndex++) {
 	case 0:
-		var1 = 0;
+		_lineNum = 0;
 		_txtArray1Index = 0;
 		_txtArray1[0]._position.y = 200;
 		_txtArray1[0]._position.y = 300;
 		_txtArray2[0]._position.y = 400;
 		_txtArray2[0]._position.y = 500;
-		var3 = 0;
+		_var3 = 0;
 		// No break on purpose
 	case 1: {
-		Common::String msg = _vm->_dataManager->getMessage(8030, var1++);
+		Common::String msg = _vm->_dataManager->getMessage(8030, _lineNum++);
 		if (!msg.compareTo("LASTCREDIT")) {
-			if (var3 == 0) {
+			if (_var3 == 0) {
 				// Not used?
 				// int x = _txtArray1[_txtArray1Index].getFrame().getBounds().height();
 				_txtArray1[_txtArray1Index]._moveDiff.y = 10;
@@ -1701,7 +1701,7 @@ void Scene9900::strAction2::signal() {
 				_txtArray2[_txtArray1Index]._moveDiff.y = 10;
 				_txtArray1Index = (_txtArray1Index + 1) % 2;
 			}
-			var3 = 1;
+			_var3 = 1;
 			_txtArray1[_txtArray1Index]._textMode = ALIGN_CENTRE;
 			_txtArray1[_txtArray1Index]._width = 240;
 			_txtArray1[_txtArray1Index]._fontNumber = 2;
@@ -1722,7 +1722,7 @@ void Scene9900::strAction2::signal() {
 			_txtArray2[_txtArray1Index]._fontNumber = 2;
 			_txtArray2[_txtArray1Index]._colour1 = 23;
 
-			msg = _vm->_dataManager->getMessage(8030, var1++);
+			msg = _vm->_dataManager->getMessage(8030, _lineNum++);
 			_txtArray2[_txtArray1Index].setup(msg);
 			_txtArray2[_txtArray1Index]._field7A = 20;
 			_txtArray2[_txtArray1Index]._moveDiff.y = 2;
diff --git a/engines/tsage/ringworld_scenes10.h b/engines/tsage/ringworld_scenes10.h
index a89456e..2f5ce0f 100644
--- a/engines/tsage/ringworld_scenes10.h
+++ b/engines/tsage/ringworld_scenes10.h
@@ -467,7 +467,7 @@ class Scene9900 : public Scene {
 	public:
 		SceneText _txtArray1[2];
 		SceneText _txtArray2[2];
-		int var1, _txtArray1Index, var3;
+		int _lineNum, _txtArray1Index, _var3;
 
 		virtual void signal();
 		virtual void dispatch();
@@ -482,17 +482,6 @@ class Scene9900 : public Scene {
 		virtual void signal();
 	};
 
-	class SceneTextArr1 {
-	public:
-		SceneText _sceneText[2];
-	};
-
-	class SceneTextArr2 {
-	public:
-		SceneText _sceneText[2];
-		int _var1, var2, var3;
-	};
-
 public:
 	SoundHandler _soundHandler;
 	SequenceManager _sequenceManager;


Commit: c8b418036f6215729edfcfa373053f88fa3f2129
    https://github.com/scummvm/scummvm/commit/c8b418036f6215729edfcfa373053f88fa3f2129
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-04-13T13:51:53-07:00

Commit Message:
TSAGE: Replace the recently added error() by a warning(), allowing to play the CD version

Changed paths:
    engines/tsage/resources.h



diff --git a/engines/tsage/resources.h b/engines/tsage/resources.h
index 886f117..9024ff0 100644
--- a/engines/tsage/resources.h
+++ b/engines/tsage/resources.h
@@ -127,7 +127,7 @@ public:
 	byte *lock(uint32 handle);
 	int indexOf(const byte *p);
 	void deallocate(const byte *p);
-	void deallocate(uint16 handle) { error("TODO: MemoryManager::deallocate(handle)"); }
+	void deallocate(uint16 handle) { warning("TODO: MemoryManager::deallocate(handle)"); }
 	uint32 getSize(const byte *p);
 	void incLocks(const byte *p);
 };