From 8305183e87bc31a00096774ec6157e1b78efd6bd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 19 Dec 2013 08:09:22 +0100
Subject: TSAGE: Ringworld - Some renaming in scene 2230

---
 engines/tsage/ringworld/ringworld_scenes3.cpp | 30 +++++++++++++--------------
 engines/tsage/ringworld/ringworld_scenes3.h   |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index c5a9b0d31b..e834e659b5 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes3.cpp
@@ -3160,7 +3160,7 @@ void Scene2230::Action1::signal() {
 
 	switch (_actionIndex++) {
 	case 0:
-		switch (scene->_field30A) {
+		switch (scene->_sceneMode) {
 		case 1:
 			scene->setAction(&scene->_action3);
 			break;
@@ -3201,7 +3201,7 @@ void Scene2230::Action2::signal() {
 
 	switch (_actionIndex++) {
 	case 0:
-		switch (scene->_field30A) {
+		switch (scene->_sceneMode) {
 		case 2:
 			scene->setAction(&scene->_action6, this);
 			break;
@@ -3212,7 +3212,7 @@ void Scene2230::Action2::signal() {
 		break;
 	case 1: {
 		g_globals->_player.disableControl();
-		scene->_field30A = 1;
+		scene->_sceneMode = 1;
 		g_globals->_player._regionBitList |= ~0x80;
 		Common::Point pt(160, 96);
 		NpcMover *mover = new NpcMover();
@@ -3262,7 +3262,7 @@ void Scene2230::Action3::signal() {
 		break;
 	case 2:
 		g_globals->_player._regionBitList |= 0x80;
-		scene->_field30A = 0;
+		scene->_sceneMode = 0;
 
 		g_globals->_player.setVisage(0);
 		g_globals->_player.setStrip2(-1);
@@ -3292,7 +3292,7 @@ void Scene2230::Action5::signal() {
 
 	switch (_actionIndex++) {
 	case 0:
-		switch (scene->_field30A) {
+		switch (scene->_sceneMode) {
 		case 2:
 			scene->setAction(&scene->_action3, this);
 			break;
@@ -3318,7 +3318,7 @@ void Scene2230::Action5::signal() {
 	case 3:
 		g_globals->_events.setCursor(CURSOR_USE);
 		g_globals->_player._uiEnabled = true;
-		scene->_field30A = 2;
+		scene->_sceneMode = 2;
 		remove();
 		break;
 	}
@@ -3335,7 +3335,7 @@ void Scene2230::Action6::signal() {
 		g_globals->_player.animate(ANIM_MODE_5, this);
 		break;
 	case 1:
-		scene->_field30A = 0;
+		scene->_sceneMode = 0;
 		g_globals->_player.setVisage(0);
 		g_globals->_player._strip = 1;
 		g_globals->_player._canWalk = true;
@@ -3352,7 +3352,7 @@ void Scene2230::Action7::signal() {
 	case 0:
 		g_globals->_player.disableControl();
 
-		switch (scene->_field30A) {
+		switch (scene->_sceneMode) {
 		case 1:
 			scene->setAction(&scene->_action3, this);
 			break;
@@ -3408,7 +3408,7 @@ void Scene2230::Action8::signal() {
 	case 0:
 		g_globals->_player.disableControl();
 
-		switch (scene->_field30A) {
+		switch (scene->_sceneMode) {
 		case 1:
 			scene->setAction(&scene->_action3, this);
 			break;
@@ -3431,7 +3431,7 @@ void Scene2230::Action8::signal() {
 		g_globals->_sceneItems.remove(&scene->_hotspot11);
 		g_globals->_sceneItems.remove(&scene->_hotspot12);
 
-		switch (scene->_field30A) {
+		switch (scene->_sceneMode) {
 		case 1:
 			scene->setAction(&scene->_action3, this);
 			break;
@@ -3560,7 +3560,7 @@ void Scene2230::Hotspot6::doAction(int action) {
 		}
 		break;
 	case CURSOR_USE:
-		if (scene->_field30A == 1)
+		if (scene->_sceneMode == 1)
 			scene->setAction(&scene->_action3);
 		else if (g_globals->getFlag(13))
 			SceneItem::display2(2230, 28);
@@ -3586,7 +3586,7 @@ void Scene2230::Hotspot7::doAction(int action) {
 		}
 		break;
 	case CURSOR_USE:
-		if (scene->_field30A == 2)
+		if (scene->_sceneMode == 2)
 			scene->setAction(&scene->_action6);
 		else if (g_globals->getFlag(13))
 			SceneItem::display2(2230, 29);
@@ -3692,7 +3692,7 @@ void Scene2230::Hotspot12::doAction(int action) {
 /*--------------------------------------------------------------------------*/
 
 Scene2230::Scene2230() : _hotspot9(0, CURSOR_LOOK, 2230, 16, CURSOR_USE, 2230, 18, LIST_END) {
-	_field30A = 0;
+	_sceneMode = 0;
 }
 
 void Scene2230::postInit(SceneObjectList *OwnerList) {
@@ -3726,7 +3726,7 @@ void Scene2230::postInit(SceneObjectList *OwnerList) {
 	g_globals->_player._regionBitList |= 0x80;
 	g_globals->_player.changeZoom(-1);
 
-	_field30A = 0;
+	_sceneMode = 0;
 	g_globals->_player.enableControl();
 
 	_hotspot5.setBounds(Rect(108, 34, 142, 76));
@@ -3748,7 +3748,7 @@ void Scene2230::postInit(SceneObjectList *OwnerList) {
 void Scene2230::synchronize(Serializer &s) {
 	Scene::synchronize(s);
 	_rect1.synchronize(s);
-	s.syncAsSint16LE(_field30A);
+	s.syncAsSint16LE(_sceneMode);
 }
 
 void Scene2230::dispatch() {
diff --git a/engines/tsage/ringworld/ringworld_scenes3.h b/engines/tsage/ringworld/ringworld_scenes3.h
index 682ef44fc6..fafb72fcea 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.h
+++ b/engines/tsage/ringworld/ringworld_scenes3.h
@@ -579,7 +579,7 @@ public:
 	Hotspot11 _hotspot11;
 	Hotspot12 _hotspot12;
 	Rect _rect1;
-	int _field30A;
+	int _sceneMode;
 
 	Scene2230();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3