thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TSAGE: BF - Remove some useless variables, some renaming

Browse source
This commit is contained in:
Strangerke 2013-11-26 07:59:12 +01:00
parent af510118e8
commit c211cede06
6 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/tsage/blue_force/blueforce_logic.cpp
View file

@ -648,8 +648,6 @@ void FocusObject::postInit(SceneObjectList *OwnerList) {
_lookLineNum = 43; _lookLineNum = 43;
_talkLineNum = 44; _talkLineNum = 44;
_useLineNum = -1; _useLineNum = -1;
_v90 = 0;
_v92 = 1;
SceneExt *scene = (SceneExt *)BF_GLOBALS._sceneManager._scene; SceneExt *scene = (SceneExt *)BF_GLOBALS._sceneManager._scene;
scene->_focusObject = this; scene->_focusObject = this;
@ -658,8 +656,11 @@ void FocusObject::postInit(SceneObjectList *OwnerList) {
void FocusObject::synchronize(Serializer &s) { void FocusObject::synchronize(Serializer &s) {
NamedObject::synchronize(s); NamedObject::synchronize(s);
s.syncAsSint16LE(_v90); if (s.getVersion() < 12) {
s.syncAsSint16LE(_v92); int useless = 0;
s.syncAsSint16LE(useless);
s.syncAsSint16LE(useless);
}
} }
void FocusObject::remove() { void FocusObject::remove() {
@ -765,8 +766,6 @@ void SceneExt::dispatch() {
void SceneExt::loadScene(int sceneNum) { void SceneExt::loadScene(int sceneNum) {
Scene::loadScene(sceneNum); Scene::loadScene(sceneNum);
_v51C34.top = 0;
_v51C34.bottom = 300;
BF_GLOBALS._sceneHandler->_delayTicks = 1; BF_GLOBALS._sceneHandler->_delayTicks = 1;
} }

14
engines/tsage/blue_force/blueforce_logic.h
View file

@ -139,14 +139,17 @@ public:
class NamedObject2: public NamedObject { class NamedObject2: public NamedObject {
public: public:
int _v1, _v2; int _talkCount;
NamedObject2() { _v1 = _v2 = 0; } NamedObject2() { _talkCount = 0; }
virtual Common::String getClassName() { return "NamedObject2"; } virtual Common::String getClassName() { return "NamedObject2"; }
virtual void synchronize(Serializer &s) { virtual void synchronize(Serializer &s) {
NamedObject::synchronize(s); NamedObject::synchronize(s);
s.syncAsSint16LE(_v1); if (s.getVersion() < 11) {
s.syncAsSint16LE(_v2); int useless = 0;
s.syncAsSint16LE(useless);
}
s.syncAsSint16LE(_talkCount);
} }
}; };
@ -177,7 +180,6 @@ public:
class FocusObject: public NamedObject { class FocusObject: public NamedObject {
public: public:
int _v90, _v92;
GfxSurface _img; GfxSurface _img;
FocusObject(); FocusObject();
@ -202,8 +204,6 @@ public:
EventHandler *_focusObject; EventHandler *_focusObject;
Visage _cursorVisage; Visage _cursorVisage;
Rect _v51C34;
public: public:
SceneExt(); SceneExt();

16
engines/tsage/blue_force/blueforce_scenes3.cpp
View file

@ -4651,10 +4651,10 @@ bool Scene370::Green::startAction(CursorType action, Event &event) {
switch (action) { switch (action) {
case CURSOR_LOOK: case CURSOR_LOOK:
SceneItem::display2(370, (_v2 < 3) ? 10 : 0); SceneItem::display2(370, (_talkCount < 3) ? 10 : 0);
return true; return true;
case CURSOR_USE: case CURSOR_USE:
if (_v2 != 3) if (_talkCount != 3)
SceneItem::display2(370, 1); SceneItem::display2(370, 1);
else if (BF_INVENTORY.getObjectScene(INV_HANDCUFFS) == 1) else if (BF_INVENTORY.getObjectScene(INV_HANDCUFFS) == 1)
SceneItem::display2(370, 26); SceneItem::display2(370, 26);
@ -4670,14 +4670,14 @@ bool Scene370::Green::startAction(CursorType action, Event &event) {
return true; return true;
case CURSOR_TALK: case CURSOR_TALK:
BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.disableControl();
switch (_v2) { switch (_talkCount) {
case 0: case 0:
++_v2; ++_talkCount;
scene->_sceneMode = 3706; scene->_sceneMode = 3706;
scene->setAction(&scene->_sequenceManager, scene, 3706, NULL); scene->setAction(&scene->_sequenceManager, scene, 3706, NULL);
break; break;
case 1: case 1:
++_v2; ++_talkCount;
scene->_sceneMode = 3707; scene->_sceneMode = 3707;
scene->_object5.postInit(); scene->_object5.postInit();
@ -4689,7 +4689,7 @@ bool Scene370::Green::startAction(CursorType action, Event &event) {
scene->setAction(&scene->_sequenceManager, scene, 3707, &scene->_harrison, &scene->_object5, NULL); scene->setAction(&scene->_sequenceManager, scene, 3707, &scene->_harrison, &scene->_object5, NULL);
break; break;
case 2: case 2:
++_v2; ++_talkCount;
scene->_sceneMode = 3708; 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); &scene->_object5, &scene->_greensGun, NULL);
@ -4715,7 +4715,7 @@ bool Scene370::Green::startAction(CursorType action, Event &event) {
} }
return true; return true;
case INV_HANDCUFFS: case INV_HANDCUFFS:
if (_v2 != 3) if (_talkCount != 3)
SceneItem::display2(370, 2); SceneItem::display2(370, 2);
else { else {
T2_GLOBALS._uiElements.addScore(50); T2_GLOBALS._uiElements.addScore(50);
@ -4752,7 +4752,7 @@ bool Scene370::Harrison::startAction(CursorType action, Event &event) {
SceneItem::display2(370, 8); SceneItem::display2(370, 8);
return true; return true;
case CURSOR_TALK: case CURSOR_TALK:
if (scene->_green._v2 != 3) { if (scene->_green._talkCount != 3) {
scene->_sceneMode = 3; scene->_sceneMode = 3;
scene->_stripManager.start(3714, scene); scene->_stripManager.start(3714, scene);
} else if ((BF_INVENTORY.getObjectScene(INV_GREENS_KNIFE) == 1) || } else if ((BF_INVENTORY.getObjectScene(INV_GREENS_KNIFE) == 1) ||

2
engines/tsage/blue_force/blueforce_scenes7.cpp
View file

@ -148,7 +148,7 @@ void Scene710::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._sound1.fadeSound(14); BF_GLOBALS._sound1.fadeSound(14);
_soundExt1.fadeSound(48); _soundExt1.fadeSound(48);
_v51C34.set(40, 0, 280, 240);
BF_GLOBALS._player.postInit(); BF_GLOBALS._player.postInit();
BF_GLOBALS._player.hide(); BF_GLOBALS._player.hide();
BF_GLOBALS._player._moveDiff = Common::Point(4, 2); BF_GLOBALS._player._moveDiff = Common::Point(4, 2);

6
engines/tsage/core.cpp
View file

@ -1545,7 +1545,11 @@ void ScenePalette::synchronize(Serializer &s) {
s.syncAsSint32LE(_colors.foreground); s.syncAsSint32LE(_colors.foreground);
s.syncAsSint32LE(_colors.background); s.syncAsSint32LE(_colors.background);
s.syncAsSint32LE(_field412); if (s.getVersion() < 12) {
int useless = 0;
s.syncAsSint16LE(useless);
}
s.syncAsByte(_redColor); s.syncAsByte(_redColor);
s.syncAsByte(_greenColor); s.syncAsByte(_greenColor);
s.syncAsByte(_blueColor); s.syncAsByte(_blueColor);

2
engines/tsage/saveload.h
View file

@ -33,7 +33,7 @@ namespace TsAGE {
typedef void (*SaveNotifierFn)(bool postFlag); typedef void (*SaveNotifierFn)(bool postFlag);
#define TSAGE_SAVEGAME_VERSION 11 #define TSAGE_SAVEGAME_VERSION 12
class SavedObject; class SavedObject;