ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

TSAGE: R2R - rename _actorDestPos

Browse Source
This commit is contained in:
Strangerke
2013-11-24 22:30:53 +01:00
parent 59c0603bf7
commit f4d582f640
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/tsage/core.cpp
+3 -3
View File
@@ -2110,7 +2110,7 @@ SceneObject::SceneObject() : SceneHotspot() {
_shade = _oldShade = 0;
_linkedActor = NULL;
_field8A = Common::Point(0, 0);
_actorDestPos = Common::Point(0, 0);
_angle = 0;
_xs = 0;
_xe = 0;
@@ -2504,8 +2504,8 @@ void SceneObject::synchronize(Serializer &s) {
s.syncAsSint16LE(_moveDiff.x); s.syncAsSint16LE(_moveDiff.y);
s.syncAsSint32LE(_moveRate);
if (g_vm->getGameID() == GType_Ringworld2) {
s.syncAsSint16LE(_field8A.x);
s.syncAsSint16LE(_field8A.y);
s.syncAsSint16LE(_actorDestPos.x);
s.syncAsSint16LE(_actorDestPos.y);
}
SYNC_POINTER(_endAction);
s.syncAsUint32LE(_regionBitList);
engines/tsage/core.h
+1 -1
View File
@@ -549,7 +549,7 @@ public:
EventHandler *_mover;
Common::Point _moveDiff;
int _moveRate;
Common::Point _field8A;
Common::Point _actorDestPos;
Action *_endAction;
uint32 _regionBitList;
engines/tsage/ringworld2/ringworld2_scenes1.cpp
+1 -1
View File
@@ -6435,7 +6435,7 @@ void Scene1337::subD02CA() {
_item6._object1._mover = _arrunkObj1337[2]._arr1[di]._object1._mover;
_item6._object1._moveDiff = _arrunkObj1337[2]._arr1[di]._object1._moveDiff;
_item6._object1._moveRate = _arrunkObj1337[2]._arr1[di]._object1._moveRate;
_item6._object1._field8A = _arrunkObj1337[2]._arr1[di]._object1._field8A;
_item6._object1._actorDestPos = _arrunkObj1337[2]._arr1[di]._object1._actorDestPos;
_item6._object1._endAction = _arrunkObj1337[2]._arr1[di]._object1._endAction;
_item6._object1._regionBitList = _arrunkObj1337[2]._arr1[di]._object1._regionBitList;
// _item6._object1._actorName = _arrunkObj1337[2]._arr1[di]._object1._actorName;
engines/tsage/ringworld2/ringworld2_scenes3.cpp
+10 -3
View File
@@ -4335,7 +4335,7 @@ void Scene3600::Action2::signal() {
scene->_protector.setup(3127, 2, 1);
scene->_protector.animate(ANIM_MODE_1, NULL);
NpcMover *mover = new NpcMover();
scene->_protector.addMover(mover, &scene->_protector._field8A, scene);
scene->_protector.addMover(mover, &scene->_protector._actorDestPos, scene);
}
break;
default:
@@ -4554,7 +4554,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
if (!R2_GLOBALS.getFlag(71)) {
_protector.postInit();
_protector._state = 0;
_protector._field8A = Common::Point(226, 152);
_protector._actorDestPos = Common::Point(226, 152);
_protector._moveDiff = Common::Point(3, 2);
_protector.setPosition(Common::Point(284, 152));
_protector.setup(3127, 2, 1);
@@ -4630,6 +4630,8 @@ void Scene3600::remove() {
void Scene3600::signal() {
switch (_sceneMode) {
case 3320:
// Move to the console
// Removed (useless ?) call to sub_1D227
R2_GLOBALS._walkRegions.disableRegion(14);
R2_GLOBALS._scrollFollower = &_seeker;
@@ -4646,6 +4648,8 @@ void Scene3600::signal() {
&_miranda, &_webbster, &_teal, NULL);
break;
case 3321:
// Teal activates console
// Removed (useless ?) call to sub_1D227
R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
_tealSpeaker.stopSpeaking();
@@ -4731,7 +4735,7 @@ void Scene3600::signal() {
_protector.postInit();
_protector._state = 0;
_protector._field8A = Common::Point(226, 152);
_protector._actorDestPos = Common::Point(226, 152);
_protector._moveDiff = Common::Point(5, 3);
_protector.setup(3403, 7, 1);
_protector.setPosition(Common::Point(405, 155));
@@ -4773,6 +4777,7 @@ void Scene3600::signal() {
R2_GLOBALS._sound2.play(329);
break;
case 3600:
// First speech by Teal
_sceneMode = 3320;
_stripManager.start(3320, this);
break;
@@ -4781,6 +4786,7 @@ void Scene3600::signal() {
case 3602:
// No break on purpose
case 3603:
// Teal speech near the console
R2_GLOBALS._walkRegions.disableRegion(2);
R2_GLOBALS._walkRegions.disableRegion(7);
_tealSpeaker._displayMode = 1;
@@ -4788,6 +4794,7 @@ void Scene3600::signal() {
_stripManager.start(3321, this);
break;
case 3604:
// Goule Protector forces the door
R2_GLOBALS._sound2.fadeOut2(NULL);
R2_GLOBALS._sound1.stop();
R2_GLOBALS._walkRegions.enableRegion(2);