[Scummvm-cvs-logs] scummvm master -> 928fd72a359d00f0cae45b9ca49c4b8f24e08d90
Strangerke
Strangerke at scummvm.org
Sat Feb 11 11:10:53 CET 2012
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:
928fd72a35 TSAGE: R2R - scene 1337: Implement some missing functions
Commit: 928fd72a359d00f0cae45b9ca49c4b8f24e08d90
https://github.com/scummvm/scummvm/commit/928fd72a359d00f0cae45b9ca49c4b8f24e08d90
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-02-11T02:10:21-08:00
Commit Message:
TSAGE: R2R - scene 1337: Implement some missing functions
Changed paths:
engines/tsage/ringworld2/ringworld2_scenes1.cpp
engines/tsage/ringworld2/ringworld2_scenes1.h
engines/tsage/staticres.cpp
engines/tsage/staticres.h
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index e135776..b3907d7 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2430,7 +2430,7 @@ void Scene1337::Action1::signal() {
signal();
break;
case 12:
- scene->subCBB1E();
+ scene->suggestInstructions();
remove();
break;
default:
@@ -3870,7 +3870,7 @@ void Scene1337::dispatch() {
++_field424E;
if (_field424E == 4) {
_field424C = 1;
- subCBB1E();
+ suggestInstructions();
}
}
Scene::dispatch();
@@ -3905,7 +3905,7 @@ void Scene1337::setAnimationInfo(unkObj1337sub1 *subObj) {
}
void Scene1337::subC20E5() {
- warning("STUBBED lvl2 subC20E5()");
+ subC2586();
}
void Scene1337::subC20F9() {
@@ -3985,11 +3985,52 @@ void Scene1337::subC20F9() {
}
+void Scene1337::subC2586() {
+ if (_field4244 != 0)
+ _object1.hide();
+
+ switch (_field423E) {
+ case 2:
+ subC4CD2();
+ if (_field4246 == 1)
+ actionDisplay(1330, 114, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+ _field4246 = 0;
+ // No break on purpose
+ case 0:
+ // No break on purpose
+ case 1:
+ // No break on purpose
+ case 3:
+ _item1.setAction(&_action4);
+ default:
+ break;
+ }
+
+ _field4244 = 1;
+
+}
+
int Scene1337::subC264B(int arg1) {
warning("STUBBED Scene1337::subC264B()");
return -1;
}
+int Scene1337::subC27F9(int arg1) {
+ switch (arg1) {
+ case 10:
+ case 12:
+ case 15:
+ case 17:
+ case 18:
+ case 19:
+ case 20:
+ case 21:
+ return arg1;
+ default:
+ return -1;
+ }
+}
+
int Scene1337::subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt) {
warning("STUBBED Scene1337::subC2BF8()");
return -1;
@@ -4009,7 +4050,10 @@ void Scene1337::subC4A39(unkObj1337sub1 *subObj) {
}
void Scene1337::subC4CD2() {
- warning("STUBBED Scene1337::subC4CD2()");
+ if (R2_GLOBALS._v57709 > 0) {
+ subD1917();
+ subD1940(false);
+ }
}
void Scene1337::subC4CEC() {
@@ -4176,14 +4220,32 @@ void Scene1337::subPostInit() {
_field424E = 0;
}
-void Scene1337::subCBB1E() {
- warning("STUBBED Scene1337::subCBB1E()");
+void Scene1337::suggestInstructions() {
+ if (R2_GLOBALS._v57709 > 0)
+ subD1917();
+ if (MessageDialog::show(NEED_INSTRUCTIONS, NO_MSG, YES_MSG) == 0) {
+ if (R2_GLOBALS._v57709 == 0)
+ subD18F5();
+ subCCF26();
+ } else {
+ if (R2_GLOBALS._v57709 == 0)
+ subD18F5();
+ subCB59B();
+ }
+}
+
+void Scene1337::subCB59B() {
+ _item1.setAction(&_action1);
}
void Scene1337::subCBB7B() {
warning("STUBBED Scene1337::subCBB7B()");
}
+void Scene1337::subCCF26() {
+ warning("STUBBED Scene1337::subCCF26()");
+}
+
void Scene1337::subCF31D() {
warning("STUBBED Scene1337::subCF31D()");
}
@@ -4192,8 +4254,19 @@ void Scene1337::subCF979() {
warning("STUBBED Scene1337::subCF979()");
}
+void Scene1337::subD026D() {
+ subD02CA();
+}
+
void Scene1337::subD0281() {
- warning("STUBBED Scene1337::subD0281()");
+ if (subC27F9(this->_arrunkObj1337[2]._arr3[0]._field34) == -1)
+ _unkFctPtr412 = &Scene1337::subD026D;
+ else
+ subC4A39(&_arrunkObj1337[2]._arr3[0]);
+}
+
+void Scene1337::subD02CA() {
+ warning("STUBBED lvl4 Scene1337::subD02CA()");
}
void Scene1337::subD183F(int arg1, int arg2) {
@@ -4226,16 +4299,34 @@ void Scene1337::subD18B5(int resNum, int rlbNum, int arg3) {
warning("STUBBED lvl3 Scene1337::subD18B5()");
}
-void Scene1337::subD18F5() {
- warning("STUBBED Scene1337::subD18F5()");
+int Scene1337::subD18F5() {
+ if (R2_GLOBALS._v57709 == 0)
+ // The cursor looks... very dummy
+ // To be checked
+ warning("TODO: CursorManager.setData(R2_GLOBALS.off_57705)");
+
+ ++R2_GLOBALS._v57709;
+
+ return R2_GLOBALS._v57709;
}
-void Scene1337::subD1917() {
- warning("STUBBED Scene1337::subD1917()");
+int Scene1337::subD1917() {
+ if (R2_GLOBALS._v57709 != 0) {
+ R2_GLOBALS._v57709--;
+ if (R2_GLOBALS._v57709 != 0)
+ warning("FIXME: subD195F(_width, _data);");
+ }
+
+ return R2_GLOBALS._v57709;
}
-void Scene1337::subD1940(bool flag) {
- warning("STUBBED Scene1337::subD1940()");
+int Scene1337::subD1940(bool flag) {
+ if (flag)
+ ++R2_GLOBALS._v5780C;
+ else if (R2_GLOBALS._v5780C != 0)
+ --R2_GLOBALS._v5780C;
+
+ return R2_GLOBALS._v5780C;
}
void Scene1337::subD195F(int arg1, int arg2) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index b366c64..53db763 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -315,7 +315,9 @@ public:
void setAnimationInfo(unkObj1337sub1 *subObj);
void subC20E5();
void subC20F9();
+ void subC2586();
int subC264B(int arg1);
+ int subC27F9(int arg1);
int subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt);
void subC2C2F();
int subC3E92(int arg1);
@@ -324,16 +326,20 @@ public:
void subC4CEC();
void subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
void subPostInit();
- void subCBB1E();
+ void subCB59B();
+ void suggestInstructions();
void subCBB7B();
+ void subCCF26();
void subCF31D();
void subCF979();
+ void subD026D();
void subD0281();
+ void subD02CA();
void subD183F(int arg1, int arg2);
void subD18B5(int resNum, int rlbNum, int arg3);
- void subD18F5();
- void subD1917();
- void subD1940(bool flag);
+ int subD18F5();
+ int subD1917();
+ int subD1940(bool flag);
void subD195F(int arg1, int arg2);
void subD1975(int arg1, int arg2);
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 7a8f1cb..e8004bc 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -242,6 +242,7 @@ char const *const YES_MSG = " Yes ";
char const *const NO_MSG = " No ";
char const *const USE_INTERCEPTOR = "Do you want to use your interceptor card?";
char const *const USE_DOUBLE_AGENT = "Do you want to use your double agent?";
+char const *const NEED_INSTRUCTIONS = "Do you want instructions?";
const byte k562CC[] = {
20, 7, 41, 6,
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index ab0cd73..41d1991 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -195,6 +195,7 @@ extern char const *const YES_MSG;
extern char const *const NO_MSG;
extern char const *const USE_INTERCEPTOR;
extern char const *const USE_DOUBLE_AGENT;
+extern char const *const NEED_INSTRUCTIONS;
// Scene 1550 arrays of constants
extern const byte k562CC[];
More information about the Scummvm-git-logs
mailing list