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

[Strangerke]

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:
dc229b893e TSAGE: R2R - Scene 1337: rename previously committed function


Commit: dc229b893e1d0e4aa0ca8d2c5c3cd695e38f8942
    https://github.com/scummvm/scummvm/commit/dc229b893e1d0e4aa0ca8d2c5c3cd695e38f8942
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-02-14T13:26:12-08:00

Commit Message:
TSAGE: R2R - Scene 1337: rename previously committed function

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 10f76ca..6268978 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4667,8 +4667,8 @@ void Scene1337::subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
 	_item1.setAction(&_action13);
 }
 
-void Scene1337::subC6235(int arg1) {
-	switch (arg1 - 1) {
+void Scene1337::displayDialog(int dialogNumb) {
+	switch (dialogNumb - 1) {
 	case 0:
 		actionDisplay(1330, 53, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 		break;
@@ -5017,25 +5017,25 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 			switch (curReg) {
 			case 5:
 				if (_arrunkObj1337[2]._arr2[i]._field34 != 0)
-					subC6235(_arrunkObj1337[2]._arr2[i]._field34);
+					displayDialog(_arrunkObj1337[2]._arr2[i]._field34);
 				else
 					actionDisplay(1330, 20, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				break;
 			case 10:
 				if (_arrunkObj1337[3]._arr2[i]._field34 != 0)
-					subC6235(_arrunkObj1337[3]._arr2[i]._field34);
+					displayDialog(_arrunkObj1337[3]._arr2[i]._field34);
 				else
 					actionDisplay(1330, 22, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				break;
 			case 15:
 				if (_arrunkObj1337[0]._arr2[i]._field34 != 0)
-					subC6235(_arrunkObj1337[0]._arr2[i]._field34);
+					displayDialog(_arrunkObj1337[0]._arr2[i]._field34);
 				else
 					actionDisplay(1330, 21, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				break;
 			case 20:
 				if (_arrunkObj1337[1]._arr2[i]._field34 != 0)
-					subC6235(_arrunkObj1337[1]._arr2[i]._field34);
+					displayDialog(_arrunkObj1337[1]._arr2[i]._field34);
 				else
 					actionDisplay(1330, 23, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				break;
@@ -5054,25 +5054,25 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 				switch (curReg) {
 				case 5:
 					if (_arrunkObj1337[2]._arr3[0]._field34 != 0)
-						subC6235(_arrunkObj1337[2]._arr3[0]._field34);
+						displayDialog(_arrunkObj1337[2]._arr3[0]._field34);
 					else
 						actionDisplay(1330, 10, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
 				case 10:
 					if (_arrunkObj1337[3]._arr3[0]._field34 != 0)
-						subC6235(_arrunkObj1337[3]._arr3[0]._field34);
+						displayDialog(_arrunkObj1337[3]._arr3[0]._field34);
 					else
 						actionDisplay(1330, 16, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
 				case 15:
 					if (_arrunkObj1337[0]._arr3[0]._field34 != 0)
-						subC6235(_arrunkObj1337[3]._arr3[0]._field34);
+						displayDialog(_arrunkObj1337[3]._arr3[0]._field34);
 					else
 						actionDisplay(1330, 13, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
 				case 20:
 					if (_arrunkObj1337[1]._arr3[0]._field34 != 0)
-						subC6235(_arrunkObj1337[1]._arr3[0]._field34);
+						displayDialog(_arrunkObj1337[1]._arr3[0]._field34);
 					else
 						actionDisplay(1330, 18, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
@@ -5082,7 +5082,7 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 			} else {
 				if (subC2BF8(&_item7, pt)) {
 					if (_item7._field34 != 0)
-						subC6235(_item7._field34);
+						displayDialog(_item7._field34);
 					else
 						actionDisplay(1330, 7, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				} else if (_background1._bounds.contains(pt)) {
@@ -5096,13 +5096,13 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 					actionDisplay(1330, 32, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				} else {
 					if (subC2BF8(&_arrunkObj1337[2]._arr1[0], pt))
-						subC6235(_arrunkObj1337[2]._arr1[0]._field34);
+						displayDialog(_arrunkObj1337[2]._arr1[0]._field34);
 					else if (subC2BF8(&_arrunkObj1337[2]._arr1[1], pt))
-						subC6235(_arrunkObj1337[2]._arr1[1]._field34);
+						displayDialog(_arrunkObj1337[2]._arr1[1]._field34);
 					else if (subC2BF8(&_arrunkObj1337[2]._arr1[2], pt))
-						subC6235(_arrunkObj1337[2]._arr1[2]._field34);
+						displayDialog(_arrunkObj1337[2]._arr1[2]._field34);
 					else if (subC2BF8(&_arrunkObj1337[2]._arr1[3], pt))
-						subC6235(_arrunkObj1337[2]._arr1[3]._field34);
+						displayDialog(_arrunkObj1337[2]._arr1[3]._field34);
 					else if ((curReg >= 6) || (curReg <= 9))
 						actionDisplay(1330, 29, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					else if ((curReg >= 11) || (curReg <= 14))
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 913550c..4c412db 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -343,7 +343,7 @@ public:
 	void subC4CD2();
 	void subC4CEC();
 	void subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
-	void subC6235(int arg1);
+	void displayDialog(int dialogNumb);
 	void subPostInit();
 	void subCB59B();
 	void suggestInstructions();