[Scummvm-cvs-logs] scummvm master -> 30bd58649031d3174c81cddb45a0ee44652195fd

[dreammaster]

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:
6ffb969fd8 TSAGE: Added enumeration for crawling direction in R2R scene 1200
30bd586490 TSAGE: Bugfix for disappearing player in R2R scene 1200


Commit: 6ffb969fd84ef5ce2ad1657e40fbbd5ccf037ddb
    https://github.com/scummvm/scummvm/commit/6ffb969fd84ef5ce2ad1657e40fbbd5ccf037ddb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-07-05T18:09:58-07:00

Commit Message:
TSAGE: Added enumeration for crawling direction in R2R scene 1200

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp
    engines/tsage/ringworld2/ringworld2_scenes1.h



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 7cd1e92..1f15d55 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1405,16 +1405,16 @@ void Scene1200::process(Event &event) {
 		case CURSOR_WALK:
 			event.handled = true;
 			if ((event.mousePos.x > 179) && (event.mousePos.x < 210) && (event.mousePos.y > 50) && (event.mousePos.y < 89))
-				startCrawling(1);
+				startCrawling(CRAWL_EAST);
 
 			if ((event.mousePos.x > 109) && (event.mousePos.x < 140) && (event.mousePos.y > 50) && (event.mousePos.y < 89))
-				startCrawling(2);
+				startCrawling(CRAWL_WEST);
 
 			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 89) && (event.mousePos.y < 120))
-				startCrawling(3);
+				startCrawling(CRAWL_SOUTH);
 
 			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 19) && (event.mousePos.y < 50))
-				startCrawling(4);
+				startCrawling(CRAWL_NORTH);
 			break;
 		case CURSOR_USE:
 			if (cellId > 36) {
@@ -1523,19 +1523,19 @@ void Scene1200::process(Event &event) {
 		switch (event.kbd.keycode) {
 		case Common::KEYCODE_1:
 			warning("FIXME: keycode = 0x4800");
-			startCrawling(4);
+			startCrawling(CRAWL_NORTH);
 			break;
 		case Common::KEYCODE_2:
 			warning("FIXME: keycode = 0x4B00");
-			startCrawling(2);
+			startCrawling(CRAWL_WEST);
 			break;
 		case Common::KEYCODE_3:
 			warning("FIXME: keycode = 0x4D00");
-			startCrawling(1);
+			startCrawling(CRAWL_EAST);
 			break;
 		case Common::KEYCODE_4:
 			warning("FIXME: keycode = 0x5000");
-			startCrawling(3);
+			startCrawling(CRAWL_SOUTH);
 			break;
 		default:
 			event.handled = false;
@@ -1616,12 +1616,12 @@ void Scene1200::saveCharacter(int characterIndex) {
 	SceneExt::saveCharacter(characterIndex);
 }
 
-void Scene1200::startCrawling(int indx) {
+void Scene1200::startCrawling(CrawlDirection dir) {
 	Common::Point cellPos = Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);
 	_mazeUI.pixelToCellXY(cellPos);
 
-	switch (indx) {
-	case 1:
+	switch (dir) {
+	case CRAWL_EAST:
 		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(200, 50)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(200, 88)) > 36))
 			&& ( ((cellPos.x == 3) && (cellPos.y == 33) && (_field418 != 4))
 				|| ((cellPos.x == 13) && (cellPos.y == 21) && (_field418 != 2))
@@ -1665,7 +1665,7 @@ void Scene1200::startCrawling(int indx) {
 			signal();
 		}
 		break;
-	case 2:
+	case CRAWL_WEST:
 		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(120, 50)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(120, 88)) > 36))
 			&& ( ((cellPos.x == 7) && (cellPos.y == 33) && (_field418 != 4))
 				|| ((cellPos.x == 17) && (cellPos.y == 21) && (_field418 != 2))
@@ -1709,7 +1709,7 @@ void Scene1200::startCrawling(int indx) {
 			signal();
 		}
 		break;
-	case 3:
+	case CRAWL_SOUTH:
 		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(140, 110)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(178, 110)) > 36))
 			&& ( ((cellPos.x == 17) && (cellPos.y == 5) && (_field418 != 3))
 				|| ((cellPos.x == 41) && (cellPos.y == 21)) )
@@ -1751,7 +1751,7 @@ void Scene1200::startCrawling(int indx) {
 			signal();
 		}
 		break;
-	case 4:
+	case CRAWL_NORTH:
 		if ( ((_mazeUI.getCellFromPixelXY(Common::Point(140, 30)) > 36) || (_mazeUI.getCellFromPixelXY(Common::Point(178, 30)) > 36))
 			&& ( ((cellPos.x == 17) && (cellPos.y == 9) && (_field418 != 3))
 				|| ((cellPos.x == 35) && (cellPos.y == 17)) )
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 626e596..3e75d83 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -118,6 +118,8 @@ public:
 };
 
 class Scene1200 : public SceneExt {
+	enum CrawlDirection { CRAWL_EAST = 1, CRAWL_WEST = 2, CRAWL_SOUTH = 3, CRAWL_NORTH = 4 };
+
 	class LaserPanel: public SceneArea {
 	public:
 		class Jumper : public SceneActorExt {
@@ -160,7 +162,7 @@ public:
 	Scene1200();
 	void synchronize(Serializer &s);
 
-	void startCrawling(int indx);
+	void startCrawling(CrawlDirection dir);
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();


Commit: 30bd58649031d3174c81cddb45a0ee44652195fd
    https://github.com/scummvm/scummvm/commit/30bd58649031d3174c81cddb45a0ee44652195fd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-07-05T18:10:58-07:00

Commit Message:
TSAGE: Bugfix for disappearing player in R2R scene 1200

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 131b70c..11063f9 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2724,7 +2724,9 @@ void SceneObject::setup(int visage, int stripFrameNum, int frameNum, int posX, i
 }
 
 void SceneObject::setup(int visage, int stripFrameNum, int frameNum) {
-	postInit();
+	if (g_vm->getGameID() != GType_Ringworld2)
+		postInit();
+
 	setVisage(visage);
 	setStrip(stripFrameNum);
 	setFrame(frameNum);