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

TsAGE: Remove trailing spaces

Browse Source 
Thanks LordHoto for reminding this
This commit is contained in:
Strangerke 2011-09-27 00:40:10 +02:00
parent 35e36e4d9f
commit 44e6300559
22 changed files with 172 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/tsage/blue_force/blueforce_dialogs.cpp
View File

@ -315,7 +315,7 @@ bool AmmoBeltDialog::process(Event &event) {
return false;
}
void AmmoBeltDialog::draw() {
Rect bounds = _bounds;
@ -344,7 +344,7 @@ void AmmoBeltDialog::draw() {
if (clip1) {
GfxSurface clipSurface = surfaceFromRes(9, 6, BF_GLOBALS._clip1Bullets);
_clip1Rect.resize(clipSurface, _clip1Rect.left, _clip1Rect.top, 100);
_globals->gfxManager().copyFrom(clipSurface, bounds.left + _clip1Rect.left,
_globals->gfxManager().copyFrom(clipSurface, bounds.left + _clip1Rect.left,
bounds.top + _clip1Rect.top);
}
@ -352,7 +352,7 @@ void AmmoBeltDialog::draw() {
if (clip2) {
GfxSurface clipSurface = surfaceFromRes(9, 6, BF_GLOBALS._clip2Bullets);
_clip2Rect.resize(clipSurface, _clip2Rect.left, _clip2Rect.top, 100);
_globals->gfxManager().copyFrom(clipSurface, bounds.left + _clip2Rect.left,
_globals->gfxManager().copyFrom(clipSurface, bounds.left + _clip2Rect.left,
bounds.top + _clip2Rect.top);
}
@ -360,7 +360,7 @@ void AmmoBeltDialog::draw() {
if (gunLoaded) {
GfxSurface loadedSurface = surfaceFromRes(9, 7, 1);
_loadedRect.resize(loadedSurface, _loadedRect.left, _loadedRect.top, 100);
_globals->gfxManager().copyFrom(loadedSurface, bounds.left + _loadedRect.left,
_globals->gfxManager().copyFrom(loadedSurface, bounds.left + _loadedRect.left,
bounds.top + _loadedRect.top);
}
}

16
engines/tsage/blue_force/blueforce_logic.cpp
View File

@ -249,7 +249,7 @@ void AObjectArray::clear() {
void AObjectArray::synchronize(Serializer &s) {
EventHandler::synchronize(s);
for (int i = 0; i < OBJ_ARRAY_SIZE; ++i)
SYNC_POINTER(_objList[i]);
SYNC_POINTER(_objList[i]);
}
void AObjectArray::process(Event &event) {
@ -639,7 +639,7 @@ void SceneExt::dispatch() {
if (BF_GLOBALS._uiElements._active && BF_GLOBALS._player._enabled) {
BF_GLOBALS._uiElements.show();
}
_field37A = 0;
}
}
@ -649,7 +649,7 @@ void SceneExt::dispatch() {
void SceneExt::loadScene(int sceneNum) {
Scene::loadScene(sceneNum);
_v51C34.top = 0;
_v51C34.bottom = 300;
}
@ -720,7 +720,7 @@ void SceneExt::startStrip() {
SceneExt *scene = (SceneExt *)BF_GLOBALS._sceneManager._scene;
scene->_field372 = 1;
scene->_savedPlayerEnabled = BF_GLOBALS._player._enabled;
if (scene->_savedPlayerEnabled) {
scene->_savedUiEnabled = BF_GLOBALS._player._uiEnabled;
scene->_savedCanWalk = BF_GLOBALS._player._canWalk;
@ -768,7 +768,7 @@ void PalettedScene::remove() {
for (SynchronizedList<SceneObject *>::iterator i = BF_GLOBALS._sceneObjects->begin();
i != BF_GLOBALS._sceneObjects->end(); ++i)
(*i)->remove();
BF_GLOBALS._sceneObjects->draw();
BF_GLOBALS._scenePalette.loadPalette(2);
BF_GLOBALS._v51C44 = 1;
@ -836,7 +836,7 @@ void SceneHandlerExt::process(Event &event) {
return;
}
// If the strip proxy is currently being controlled by the strip manager,
// If the strip proxy is currently being controlled by the strip manager,
// then pass all events to it first
if (BF_GLOBALS._stripProxy._action) {
BF_GLOBALS._stripProxy._action->process(event);
@ -1076,10 +1076,10 @@ void BlueForceInvObjectList::reset() {
void BlueForceInvObjectList::setObjectScene(int objectNum, int sceneNumber) {
// Find the appropriate object
int num = objectNum;
SynchronizedList<InvObject *>::iterator i = _itemList.begin();
SynchronizedList<InvObject *>::iterator i = _itemList.begin();
while (num-- > 0) ++i;
(*i)->_sceneNumber = sceneNumber;
// If the item is the currently active one, default back to the use cursor
if (BF_GLOBALS._events.getCursor() == objectNum)
BF_GLOBALS._events.setCursor(CURSOR_USE);

8
engines/tsage/blue_force/blueforce_logic.h
View File

@ -83,7 +83,7 @@ public:
class TimerExt: public Timer {
public:
Action *_newAction;
public:
public:
TimerExt();
void set(uint32 delay, EventHandler *endHandler, Action *action);
@ -91,7 +91,7 @@ public:
virtual void synchronize(Serializer &s);
virtual void remove();
virtual void signal();
};
};
class SceneHotspotExt: public SceneHotspot {
@ -187,7 +187,7 @@ public:
virtual void process(Event &event);
};
enum ExitFrame { EXITFRAME_N = 1, EXITFRAME_NE = 2, EXITFRAME_E = 3, EXITFRAME_SE = 4,
enum ExitFrame { EXITFRAME_N = 1, EXITFRAME_NE = 2, EXITFRAME_E = 3, EXITFRAME_SE = 4,
EXITFRAME_S = 5, EXITFRAME_SW = 6, EXITFRAME_W = 7, EXITFRAME_NW = 8 };
class SceneExt: public Scene {
@ -198,7 +198,7 @@ public:
AObjectArray _timerList, _objArray2;
int _field372;
bool _savedPlayerEnabled;
bool _savedUiEnabled;
bool _savedUiEnabled;
bool _savedCanWalk;
int _field37A;

14
engines/tsage/blue_force/blueforce_scenes0.cpp
View File

@ -357,7 +357,7 @@ void Scene50::postInit(SceneObjectList *OwnerList) {
_location6.set(Rect(242, 131, 264, 144), 440, ALLEY_CAT, 64);
_location5.set(Rect(383, 57, 402, 70), 380, CITY_HALL_JAIL, 32);
_location7.set(Rect(128, 32, 143, 42), 800, JAMISON_RYAN, 128);
_location9.set(Rect(349, 125, 359, 132),
_location9.set(Rect(349, 125, 359, 132),
(BF_GLOBALS._bookmark == bInspectionDone) || (BF_GLOBALS._bookmark == bCalledToDrunkStop) ? 551 : 550,
BIKINI_HUT, 16);
@ -522,7 +522,7 @@ bool Scene60::Ignition::startAction(CursorType action, Event &event) {
if (BF_GLOBALS.getFlag(onDuty) && check2())
return true;
}
BF_GLOBALS._sound1.play(BF_GLOBALS.getFlag(fWithLyle) ? 80 : 31);
BF_GLOBALS._sound1.holdAt(1);
scene->fadeOut();
@ -597,7 +597,7 @@ bool Scene60::Ignition::check2() {
default:
break;
}
BF_GLOBALS._v5098C |= 0x80;
return false;
}
@ -638,7 +638,7 @@ bool Scene60::Compartment::startAction(CursorType action, Event &event) {
SceneItem::display2(60, 8);
break;
case CURSOR_USE:
if ((BF_INVENTORY.getObjectScene(INV_TICKET_BOOK) == 1) &&
if ((BF_INVENTORY.getObjectScene(INV_TICKET_BOOK) == 1) &&
(BF_INVENTORY.getObjectScene(INV_MIRANDA_CARD) == 1)) {
SceneItem::display2(60, 9);
}
@ -998,8 +998,8 @@ void Scene60::postInit(SceneObjectList *OwnerList) {
loadScene(_sceneNumber);
if ((_sceneNumber == 1810) && (BF_GLOBALS._dayNumber > 1) &&
(BF_GLOBALS._dayNumber < 5) && !BF_GLOBALS.getFlag(fWithLyle) &&
if ((_sceneNumber == 1810) && (BF_GLOBALS._dayNumber > 1) &&
(BF_GLOBALS._dayNumber < 5) && !BF_GLOBALS.getFlag(fWithLyle) &&
((BF_GLOBALS._dayNumber != 4) && (BF_GLOBALS._bookmark >= bEndDayThree))) {
_car.setup(1810, 1, 1, 164, 131, 1);
}
@ -1024,7 +1024,7 @@ void Scene60::postInit(SceneObjectList *OwnerList) {
}
_dashboard.setup(_visage, 1, 1, 160, 168, 100);
_cursorId = CURSOR_USE;
if (_visage == 63) {
_compartmentDoor.postInit();
_compartmentDoor.setVisage(60);

12
engines/tsage/blue_force/blueforce_scenes0.h
View File

@ -91,7 +91,7 @@ public:
public:
Scene50();
virtual Common::String getClassName() { return "Scene50"; }
virtual void postInit(SceneObjectList *OwnerList = NULL);
virtual void postInit(SceneObjectList *OwnerList = NULL);
virtual void remove();
virtual void signal();
virtual void process(Event &event);
@ -105,19 +105,19 @@ class Scene60 : public SceneExt {
bool check2();
public:
virtual bool startAction(CursorType action, Event &event);
};
};
class Item3: public NamedHotspot {
public:
virtual bool startAction(CursorType action, Event &event);
};
};
class Radio: public NamedHotspot {
public:
virtual bool startAction(CursorType action, Event &event);
};
};
class Compartment: public NamedHotspot {
public:
virtual bool startAction(CursorType action, Event &event);
};
};
/* Objects */
class MirandaCard: public NamedObject {
@ -133,7 +133,7 @@ class Scene60 : public SceneExt {
bool _flag;
virtual bool startAction(CursorType action, Event &event);
};
/* Actions */
class Action1: public ActionExt {
private:

14
engines/tsage/blue_force/blueforce_scenes1.cpp
View File

@ -42,7 +42,7 @@ void Scene100::Text::dispatch() {
// Keep the second text string below the first one
Scene100 *scene = (Scene100 *)BF_GLOBALS._sceneManager._scene;
Common::Point &pt = scene->_action1._sceneText1._position;
scene->_action1._sceneText2.setPosition(Common::Point(pt.x,
scene->_action1._sceneText2.setPosition(Common::Point(pt.x,
pt.y + scene->_action1._textHeight));
}
@ -63,7 +63,7 @@ void Scene100::Action1::signal() {
--_actionIndex;
} else {
setTextStrings(BF_NAME, BF_ALL_RIGHTS_RESERVED, this);
Common::Point pt(_sceneText1._position.x, 80);
NpcMover *mover = new NpcMover();
_sceneText1.addMover(mover, &pt, this);
@ -111,13 +111,13 @@ void Scene100::Action1::setTextStrings(const Common::String &msg1, const Common:
_sceneText2.setPosition(Common::Point((SCREEN_WIDTH - textSurface.getBounds().width()) / 2, 202));
_sceneText2._moveRate = 30;
_sceneText2._moveDiff.y = 1;
_textHeight = textSurface.getBounds().height();
int yp = -(_textHeight * 2);
Common::Point pt(_sceneText1._position.x, yp);
Common::Point pt(_sceneText1._position.x, yp);
NpcMover *mover = new NpcMover();
_sceneText1.addMover(mover, &pt, action);
_sceneText1.addMover(mover, &pt, action);
}
void Scene100::Action2::signal() {
@ -566,7 +566,7 @@ void Scene190::postInit(SceneObjectList *OwnerList) {
_object4.setFrame(2);
_object4.setPosition(Common::Point(54, 114));
_object4.setDetails(190, -1, -1, -1, 1, NULL);
switch (BF_GLOBALS._sceneManager._previousScene) {
case 300: {
_sceneMode = 12;
@ -691,7 +691,7 @@ void Scene190::process(Event &event) {
void Scene190::dispatch() {
SceneExt::dispatch();
if (!_action && !_fieldB52 && (BF_GLOBALS._player._position.x >= 310)
if (!_action && !_fieldB52 && (BF_GLOBALS._player._position.x >= 310)
&& !BF_GLOBALS.getFlag(onBike)) {
// Handle walking off to the right side of the screen
BF_GLOBALS._player.disableControl();

2
engines/tsage/blue_force/blueforce_scenes1.h
View File

@ -174,7 +174,7 @@ public:
SceneExt::synchronize(s);
s.syncAsSint16LE(_fieldB52);
}
};
};
} // End of namespace BlueForce

150
engines/tsage/blue_force/blueforce_scenes3.cpp
View File

@ -108,7 +108,7 @@ void Scene300::Action1::signal() {
setDelay(1);
break;
case 2: {
ADD_PLAYER_MOVER_THIS(BF_GLOBALS._player, BF_GLOBALS._player._position.x - 8,
ADD_PLAYER_MOVER_THIS(BF_GLOBALS._player, BF_GLOBALS._player._position.x - 8,
BF_GLOBALS._player._position.y);
break;
}
@ -139,7 +139,7 @@ void Scene300::Action2::signal() {
case 3:
BF_GLOBALS._player.enableControl();
remove();
break;
break;
default:
break;
}
@ -164,7 +164,7 @@ void Scene300::Action3::signal() {
case 3:
BF_GLOBALS._player.enableControl();
remove();
break;
break;
default:
break;
}
@ -190,7 +190,7 @@ void Scene300::Action4::signal() {
case 4:
BF_GLOBALS.setFlag(2);
BF_GLOBALS._sceneManager.changeScene(190);
break;
break;
default:
break;
}
@ -217,7 +217,7 @@ void Scene300::Action5::signal() {
}
case 4:
remove();
break;
break;
default:
break;
}
@ -266,7 +266,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
_object17.setStrip(1);
_object17.setPosition(Common::Point(87, 88));
_object17.setDetails(300, 11, 13, 2, 1, NULL);
_object18.postInit();
_object18.setVisage(301);
_object18.setStrip(1);
@ -473,7 +473,7 @@ void Scene300::signal() {
_object9.hide();
_object10.postInit();
_object10.hide();
if (BF_GLOBALS.getFlag(1)) {
BF_GLOBALS._player.disableControl();
_sceneMode = 4308;
@ -555,7 +555,7 @@ void Scene300::dispatch() {
BF_GLOBALS._v4CEA4 = 3;
_sceneMode = 6308;
BF_GLOBALS._player.disableControl();
ADD_MOVER(BF_GLOBALS._player, BF_GLOBALS._player._position.x + 20,
ADD_MOVER(BF_GLOBALS._player, BF_GLOBALS._player._position.x + 20,
BF_GLOBALS._player._position.y - 5);
}
@ -671,7 +671,7 @@ bool Scene315::Barry::startAction(CursorType action, Event &event) {
scene->_stripNumber = (action == INV_GREENS_GUN) ? 3168 : 0;
scene->_sceneMode = 3153;
scene->setAction(&scene->_sequenceManager, scene, 3153, &BF_GLOBALS._player, NULL);
}
}
break;
case INV_FOREST_RAP:
BF_GLOBALS._player.disableControl();
@ -979,7 +979,7 @@ void Scene315::synchronize(Serializer &s) {
void Scene315::postInit(SceneObjectList *OwnerList) {
loadScene(315);
if (BF_GLOBALS._sceneManager._previousScene != 325)
BF_GLOBALS._sound1.fadeSound(11);
@ -1033,14 +1033,14 @@ void Scene315::postInit(SceneObjectList *OwnerList) {
_sign.setDetails(Rect(190, 17, 208, 30), 315, -1, -1, -1, 1, NULL);
_westExit.setDetails(Rect(184, 31, 211, 80), 315, -1, -1, -1, 1, NULL);
_swExit.setDetails(Rect(0, 157, 190, 167), 315, -1, -1, -1, 1, NULL);
if (!BF_GLOBALS.getFlag(onDuty) && ((BF_GLOBALS._bookmark == bNone) || (BF_GLOBALS._bookmark == bLyleStoppedBy))) {
_field1398 = 1;
BF_GLOBALS.setFlag(onDuty);
} else {
_field1398 = 0;
}
BF_GLOBALS._player.postInit();
BF_GLOBALS._player.changeZoom(-1);
BF_GLOBALS._player.disableControl();
@ -1091,7 +1091,7 @@ void Scene315::postInit(SceneObjectList *OwnerList) {
_object7.postInit();
_object8.setFrame(8);
_sceneMode = (BF_GLOBALS._dayNumber == 1) ? 3152 : 3155;
setAction(&_sequenceManager, this, _sceneMode, &BF_GLOBALS._player, &_object6,
setAction(&_sequenceManager, this, _sceneMode, &BF_GLOBALS._player, &_object6,
&_object7, &_object8, NULL);
break;
case 300:
@ -1224,7 +1224,7 @@ void Scene315::signal() {
case 3153:
BF_GLOBALS._uiElements.addScore(30);
BF_INVENTORY.setObjectScene((int)_currentCursor, 315);
if (_stripNumber != 0)
setAction(&_action1);
else if (!_field1B64 || (_field1B66 != _field1B64))
@ -1314,7 +1314,7 @@ void Scene315::dispatch() {
if (_field1B68)
return;
if (_field1B6A) {
if (BF_GLOBALS._player._position.y < 69) {
BF_GLOBALS._player.disableControl();
@ -1326,7 +1326,7 @@ void Scene315::dispatch() {
_field1B68 = true;
SceneItem::display2(315, 28);
_sceneMode = 3150;
ADD_MOVER(BF_GLOBALS._player, BF_GLOBALS._player._position.x + 30,
ADD_MOVER(BF_GLOBALS._player, BF_GLOBALS._player._position.x + 30,
BF_GLOBALS._player._position.y + 15);
} else if (BF_GLOBALS._player._position.y > 156) {
BF_GLOBALS._player.disableControl();
@ -1335,7 +1335,7 @@ void Scene315::dispatch() {
_sceneMode = 3150;
ADD_MOVER(BF_GLOBALS._player, BF_GLOBALS._player._position.x + 30,
BF_GLOBALS._player._position.y - 24);
}
}
} else if (BF_GLOBALS._player.getRegionIndex() == 1) {
BF_GLOBALS._player.disableControl();
_field1B68 = true;
@ -1403,7 +1403,7 @@ void Scene325::postInit(SceneObjectList *OwnerList) {
_object1.setStrip(8);
_object1.setFrame(2);
_object1.setPosition(Common::Point(132, 28));
_object2.postInit();
_object2.setVisage(325);
_object2.setStrip(8);
@ -1700,7 +1700,7 @@ void Scene340::Action1::signal() {
if (!BF_GLOBALS._marinaWomanCtr) {
setAction(&scene->_action8, this);
} else if (!_action) {
BF_GLOBALS._player.setAction(&scene->_sequenceManager1, this,
BF_GLOBALS._player.setAction(&scene->_sequenceManager1, this,
MIN(BF_GLOBALS._marinaWomanCtr, 3) + 2340, &scene->_woman, &scene->_child,
&scene->_object4, NULL);
}
@ -1958,7 +1958,7 @@ void Scene340::Action8::process(Event &event) {
void Scene340::Timer2::signal() {
PaletteRotation *item;
item = BF_GLOBALS._scenePalette.addRotation(235, 239, 1);
item->setDelay(30);
item = BF_GLOBALS._scenePalette.addRotation(247, 249, 1);
@ -1989,14 +1989,14 @@ void Scene340::postInit(SceneObjectList *OwnerList) {
PalettedScene::postInit();
loadScene(340);
setZoomPercents(126, 70, 162, 100);
BF_GLOBALS._walkRegions.proc1(13);
BF_GLOBALS._walkRegions.proc1(15);
_timer2.set(2, NULL);
_stripManager.addSpeaker(&_gameTextSpeaker);
_stripManager.addSpeaker(&_jakeUniformSpeaker);
_field2652 = 0;
BF_GLOBALS._player.postInit();
BF_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
@ -2068,7 +2068,7 @@ void Scene340::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._walkRegions.proc1(19);
} else if (BF_GLOBALS.getFlag(fCalledBackup) && (BF_GLOBALS._marinaWomanCtr > 0)) {
_timer1.set(900, &_harrison, &_action4);
}
}
}
switch (BF_GLOBALS._sceneManager._previousScene) {
@ -2084,7 +2084,7 @@ void Scene340::postInit(SceneObjectList *OwnerList) {
break;
default:
_sound1.fadeSound(35);
BF_GLOBALS._sound1.fadeSound((BF_GLOBALS._bookmark < bStartOfGame) ||
BF_GLOBALS._sound1.fadeSound((BF_GLOBALS._bookmark < bStartOfGame) ||
(BF_GLOBALS._bookmark > bCalledToDomesticViolence) ? 10 : 19);
_seqNumber1 = 342;
break;
@ -2129,7 +2129,7 @@ void Scene340::process(Event &event) {
BF_GLOBALS._player.disableControl();
_sceneMode = 0;
SceneItem::display2(350, 26);
signal();
event.handled = true;
}
@ -2172,7 +2172,7 @@ void Scene340::dispatch() {
BF_GLOBALS._player.changeZoom(-1);
BF_GLOBALS._player.fixPriority(-1);
}
if (BF_GLOBALS._player._regionIndex == 16) {
BF_GLOBALS._player._regionBitList &= ~0x10000;
@ -2258,7 +2258,7 @@ bool Scene342::NorthExit::startAction(CursorType action, Event &event) {
void Scene342::Timer1::signal() {
PaletteRotation *item;
item = BF_GLOBALS._scenePalette.addRotation(235, 239, 1);
item->setDelay(30);
item = BF_GLOBALS._scenePalette.addRotation(247, 249, 1);
@ -2290,7 +2290,7 @@ void Scene342::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._walkRegions.proc1(13);
BF_GLOBALS._walkRegions.proc1(15);
_field1A1A = 0;
_timer1.set(2, NULL);
@ -2352,7 +2352,7 @@ void Scene342::postInit(SceneObjectList *OwnerList) {
case 330:
if (BF_GLOBALS._sceneManager._previousScene != 60) {
_sound1.fadeSound(35);
BF_GLOBALS._sound1.fadeSound((BF_GLOBALS._bookmark < bStartOfGame) ||
BF_GLOBALS._sound1.fadeSound((BF_GLOBALS._bookmark < bStartOfGame) ||
(BF_GLOBALS._bookmark > bCalledToDomesticViolence) ? 10 : 19);
}
@ -2388,7 +2388,7 @@ void Scene342::postInit(SceneObjectList *OwnerList) {
_lyle.setAction(&_sequenceManager2, NULL, 347, &_lyle, NULL);
BF_GLOBALS._sceneItems.push_back(&_lyle);
}
break;
break;
}
_item3.setDetails(7, 340, 3, 9, 12, 1);
@ -2426,7 +2426,7 @@ void Scene342::process(Event &event) {
BF_GLOBALS._player.disableControl();
_sceneMode = 0;
SceneItem::display2(350, 26);
signal();
event.handled = true;
}
@ -2469,7 +2469,7 @@ void Scene342::dispatch() {
BF_GLOBALS._player.changeZoom(-1);
BF_GLOBALS._player.fixPriority(-1);
}
if (idx == 16) {
BF_GLOBALS._player.enableControl();
ADD_PLAYER_MOVER(254, 110);
@ -2491,7 +2491,7 @@ bool Scene350::Item5::startAction(CursorType action, Event &event) {
case CURSOR_USE: {
BF_GLOBALS._player.disableControl();
scene->_sceneMode = 3;
Common::Point pt(76, 154);
PlayerMover *mover = new PlayerMover();
BF_GLOBALS._player.addMover(mover, &pt, scene);
@ -2523,7 +2523,7 @@ bool Scene350::Yacht::startAction(CursorType action, Event &event) {
_flag = true;
scene->_sceneMode = 1;
BF_GLOBALS._player.disableControl();
scene->setAction(&scene->_sequenceManager1, scene, BF_GLOBALS.getFlag(gunDrawn) ? 3504 : 3505,
scene->setAction(&scene->_sequenceManager1, scene, BF_GLOBALS.getFlag(gunDrawn) ? 3504 : 3505,
&BF_GLOBALS._player, &scene->_yachtDoor, NULL);
return true;
}
@ -2605,7 +2605,7 @@ void Scene350::Timer1::signal() {
rot->setDelay(20);
rot = BF_GLOBALS._scenePalette.addRotation(242, 244, 1);
rot->setDelay(12);
remove();
}
@ -2624,7 +2624,7 @@ void Scene350::postInit(SceneObjectList *OwnerList) {
_stripManager.addSpeaker(&_gameTextSpeaker);
_stripManager.addSpeaker(&_jakeUniformSpeaker);
BF_GLOBALS._player.postInit();
BF_GLOBALS._player.setVisage(BF_GLOBALS.getFlag(onDuty) ? 352 : 1358);
BF_GLOBALS._player.setFrame(1);
@ -2646,7 +2646,7 @@ void Scene350::postInit(SceneObjectList *OwnerList) {
_yachtDoor.setFrame(1);
_yachtDoor.fixPriority(72);
_yachtDoor.setPosition(Common::Point(40, 74));
_yachtBody.setup(350, 1, 1, 129, 142, 255);
if (BF_GLOBALS.getFlag(fBackupIn350)) {
@ -2657,7 +2657,7 @@ void Scene350::postInit(SceneObjectList *OwnerList) {
_harrison.changeZoom(-1);
_harrison.setDetails(350, 12, 13, 14, 1, NULL);
_harrison._moveDiff = Common::Point(2, 1);
_stripManager.addSpeaker(&_harrisonSpeaker);
}
@ -2677,7 +2677,7 @@ void Scene350::postInit(SceneObjectList *OwnerList) {
_item3.setDetails(7, 350, 23, 24, 25, 1);
_item2.setDetails(Rect(0, 0, SCREEN_WIDTH - 1, 31), 350, 3, 4, 5, 1, NULL);
_item1.setDetails(Rect(0, 0, SCREEN_WIDTH - 1, BF_INTERFACE_Y), 350, 0, 1, 2, 1, NULL);
switch (BF_GLOBALS._sceneManager._previousScene) {
case 370:
BF_GLOBALS._player.enableControl();
@ -2694,7 +2694,7 @@ void Scene350::postInit(SceneObjectList *OwnerList) {
default:
BF_GLOBALS.clearFlag(gunDrawn);
if ((BF_GLOBALS._dayNumber == 1) && (BF_GLOBALS._bookmark < bCalledToDomesticViolence) &&
if ((BF_GLOBALS._dayNumber == 1) && (BF_GLOBALS._bookmark < bCalledToDomesticViolence) &&
BF_GLOBALS.getFlag(fBackupIn350)) {
BF_GLOBALS._player.disableControl();
_sceneMode = 0;
@ -2720,19 +2720,19 @@ void Scene350::signal() {
BF_GLOBALS._sceneManager.changeScene(355);
break;
case 2:
BF_GLOBALS._sceneManager.changeScene((BF_GLOBALS._dayNumber != 1) ||
BF_GLOBALS._sceneManager.changeScene((BF_GLOBALS._dayNumber != 1) ||
(BF_GLOBALS._bookmark < bStartOfGame) || (BF_GLOBALS._bookmark >= bCalledToDomesticViolence) ? 342 : 340);
break;
case 3:
BF_GLOBALS._player.setStrip(8);
_object5.postInit();
_object5.setVisage(350);
_object5.setStrip(4);
_object5.fixPriority(200);
_object5.setPosition(Common::Point(85, 166));
BF_GLOBALS._sceneItems.push_front(&_object5);
if (BF_INVENTORY.getObjectScene(INV_HOOK) == 350) {
_hook.postInit();
_hook.setVisage(350);
@ -2741,7 +2741,7 @@ void Scene350::signal() {
_hook.setPosition(Common::Point(106, 146));
BF_GLOBALS._sceneItems.push_front(&_hook);
}
BF_GLOBALS._player.enableControl();
_sound2.play(97);
break;
@ -2846,7 +2846,7 @@ bool Scene355::Doorway::startAction(CursorType action, Event &event) {
scene->_sceneMode = 9984;
scene->signal();
} else {
scene->setMode(true, 9984);
scene->setMode(true, 9984);
}
return true;
case CURSOR_TALK:
@ -2886,7 +2886,7 @@ bool Scene355::Doorway::startAction(CursorType action, Event &event) {
default:
break;
}
return NamedObject::startAction(action, event);
}
@ -3090,7 +3090,7 @@ bool Scene355::Object7::startAction(CursorType action, Event &event) {
case CURSOR_TALK:
BF_GLOBALS._player.disableControl();
scene->_sceneMode = 0;
if (BF_GLOBALS._sceneObjects->contains(&scene->_object6)) {
scene->_stripManager.start((BF_INVENTORY.getObjectScene(INV_HANDCUFFS) == 355) ? 3578 : 3577, scene);
} else {
@ -3130,7 +3130,7 @@ bool Scene355::Object8::startAction(CursorType action, Event &event) {
} else if (BF_GLOBALS._dayNumber < 5) {
SceneItem::display2(355, 52);
return true;
}
}
break;
case INV_COLT45:
if (BF_GLOBALS.getFlag(fBackupIn350)) {
@ -3155,10 +3155,10 @@ bool Scene355::Item1::startAction(CursorType action, Event &event) {
switch (action) {
case CURSOR_LOOK:
SceneItem::display2(355, 28);
return true;
return true;
case CURSOR_USE:
SceneItem::display2(355, 37);
return true;
return true;
case INV_RENTAL_KEYS:
if (scene->_modeFlag) {
scene->_sceneMode = 9980;
@ -3197,7 +3197,7 @@ bool Scene355::Item3::startAction(CursorType action, Event &event) {
switch (action) {
case CURSOR_LOOK:
SceneItem::display2(355, 33);
return true;
return true;
case CURSOR_USE:
if (BF_GLOBALS._dayNumber < 5)
SceneItem::display2(355, 21);
@ -3345,7 +3345,7 @@ bool Scene355::Item11::startAction(CursorType action, Event &event) {
default:
break;
}
return NamedHotspot::startAction(action, event);
}
@ -3465,7 +3465,7 @@ void Scene355::postInit(SceneObjectList *OwnerList) {
_item4._sceneRegionId = 17;
BF_GLOBALS._sceneItems.push_back(&_item4);
_locker.postInit();
_locker.setVisage(2356);
_locker.setPosition(Common::Point(88, 99));
@ -3532,10 +3532,10 @@ void Scene355::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player.setPosition(Common::Point(133, 173));
BF_GLOBALS._player.fixPriority(249);
BF_GLOBALS._player.setStrip(7);
if (BF_GLOBALS._bookmark == bDoneAtLyles)
BF_GLOBALS._bookmark = bEndDayFour;
_item5.setDetails(Rect(22, 136, 46, 146), 355, 43, -1, -1, 1, NULL);
_nextSceneMode = 0;
@ -3609,7 +3609,7 @@ void Scene355::postInit(SceneObjectList *OwnerList) {
_harrison.setPosition(Common::Point(152, 131));
_harrison.animate(ANIM_MODE_1, NULL);
_harrison.setObjectWrapper(new SceneObjectWrapper());
if (BF_GLOBALS.getFlag(gunDrawn)) {
_harrison.setVisage(357);
_harrison.setStrip(2);
@ -3737,7 +3737,7 @@ void Scene355::signal() {
BF_GLOBALS.setFlag(unlockBoat);
BF_GLOBALS._uiElements.addScore(10);
}
SceneItem::display(355, !_doorway._v3 ? 24 : 25);
BF_GLOBALS._player.enableControl();
break;
@ -4016,7 +4016,7 @@ void Scene355::process(Event &event) {
} else {
BF_GLOBALS.setFlag(gunDrawn);
if (_modeFlag) {
setMode(true, 3561);
setMode(true, 3561);
} else {
_sceneMode = 3561;
signal();
@ -4414,7 +4414,7 @@ void Scene360::postInit(SceneObjectList *OwnerList) {
_object2.postInit();
_object2.setPosition(Common::Point(-40, -40));
_slidingDoor.setPosition(Common::Point(6, 130));
_slidingDoor.setAction(&_sequenceManager1, this, 3606, &_slidingDoor, &_object7, NULL);
}
@ -4500,16 +4500,16 @@ void Scene360::process(Event &event) {
if (BF_GLOBALS._player._position.x <= 160)
SceneItem::display2(360, 18);
else {
if (BF_GLOBALS.getFlag(fBackupIn350))
if (BF_GLOBALS.getFlag(fBackupIn350))
SceneItem::display2(360, 19);
BF_GLOBALS.clearFlag(gunDrawn);
_sceneMode = 9999;
BF_GLOBALS._player.setVisage(1361);
BF_GLOBALS._player.addMover(NULL);
BF_GLOBALS._player.setFrame(BF_GLOBALS._player.getFrameCount());
BF_GLOBALS._player.animate(ANIM_MODE_6, this);
_object6.setVisage(1363);
}
} else {
@ -4527,7 +4527,7 @@ void Scene360::process(Event &event) {
_sceneMode = 9998;
_object6.setVisage(363);
}
event.handled = true;
}
}
@ -4548,7 +4548,7 @@ void Scene360::dispatch() {
}
}
if ((BF_GLOBALS._player._position.x <= 168) && !BF_GLOBALS.getFlag(greenTaken) &&
if ((BF_GLOBALS._player._position.x <= 168) && !BF_GLOBALS.getFlag(greenTaken) &&
!BF_GLOBALS.getFlag(gunDrawn)) {
// Moving to doorway without drawn gun before Green is captured
BF_GLOBALS._player.disableControl();
@ -4594,7 +4594,7 @@ bool Scene370::Green::startAction(CursorType action, Event &event) {
SceneItem::display2(370, (_v2 < 3) ? 10 : 0);
return true;
case CURSOR_USE:
if (_v2 != 3)
if (_v2 != 3)
SceneItem::display2(370, 1);
else if (BF_INVENTORY.getObjectScene(INV_HANDCUFFS) == 1)
SceneItem::display2(370, 26);
@ -4631,7 +4631,7 @@ bool Scene370::Green::startAction(CursorType action, Event &event) {
case 2:
++_v2;
scene->_sceneMode = 3708;
scene->setAction(&scene->_sequenceManager, scene, 3708, this, &scene->_laura, &scene->_harrison,
scene->setAction(&scene->_sequenceManager, scene, 3708, this, &scene->_laura, &scene->_harrison,
&scene->_object5, &scene->_greensGun, NULL);
break;
case 3:
@ -5095,7 +5095,7 @@ void Scene380::postInit(SceneObjectList *OwnerList) {
_vechile.postInit();
_vechile.setVisage(380);
_vechile.fixPriority(109);
if (BF_GLOBALS.getFlag(fWithLyle)) {
// Show vechile as car
_vechile.setStrip(3);
@ -5296,7 +5296,7 @@ bool Scene385::Jim::startAction(CursorType action, Event &event) {
scene->_talkAction = 3868;
break;
}
scene->_jimFlag = 1;
scene->setAction(&scene->_action1);
}
@ -5359,7 +5359,7 @@ bool Scene385::Dezi::startAction(CursorType action, Event &event) {
default:
BF_GLOBALS._deziTopic = 3;
scene->_talkAction = 3868;
break;
break;
}
}
@ -5421,7 +5421,7 @@ void Scene385::postInit(SceneObjectList *OwnerList) {
_item2.setDetails(2, 385, 7, -1, -1, 1);
_item1.setDetails(3, 385, 6, -1, 6, 1);
_item5.setDetails(4, 385, 14, -1, -1, 1);
_jim.postInit();
_jim.setVisage(385);
_jim.setStrip(3);
@ -5650,11 +5650,11 @@ bool Scene390::Object2::startAction(CursorType action, Event &event) {
BF_GLOBALS._player.disableControl();
BF_GLOBALS._bookmark = bLauraToParamedics;
scene->_sceneMode = 3905;
BF_INVENTORY.setObjectScene(INV_GREEN_ID, 390);
if (BF_GLOBALS.getFlag(fLeftTraceIn910))
BF_GLOBALS.clearFlag(fLeftTraceIn910);
scene->setAction(&scene->_sequenceManager, scene, 3905, &BF_GLOBALS._player, this, NULL);
BF_GLOBALS.clearFlag(f1015Marina);
BF_GLOBALS.clearFlag(f1027Marina);
@ -5727,7 +5727,7 @@ bool Scene390::GangMember1::startAction(CursorType action, Event &event) {
BF_GLOBALS.setFlag(readFrankRights);
BF_GLOBALS._uiElements.addScore(30);
BF_GLOBALS._player.disableControl();
scene->_sceneMode = 3904;
scene->setAction(&scene->_sequenceManager, scene, 3907, &BF_GLOBALS._player, NULL);
}
@ -5752,7 +5752,7 @@ bool Scene390::GangMember2::startAction(CursorType action, Event &event) {
BF_GLOBALS._uiElements.addScore(30);
BF_GLOBALS.setFlag(readFrankRights);
BF_GLOBALS._player.disableControl();
scene->_sceneMode = 3904;
scene->setAction(&scene->_sequenceManager, scene, 3907, &BF_GLOBALS._player, NULL);
}
@ -5791,7 +5791,7 @@ void Scene390::postInit(TsAGE::SceneObjectList *OwnerList) {
SceneExt::postInit();
setZoomPercents(105, 85, 130, 100);
loadScene(390);
_stripManager.addSpeaker(&_gameTextSpeaker);
_stripManager.addSpeaker(&_jakeUniformSpeaker);
_stripManager.addSpeaker(&_jakeJacketSpeaker);

8
engines/tsage/blue_force/blueforce_scenes3.h
View File

@ -245,7 +245,7 @@ public:
class Scene330: public SceneExt {
class Timer1: public Timer {
public:
public:
virtual void signal();
};
public:
@ -333,7 +333,7 @@ class Scene340: public PalettedScene {
/* Timers */
class Timer2: public Timer {
public:
public:
virtual void signal();
};
public:
@ -401,7 +401,7 @@ class Scene342: public PalettedScene {
/* Timers */
class Timer1: public Timer {
public:
public:
virtual void signal();
};
public:
@ -461,7 +461,7 @@ class Scene350: public SceneExt {
/* Timers */
class Timer1: public Timer {
public:
public:
virtual void signal();
};
public:

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

@ -88,8 +88,8 @@ void Scene410::Action2::signal() {
scene->_stripManager.start(4110, scene);
break;
default:
SceneItem::display(410, 11, SET_WIDTH, 300,
SET_X, GLOBALS._sceneManager._scene->_sceneBounds.left + 10,
SceneItem::display(410, 11, SET_WIDTH, 300,
SET_X, GLOBALS._sceneManager._scene->_sceneBounds.left + 10,
SET_Y, GLOBALS._sceneManager._scene->_sceneBounds.top + BF_INTERFACE_Y + 2,
SET_FONT, 4, SET_BG_COLOR, 1, SET_FG_COLOR, 13, SET_EXT_BGCOLOR, 82,
SET_EXT_FGCOLOR, 13, LIST_END);
@ -362,7 +362,7 @@ bool Scene410::Object1::startAction(CursorType action, Event &event) {
BF_GLOBALS._uiElements.addScore(30);
BF_GLOBALS._player.disableControl();
scene->_sceneMode = 0;
// TODO: Original code pushes a copy of the entirety of object1 onto stack
scene->setAction(&scene->_sequenceManager1, scene, 4126, &BF_GLOBALS._player, &scene->_object1, NULL);
}
@ -423,9 +423,9 @@ bool Scene410::Object2::startAction(CursorType action, Event &event) {
BF_GLOBALS.setFlag(readFrankRights);
BF_GLOBALS._uiElements.addScore(30);
BF_GLOBALS._player.disableControl();
scene->_sceneMode = 0;
scene->setAction(&scene->_sequenceManager1, scene, 4125, &BF_GLOBALS._player,
scene->setAction(&scene->_sequenceManager1, scene, 4125, &BF_GLOBALS._player,
&scene->_object2, NULL);
}
return true;
@ -534,7 +534,7 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player.changeZoom(-1);
_item2.setDetails(8, 410, 15, -1, -1, 1);
_object2.postInit();
_object2.setVisage(415);
_object2.setStrip(1);
@ -557,7 +557,7 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
_object6.setVisage(410);
_object6.setStrip(4);
_object6.setPosition(Common::Point(240, 43));
_item4.setDetails(6, 410, 3, -1, -1, 1);
_item3.setDetails(7, 410, 3, -1, -1, 1);
@ -584,7 +584,7 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
_object4.setDetails(410, 8, 9, 10, 1, NULL);
_object4.fixPriority(148);
_object4.setPosition(Common::Point(39, 168));
_field1FC4 = 1;
_sceneMode = 0;
signal();
@ -614,13 +614,13 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
_object2.setStrip(6);
_object2.setFrame(8);
}
BF_GLOBALS._walkRegions.proc1(16);
if (BF_GLOBALS.getFlag(fDriverOutOfTruck)) {
_object1.setVisage(417);
_object1.setStrip(1);
_object1.setPosition(Common::Point(152, 97));
BF_GLOBALS._walkRegions.proc1(7);
}

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

@ -400,7 +400,7 @@ bool Scene830::Door::startAction(CursorType action, Event &event) {
} else if (scene->_field18A4) {
BF_GLOBALS._player.disableControl();
scene->_sceneMode = 832;
if (BF_GLOBALS.getFlag(onDuty)) {
scene->setAction(&scene->_sequenceManager, scene, 8302, &BF_GLOBALS._player, &scene->_door, NULL);
} else if (BF_GLOBALS.getFlag(fWithLyle)) {
@ -536,7 +536,7 @@ void Scene830::postInit(SceneObjectList *OwnerList) {
_object4.fixPriority(90);
_object4.setDetails(830, 0, 1, 2, 1, NULL);
}
_door.postInit();
_door.setVisage(830);
_door.setDetails(830, 3, 4, -1, 1, NULL);
@ -690,7 +690,7 @@ void Scene830::signal() {
break;
case 831:
case 8306:
BF_GLOBALS._sceneManager.changeScene((BF_GLOBALS._bookmark < bStartOfGame) ||
BF_GLOBALS._sceneManager.changeScene((BF_GLOBALS._bookmark < bStartOfGame) ||
(BF_GLOBALS._bookmark >= bCalledToDomesticViolence) ? 342 : 340);
break;
case 832:
@ -842,7 +842,7 @@ void Scene840::Object2::process(Event &event) {
if (_bounds.contains(event.mousePos)) {
CursorType cursorId = BF_GLOBALS._events.getCursor();
BF_GLOBALS._events.setCursor(cursorId);
if ((event.eventType == EVENT_BUTTON_DOWN) && (cursorId == CURSOR_WALK) && (event.btnState == 3)) {
BF_GLOBALS._events.setCursor(CURSOR_USE);
event.handled = true;
@ -930,7 +930,7 @@ bool Scene840::Object2::RentalKeys::startAction(CursorType action, Event &event)
SceneItem::display2(840, 55);
BF_INVENTORY.setObjectScene(INV_RENTAL_KEYS, 1);
BF_GLOBALS._uiElements.addScore(30);
scene->_object2._v1B4 = 1;
remove();
}
@ -1053,7 +1053,7 @@ bool Scene840::Coins::startAction(CursorType action, Event &event) {
case CURSOR_LOOK:
BF_GLOBALS._player.disableControl();
scene->_sceneMode = 8404;
scene->setAction(&scene->_sequenceManager1, scene, BF_GLOBALS.getFlag(onDuty) ? 8415 : 8404,
scene->setAction(&scene->_sequenceManager1, scene, BF_GLOBALS.getFlag(onDuty) ? 8415 : 8404,
&BF_GLOBALS._player, NULL);
return true;
default:
@ -1178,7 +1178,7 @@ void Scene840::signal() {
switch (BF_GLOBALS._dayNumber) {
case 1:
if (_field1ABA == 1) {
_stripManager.start(BF_GLOBALS.getFlag(onDuty) ? 8430 : 8406, this);
_stripManager.start(BF_GLOBALS.getFlag(onDuty) ? 8430 : 8406, this);
} else if (!BF_GLOBALS.getFlag(onDuty)) {
_stripManager.start(!BF_GLOBALS._v4CEB6 ? 8400 : 8406, this);
} else if (BF_GLOBALS._bookmark < bStartOfGame) {
@ -1202,7 +1202,7 @@ void Scene840::signal() {
} else {
_stripManager.start(8413, this);
}
BF_GLOBALS.setFlag(fTalkedCarterDay3);
break;
case 4:
@ -1292,7 +1292,7 @@ void Scene840::signal() {
_stripManager.start(8441, this);
break;
case 8407:
if (((BF_GLOBALS._dayNumber == 4) && (BF_GLOBALS._bookmark >= bEndDayThree)) ||
if (((BF_GLOBALS._dayNumber == 4) && (BF_GLOBALS._bookmark >= bEndDayThree)) ||
(BF_INVENTORY.getObjectScene(INV_WAVE_KEYS) == 1)) {
_sceneMode = 8416;
setAction(&_sequenceManager1, this, 8416, &BF_GLOBALS._player, NULL);
@ -1379,7 +1379,7 @@ void Scene840::process(Event &event) {
void Scene840::dispatch() {
SceneExt::dispatch();
if (_field1ABC && (BF_GLOBALS._player._position.x > 310) && !_action) {
_field1ABC = 0;
BF_GLOBALS._player.disableControl();

6
engines/tsage/blue_force/blueforce_scenes9.cpp
View File

@ -506,7 +506,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
_object2.postInit();
_object2.setVisage(900);
if (BF_GLOBALS._v4CEC8 == 0)
_object2.setStrip(4);
else
@ -578,7 +578,7 @@ void Scene900::signal() {
BF_GLOBALS._player.enableControl();
break;
case 9001:
if ((BF_INVENTORY.getObjectScene(INV_FISHING_NET) == 900) || (BF_GLOBALS._v4CEC0 != 0) ||
if ((BF_INVENTORY.getObjectScene(INV_FISHING_NET) == 900) || (BF_GLOBALS._v4CEC0 != 0) ||
(_object2._flag == 0))
BF_GLOBALS.setFlag(fLeftTraceIn900);
else
@ -775,7 +775,7 @@ bool Scene920::Item1::startAction(CursorType action, Event &event) {
// North Exit
bool Scene920::Item8::startAction(CursorType action, Event &event) {
Scene920 *scene = (Scene920 *)BF_GLOBALS._sceneManager._scene;
BF_GLOBALS._player.disableControl();
if (BF_GLOBALS._player._visage == 921) {
scene->_sceneMode = 10;

2
engines/tsage/blue_force/blueforce_speakers.cpp
View File

@ -54,7 +54,7 @@ void VisualSpeaker::remove() {
void VisualSpeaker::synchronize(Serializer &s) {
Speaker::synchronize(s);
s.syncAsByte(_removeObject1);
s.syncAsByte(_removeObject2);
s.syncAsSint16LE(_xp);

12
engines/tsage/blue_force/blueforce_ui.cpp
View File

@ -137,7 +137,7 @@ void UIScore::draw() {
void UIScore::updateScore() {
int score = BF_GLOBALS._uiElements._scoreValue;
_digit3.setFrame(score / 1000 + 1); score %= 1000;
_digit2.setFrame(score / 100 + 1); score %= 100;
_digit1.setFrame(score / 10 + 1); score %= 10;
@ -166,7 +166,7 @@ void UIInventorySlot::process(Event &event) {
showAmmoBelt();
} else if (_objIndex != INV_NONE) {
_object->setCursor();
_object->setCursor();
}
}
}
@ -203,7 +203,7 @@ void UIInventoryScroll::process(Event &event) {
// Scroll the inventory as necessary
BF_GLOBALS._uiElements.scrollInventory(_isLeft);
event.handled = true;
break;
break;
default:
break;
}
@ -260,7 +260,7 @@ void UICollection::draw() {
_objList[idx]->draw();
// Draw the resulting UI onto the screen
BF_GLOBALS._screenSurface.copyFrom(BF_GLOBALS._sceneManager._scene->_backSurface,
BF_GLOBALS._screenSurface.copyFrom(BF_GLOBALS._sceneManager._scene->_backSurface,
Rect(0, BF_INTERFACE_Y, SCREEN_WIDTH, SCREEN_HEIGHT),
Rect(0, BF_INTERFACE_Y, SCREEN_WIDTH, SCREEN_HEIGHT));
@ -405,7 +405,7 @@ void UIElements::setup(const Common::Point &pt) {
}
void UIElements::add(UIElement *obj) {
// Add object
// Add object
assert(_objList.size() < 12);
_objList.push_back(obj);
@ -421,7 +421,7 @@ void UIElements::add(UIElement *obj) {
*/
void UIElements::updateInventory() {
_score.updateScore();
updateInvList();
updateInvList();
// Enable scroll buttons if the player has more than four items
if (_itemList.size() > 4) {

2
engines/tsage/blue_force/blueforce_ui.h
View File

@ -71,7 +71,7 @@ public:
virtual void postInit(SceneObjectList *OwnerList = NULL);
virtual void draw();
void updateScore();
};

20
engines/tsage/core.cpp
View File

@ -98,7 +98,7 @@ void InvObjectList::synchronize(Serializer &s) {
int InvObjectList::indexOf(InvObject *obj) const {
int idx = 0;
SynchronizedList<InvObject *>::const_iterator i;
for (i = _itemList.begin(); i != _itemList.end(); ++i, ++idx) {
if ((*i) == obj)
return idx;
@ -1426,7 +1426,7 @@ void ScenePalette::changeBackground(const Rect &bounds, FadeMode fadeMode) {
Rect tempRect = bounds;
if (_vm->getGameID() == GType_BlueForce)
tempRect.setHeight(BF_GLOBALS._interfaceY);
_globals->_screenSurface.copyFrom(_globals->_sceneManager._scene->_backSurface,
tempRect, Rect(0, 0, tempRect.width(), tempRect.height()), NULL);
@ -1472,9 +1472,9 @@ void SceneItem::remove() {
_globals->_sceneItems.remove(this);
}
bool SceneItem::startAction(CursorType action, Event &event) {
bool SceneItem::startAction(CursorType action, Event &event) {
if (_vm->getGameID() == GType_Ringworld) {
doAction(action);
doAction(action);
return true;
} else if ((action == CURSOR_LOOK) || (action == CURSOR_USE) || (action == CURSOR_TALK) ||
(action < CURSOR_LOOK)) {
@ -1520,7 +1520,7 @@ bool SceneItem::contains(const Common::Point &pt) {
}
void SceneItem::display(int resNum, int lineNum, ...) {
Common::String msg = (!resNum || (resNum == -1)) ? Common::String() :
Common::String msg = (!resNum || (resNum == -1)) ? Common::String() :
_resourceManager->getMessage(resNum, lineNum);
if ((_vm->getGameID() == GType_BlueForce) && BF_GLOBALS._uiElements._active)
@ -1666,8 +1666,8 @@ void SceneItem::display(int resNum, int lineNum, ...) {
void SceneItem::display2(int resNum, int lineNum) {
if (_vm->getGameID() == GType_BlueForce)
display(resNum, lineNum, SET_WIDTH, 312,
SET_X, 4 + GLOBALS._sceneManager._scene->_sceneBounds.left,
display(resNum, lineNum, SET_WIDTH, 312,
SET_X, 4 + GLOBALS._sceneManager._scene->_sceneBounds.left,
SET_Y, GLOBALS._sceneManager._scene->_sceneBounds.top + BF_INTERFACE_Y + 2,
SET_FONT, 4, SET_BG_COLOR, 1, SET_FG_COLOR, 19, SET_EXT_BGCOLOR, 9,
SET_EXT_FGCOLOR, 13, LIST_END);
@ -1679,8 +1679,8 @@ void SceneItem::display(const Common::String &msg) {
assert(_vm->getGameID() == GType_BlueForce);
display(-1, -1, msg.c_str(),
SET_WIDTH, 312,
SET_X, 4 + GLOBALS._sceneManager._scene->_sceneBounds.left,
SET_WIDTH, 312,
SET_X, 4 + GLOBALS._sceneManager._scene->_sceneBounds.left,
SET_Y, GLOBALS._sceneManager._scene->_sceneBounds.top + BF_INTERFACE_Y + 2,
SET_FONT, 4, SET_BG_COLOR, 1, SET_FG_COLOR, 19, SET_EXT_BGCOLOR, 9,
SET_EXT_FGCOLOR, 13, LIST_END);
@ -2530,7 +2530,7 @@ void SceneObject::setup(int visage, int stripFrameNum, int frameNum, int posX, i
void BackgroundSceneObject::postInit(SceneObjectList *OwnerList) {
SceneObjectList dummyList;
SceneObjectList *pList = !_globals->_sceneManager._scene ? &dummyList :
SceneObjectList *pList = !_globals->_sceneManager._scene ? &dummyList :
&_globals->_sceneManager._scene->_bgSceneObjects;
SceneObject::postInit(pList);

4
engines/tsage/events.cpp
View File

@ -212,7 +212,7 @@ void EventsClass::setCursor(CursorType cursorType) {
cursor = _resourceManager->getSubResource(1, 5, 1, &size);
} else {
// Inventory icon
cursor = _resourceManager->getSubResource(10, ((int)cursorType - 1) / 20 + 1,
cursor = _resourceManager->getSubResource(10, ((int)cursorType - 1) / 20 + 1,
((int)cursorType - 1) % 20 + 1, &size);
questionEnabled = true;
}
@ -310,7 +310,7 @@ void EventsClass::setCursor(GfxSurface &cursor) {
Graphics::Surface s = cursor.lockSurface();
const byte *cursorData = (const byte *)s.getBasePtr(0, 0);
CursorMan.replaceCursor(cursorData, cursor.getBounds().width(), cursor.getBounds().height(),
CursorMan.replaceCursor(cursorData, cursor.getBounds().width(), cursor.getBounds().height(),
cursor._centroid.x, cursor._centroid.y, cursor._transColor);
_lastCursor = CURSOR_NONE;

12
engines/tsage/events.h
View File

@ -65,18 +65,18 @@ enum CursorType {
OBJECT_TUNIC2 = 29, OBJECT_BONE = 30, OBJECT_EMPTY_JAR = 31, OBJECT_JAR = 32,
// Blue Force objects
INV_NONE = 0, INV_COLT45 = 1, INV_AMMO_CLIP = 2, INV_SPARE_CLIP = 3, INV_HANDCUFFS = 4,
INV_GREENS_GUN = 5, INV_TICKET_BOOK = 6, INV_MIRANDA_CARD = 7, INV_FOREST_RAP = 8,
INV_GREEN_ID = 9, INV_BASEBALL_CARD = 10, INV_BOOKING_GREEN = 11, INV_FLARE = 12,
INV_NONE = 0, INV_COLT45 = 1, INV_AMMO_CLIP = 2, INV_SPARE_CLIP = 3, INV_HANDCUFFS = 4,
INV_GREENS_GUN = 5, INV_TICKET_BOOK = 6, INV_MIRANDA_CARD = 7, INV_FOREST_RAP = 8,
INV_GREEN_ID = 9, INV_BASEBALL_CARD = 10, INV_BOOKING_GREEN = 11, INV_FLARE = 12,
INV_COBB_RAP = 13, INV_22_BULLET = 14, INV_AUTO_RIFLE = 15, INV_WIG = 16, INV_FRANKIE_ID = 17,
INV_TYRONE_ID = 18, INV_22_SNUB = 19, INV_BOOKING_FRANKIE = 21, INV_BOOKING_GANG = 22,
INV_FBI_TELETYPE = 23, INV_DA_NOTE = 24, INV_PRINT_OUT = 25, INV_WAREHOUSE_KEYS = 26,
INV_CENTER_PUNCH = 27, INV_TRANQ_GUN = 28, INV_HOOK = 29, INV_RAGS = 30, INV_JAR = 31,
INV_SCREWDRIVER = 32, INV_D_FLOPPY = 33, INV_BLANK_DISK = 34, INV_STICK = 35,
INV_CRATE1 = 36, INV_CRATE2 = 37, INV_SHOEBOX = 38, INV_BADGE = 39, INV_RENTAL_COUPON = 41,
INV_NICKEL = 42, INV_LYLE_CARD = 43, INV_CARTER_NOTE = 44, INV_MUG_SHOT = 45,
INV_CLIPPING = 46, INV_MICROFILM = 47, INV_WAVE_KEYS = 48, INV_RENTAL_KEYS = 49,
INV_NAPKIN = 50, INV_DMV_PRINTOUT = 51, INV_FISHING_NET = 52, INV_ID = 53,
INV_NICKEL = 42, INV_LYLE_CARD = 43, INV_CARTER_NOTE = 44, INV_MUG_SHOT = 45,
INV_CLIPPING = 46, INV_MICROFILM = 47, INV_WAVE_KEYS = 48, INV_RENTAL_KEYS = 49,
INV_NAPKIN = 50, INV_DMV_PRINTOUT = 51, INV_FISHING_NET = 52, INV_ID = 53,
INV_9MM_BULLETS = 54, INV_SCHEDULE = 55, INV_GRENADES = 56, INV_YELLOW_CORD = 57,
INV_HALF_YELLOW_CORD = 58, INV_BLACK_CORD = 59, INV_HALF_BLACK_CORD = 61, INV_WARRANT = 62,
INV_JACKET = 63, INV_GREENS_KNIFE = 64, INV_DOG_WHISTLE = 65, INV_AMMO_BELT = 66,

2
engines/tsage/module.mk
View File

@ -44,5 +44,5 @@ ifeq ($(ENABLE_TSAGE), DYNAMIC_PLUGIN)
PLUGIN := 1
endif
# Include common rules
# Include common rules
include $(srcdir)/rules.mk

4
engines/tsage/scenes.h
View File

@ -72,8 +72,8 @@ public:
class SceneManager : public GameHandler, public SaveListener {
private:
void disposeRegions() {
// No need to do anything, since regions will be freed automatically when the scene is
void disposeRegions() {
// No need to do anything, since regions will be freed automatically when the scene is
}
Scene *getNewScene();
public:

6
engines/tsage/sound.cpp
View File

@ -91,7 +91,7 @@ void SoundManager::postInit() {
// I originally separated the sound manager update method into a separate thread, since
// it handles updates for both music and Fx. However, since Adlib updates also get done in a
// thread, and doesn't get too far ahead, I've left it to the AdlibSoundDriver class to
// thread, and doesn't get too far ahead, I've left it to the AdlibSoundDriver class to
// call the update method, rather than having it be called separately
// g_system->getTimerManager()->installTimerProc(_sfUpdateCallback, 1000000 / SOUND_FREQUENCY, NULL, "tsageSoundUpdate");
__sndmgrReady = true;
@ -139,7 +139,7 @@ Common::List<SoundDriverEntry> &SoundManager::buildDriverList(bool detectFlag) {
assert(__sndmgrReady);
_availableDrivers.clear();
// Build up a list of available drivers. Currently we only implement an Adlib music
// Build up a list of available drivers. Currently we only implement an Adlib music
// and SoundBlaster FX driver
// Adlib driver
@ -1362,7 +1362,7 @@ void SoundManager::_sfExtractGroupMask() {
bool SoundManager::_sfInstallDriver(SoundDriver *driver) {
if (!driver->open())
return false;
sfManager()._installedDrivers.push_back(driver);
driver->_groupOffset = driver->getGroupData();
driver->_groupMask = driver->_groupOffset->groupMask;

2
engines/tsage/sound.h
View File

@ -72,7 +72,7 @@ struct RegisterValue {
uint8 _regNum;
uint8 _value;
RegisterValue(int regNum, int value) {
RegisterValue(int regNum, int value) {
_regNum = regNum; _value = value;
}
};