libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 09:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: R2R: renaming in scene 3500

Browse Source
This commit is contained in:
Strangerke 2013-11-09 01:48:55 +01:00
parent 64bfeeef38
commit 9f12d1c1fd
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
engines/tsage/ringworld2/ringworld2_scenes3.cpp
View File

@ -2988,7 +2988,7 @@ void Scene3500::Action1::handleHorzButton(int direction) {
setActionIndex(0); setActionIndex(0);
} }
void Scene3500::Action1::sub108732(bool arg1) { void Scene3500::Action1::turnShuttle(bool arg1) {
Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene; Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
_field20 = arg1; _field20 = arg1;
@ -3219,7 +3219,7 @@ void Scene3500::Action1::signal() {
scene->_symbolRight.hide(); scene->_symbolRight.hide();
_field24 = false; _field24 = false;
if (!_field20) { if (!_field20) {
scene->_throttle.sub1094ED(); scene->_throttle.updateSpeed();
if (scene->_mazeChangeAmount == scene->_speed) if (scene->_mazeChangeAmount == scene->_speed)
scene->_aSound1.play(276); scene->_aSound1.play(276);
} }
@ -3340,7 +3340,7 @@ void Scene3500::Action2::signal() {
horzX = scene->_tunnelHorzCircle._position.x; horzX = scene->_tunnelHorzCircle._position.x;
} }
scene->_throttle.sub1094ED(); scene->_throttle.updateSpeed();
scene->_tunnelVertCircle._moveDiff.y = 9 - (scene->_mazeChangeAmount / 2); scene->_tunnelVertCircle._moveDiff.y = 9 - (scene->_mazeChangeAmount / 2);
Common::Point pt(vertX, 73); Common::Point pt(vertX, 73);
@ -3389,10 +3389,10 @@ bool Scene3500::DirectionButton::startAction(CursorType action, Event &event) {
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
Scene3500::Throttle::Throttle() { Scene3500::Throttle::Throttle() {
_fieldA8 = 0; _deltaX = 1;
_fieldAA = 0;
_fieldAC = 0;
_deltaY = 0; _deltaY = 0;
_slideDeltaY = 0;
_deltaMouseY = 0;
} }
void Scene3500::Throttle::synchronize(Serializer &s) { void Scene3500::Throttle::synchronize(Serializer &s) {
@ -3400,33 +3400,33 @@ void Scene3500::Throttle::synchronize(Serializer &s) {
s.syncAsSint16LE(_pos.x); s.syncAsSint16LE(_pos.x);
s.syncAsSint16LE(_pos.y); s.syncAsSint16LE(_pos.y);
s.syncAsSint16LE(_fieldA8); s.syncAsSint16LE(_deltaX);
s.syncAsSint16LE(_fieldAA);
s.syncAsSint16LE(_fieldAC);
s.syncAsSint16LE(_deltaY); s.syncAsSint16LE(_deltaY);
s.syncAsSint16LE(_slideDeltaY);
s.syncAsSint16LE(_deltaMouseY);
} }
void Scene3500::Throttle::init(int xp, int yp, int arg3, int arg4, int arg5) { void Scene3500::Throttle::init(int xp, int yp, int dx, int dy, int speed) {
_deltaY = 0; _deltaMouseY = 0;
_pos = Common::Point(xp, yp); _pos = Common::Point(xp, yp);
_fieldA8 = arg3; _deltaX = dx;
_fieldAA = arg4; _deltaY = dy;
_fieldAC = _fieldAA / _fieldA8; _slideDeltaY = _deltaY / _deltaX;
postInit(); postInit();
setup(1050, 3, 1); setup(1050, 3, 1);
fixPriority(255); fixPriority(255);
setSpeed(arg5); setSpeed(speed);
} }
void Scene3500::Throttle::sub1094ED() { void Scene3500::Throttle::updateSpeed() {
Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene; Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
scene->_speed = _position.x - _pos.x; scene->_speed = _position.x - _pos.x;
} }
void Scene3500::Throttle::setSpeed(int arg1){ void Scene3500::Throttle::setSpeed(int arg1){
changePosition(Common::Point(_pos.x + arg1, _pos.y - (_fieldAC * arg1))); changePosition(Common::Point(_pos.x + arg1, _pos.y - (_slideDeltaY * arg1)));
} }
void Scene3500::Throttle::changePosition(const Common::Point &pt) { void Scene3500::Throttle::changePosition(const Common::Point &pt) {
@ -3440,29 +3440,29 @@ void Scene3500::Throttle::process(Event &event) {
return; return;
if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE) && (_bounds.contains(event.mousePos))) { if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE) && (_bounds.contains(event.mousePos))) {
_deltaY = 1 + event.mousePos.y - _position.y; _deltaMouseY = 1 + event.mousePos.y - _position.y;
event.eventType = EVENT_NONE; event.eventType = EVENT_NONE;
} }
if ((event.eventType == EVENT_BUTTON_UP) && (_deltaY != 0)) { if ((event.eventType == EVENT_BUTTON_UP) && (_deltaMouseY != 0)) {
_deltaY = 0; _deltaMouseY = 0;
event.handled = true; event.handled = true;
if (!scene->_action1._field24) if (!scene->_action1._field24)
sub1094ED(); updateSpeed();
} }
if (_deltaY == 0) if (_deltaMouseY == 0)
return; return;
R2_GLOBALS._sound2.play(338); R2_GLOBALS._sound2.play(338);
event.handled = true; event.handled = true;
int cx = event.mousePos.y - _deltaY + 1; int cx = event.mousePos.y - _deltaMouseY + 1;
if (_pos.y >= cx) { if (_pos.y >= cx) {
if (_pos.y - _fieldAA <= cx) if (_pos.y - _deltaY <= cx)
changePosition(Common::Point(((_pos.y - cx) / 2) + _pos.x + ((_pos.y - cx) % 2), cx)); changePosition(Common::Point(((_pos.y - cx) / 2) + _pos.x + ((_pos.y - cx) % 2), cx));
else else
changePosition(Common::Point(_pos.x + _fieldA8, _pos.y - _fieldAA)); changePosition(Common::Point(_pos.x + _deltaX, _pos.y - _deltaY));
} else { } else {
changePosition(Common::Point(_pos.x, _pos.y)); changePosition(Common::Point(_pos.x, _pos.y));
} }
@ -3667,7 +3667,7 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
void Scene3500::doMovement(int id) { void Scene3500::doMovement(int id) {
switch (id) { switch (id) {
case -1: case -1:
_throttle.sub1094ED(); _throttle.updateSpeed();
if (_speed != 0) { if (_speed != 0) {
_speed--; _speed--;
_throttle.setSpeed(_speed); _throttle.setSpeed(_speed);
@ -3676,7 +3676,7 @@ void Scene3500::doMovement(int id) {
_speed = 0; _speed = 0;
break; break;
case 1: case 1:
_throttle.sub1094ED(); _throttle.updateSpeed();
if (_speed < 16) { if (_speed < 16) {
++_speed; ++_speed;
_throttle.setSpeed(_speed); _throttle.setSpeed(_speed);
@ -3713,7 +3713,7 @@ void Scene3500::doMovement(int id) {
if (_nextMove != 0) if (_nextMove != 0)
_nextMove = 0; _nextMove = 0;
_action1.sub108732(false); _action1.turnShuttle(false);
} }
break; break;
case 104: case 104:
@ -3744,7 +3744,7 @@ void Scene3500::doMovement(int id) {
if (_nextMove != 0) if (_nextMove != 0)
_nextMove = 0; _nextMove = 0;
_action1.sub108732(false); _action1.turnShuttle(false);
} }
break; break;
default: default:

12
engines/tsage/ringworld2/ringworld2_scenes3.h
View File

@ -572,7 +572,7 @@ class Scene3500 : public SceneExt {
Action1(); Action1();
virtual void synchronize(Serializer &s); virtual void synchronize(Serializer &s);
void handleHorzButton(int direction); void handleHorzButton(int direction);
void sub108732(bool arg1); void turnShuttle(bool arg1);
virtual void signal(); virtual void signal();
virtual void dispatch(); virtual void dispatch();
}; };
@ -600,16 +600,16 @@ class Scene3500 : public SceneExt {
class Throttle : public SceneActor { class Throttle : public SceneActor {
public: public:
Common::Point _pos; Common::Point _pos;
int _fieldA8; int _deltaX;
int _fieldAA;
int _fieldAC;
int _deltaY; int _deltaY;
int _slideDeltaY;
int _deltaMouseY;
Throttle(); Throttle();
virtual void synchronize(Serializer &s); virtual void synchronize(Serializer &s);
void init(int xp, int yp, int arg3, int arg4, int arg5); void init(int xp, int yp, int dx, int dy, int speed);
void sub1094ED(); void updateSpeed();
void setSpeed(int arg1); void setSpeed(int arg1);
void changePosition(const Common::Point &pt); void changePosition(const Common::Point &pt);