libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 19:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: Blue Force - Change the type of two variables (Office, 560)

Browse Source
This commit is contained in:
Strangerke 2011-10-30 07:34:34 +01:00
parent b3bd18668c
commit 38ce3011fc
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engines/tsage/blue_force/blueforce_scenes5.cpp
View File

@ -924,7 +924,7 @@ void Scene560::Action1::signal() {
scene->_deskChair.setStrip(BF_GLOBALS._player._strip);
scene->_deskChair.setPosition(BF_GLOBALS._player._position);
scene->_field380 = 1;
scene->_field380 = true;
BF_GLOBALS._player.enableControl();
remove();
break;
@ -950,7 +950,7 @@ void Scene560::Action2::signal() {
BF_GLOBALS._player.animate(ANIM_MODE_6, this);
break;
case 2:
scene->_field380 = 0;
scene->_field380 = false;
scene->_deskChair.setPosition(Common::Point(81, 149));
scene->_deskChair.setVisage(561);
scene->_deskChair.setStrip(3);
@ -1378,7 +1378,7 @@ bool Scene560::Computer::startAction(CursorType action, Event &event) {
/*--------------------------------------------------------------------------*/
Scene560::Scene560(): SceneExt() {
_field380 = _field11EA = 0;
_field380 = _field11EA = false;
}
void Scene560::postInit(SceneObjectList *OwnerList) {
@ -1433,12 +1433,12 @@ void Scene560::postInit(SceneObjectList *OwnerList) {
_deskChair.setStrip(BF_GLOBALS._player._strip);
_deskChair.setPosition(BF_GLOBALS._player._position);
_field11EA = 0;
_field380 = 1;
_field11EA = false;
_field380 = true;
} else {
// Entering study through doorway
_field11EA = 0;
_field380 = 0;
_field11EA = false;
_field380 = false;
BF_GLOBALS._player.postInit();
BF_GLOBALS._player.setVisage(563);
@ -1529,7 +1529,7 @@ void Scene560::signal() {
}
break;
case 10:
_field11EA = 0;
_field11EA = false;
BF_GLOBALS._player.enableControl();
break;
case 11:
@ -1540,7 +1540,7 @@ void Scene560::signal() {
void Scene560::process(Event &event) {
if ((event.eventType == EVENT_BUTTON_DOWN) && (BF_GLOBALS._events.getCursor() == CURSOR_WALK) &&
(_field380 == 1) && !_action) {
(_field380) && !_action) {
_destPosition = event.mousePos;
BF_GLOBALS._player.disableControl();
setAction(&_action2);
@ -1553,7 +1553,7 @@ void Scene560::process(Event &event) {
void Scene560::dispatch() {
if (!_field11EA && (BF_GLOBALS._player._position.y < 105)) {
_field11EA = 1;
_field11EA = true;
BF_GLOBALS._player.disableControl();
BF_GLOBALS._sceneManager.changeScene(270);
}

3
engines/tsage/blue_force/blueforce_scenes5.h
View File

@ -228,7 +228,8 @@ public:
NamedHotspot _chair, _lamp, _item4, _trophy, _watercolours, _fileCabinets;
NamedHotspot _certificate, _bookcase, _desk, _carpet, _item12, _office;
ASound _sound1;
int _field380, _field11EA;
bool _field380;
bool _field11EA;
Common::Point _destPosition;
Scene560();