aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2012-02-14 22:26:12 +0100
committerStrangerke2012-02-14 22:26:12 +0100
commitdc229b893e1d0e4aa0ca8d2c5c3cd695e38f8942 (patch)
tree0cb5b7a185a3491ba5be4a775e2fe35de2f4efd0
parenta64dc10b40a923e69d63b8936d1b37d47d747724 (diff)
downloadscummvm-rg350-dc229b893e1d0e4aa0ca8d2c5c3cd695e38f8942.tar.gz
scummvm-rg350-dc229b893e1d0e4aa0ca8d2c5c3cd695e38f8942.tar.bz2
scummvm-rg350-dc229b893e1d0e4aa0ca8d2c5c3cd695e38f8942.zip
TSAGE: R2R - Scene 1337: rename previously committed function
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp30
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.h2
2 files changed, 16 insertions, 16 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 10f76cabf3..6268978310 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 913550c223..4c412dbcb0 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();