[Scummvm-cvs-logs] scummvm master -> fa63d81aaf569245ec1f140c5dc203593ffbd642
dreammaster
dreammaster at scummvm.org
Tue Sep 13 12:55:39 CEST 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b961a7a57d TSAGE: Further UI visibility fixes for Scene 50 (Map)
fa63d81aaf TSAGE: Bugfix for correctly displaying radio conversation dialog
Commit: b961a7a57d950a6a4f1e3cc006d8fa595fdf9672
https://github.com/scummvm/scummvm/commit/b961a7a57d950a6a4f1e3cc006d8fa595fdf9672
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-13T03:49:37-07:00
Commit Message:
TSAGE: Further UI visibility fixes for Scene 50 (Map)
Changed paths:
engines/tsage/blue_force/blueforce_scenes0.cpp
engines/tsage/blue_force/blueforce_scenes0.h
engines/tsage/globals.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 351301f..28a5f05 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -331,6 +331,7 @@ void Scene50::postInit(SceneObjectList *OwnerList) {
SceneExt::postInit();
BF_GLOBALS._interfaceY = 200;
+ BF_GLOBALS._uiElements._active = false;
BF_GLOBALS._player.postInit();
BF_GLOBALS._player.setVisage(830);
BF_GLOBALS._player.setStrip(3);
@@ -505,7 +506,7 @@ void Scene50::process(Event &event) {
*
*--------------------------------------------------------------------------*/
-bool Scene60::Item2::startAction(CursorType action, Event &event) {
+bool Scene60::Ignition::startAction(CursorType action, Event &event) {
Scene60 *scene = (Scene60 *)BF_GLOBALS._sceneManager._scene;
switch (action) {
case CURSOR_LOOK:
@@ -532,7 +533,7 @@ bool Scene60::Item2::startAction(CursorType action, Event &event) {
return true;
}
-bool Scene60::Item2::check1() {
+bool Scene60::Ignition::check1() {
if (BF_GLOBALS._bookmark >= bStoppedFrankie) {
BF_GLOBALS._v5098C |= 1;
return false;
@@ -581,7 +582,7 @@ bool Scene60::Item2::check1() {
return false;
}
-bool Scene60::Item2::check2() {
+bool Scene60::Ignition::check2() {
switch (BF_GLOBALS._bookmark) {
case bInspectionDone:
if (BF_GLOBALS._v5098D & 1) {
@@ -1013,13 +1014,13 @@ void Scene60::postInit(SceneObjectList *OwnerList) {
if (BF_GLOBALS.getFlag(fWithLyle)) {
_visage = 62;
- _item2._sceneRegionId = 22;
+ _ignition._sceneRegionId = 22;
} else if (BF_GLOBALS.getFlag(onDuty)) {
_visage = 63;
- _item2._sceneRegionId = 20;
+ _ignition._sceneRegionId = 20;
} else {
_visage = 61;
- _item2._sceneRegionId = 28;
+ _ignition._sceneRegionId = 28;
}
_dashboard.setup(_visage, 1, 1, 160, 168, 100);
_cursorId = CURSOR_USE;
@@ -1073,7 +1074,7 @@ void Scene60::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._sceneItems.push_back(&_compartment);
}
- BF_GLOBALS._sceneItems.push_back(&_item2);
+ BF_GLOBALS._sceneItems.push_back(&_ignition);
BF_GLOBALS._sceneItems.push_back(&_item3);
BF_GLOBALS._player.enableControl();
BF_GLOBALS._events.setCursor(CURSOR_USE);
diff --git a/engines/tsage/blue_force/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h
index 01b7db5..9c401f3 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.h
+++ b/engines/tsage/blue_force/blueforce_scenes0.h
@@ -99,7 +99,7 @@ public:
class Scene60 : public SceneExt {
/* Items */
- class Item2: public NamedHotspot {
+ class Ignition: public NamedHotspot {
private:
bool check1();
bool check2();
@@ -161,7 +161,7 @@ public:
SceneObject _dashboard;
AltSceneObject _car;
NamedHotspot _item1;
- Item2 _item2;
+ Ignition _ignition;
Item3 _item3;
Radio _radio;
Compartment _compartment;
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 75af19d..185c341 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -198,6 +198,8 @@ void BlueForceGlobals::synchronize(Serializer &s) {
s.syncAsSint16LE(_v4E238);
s.syncAsSint16LE(_v501FC);
s.syncAsSint16LE(_v50696);
+ s.syncAsSint16LE(_v5098C);
+ s.syncAsSint16LE(_v5098D);
s.syncAsSint16LE(_v51C42);
s.syncAsSint16LE(_v51C44);
s.syncAsSint16LE(_interfaceY);
@@ -225,17 +227,17 @@ void BlueForceGlobals::reset() {
_driveToScene = 0;
_interfaceY = BF_INTERFACE_Y;
- _v51C44 = 1;
_dayNumber = 0;
_v4CEA4 = 0;
_deathReason = 0;
_v4CF9E = 0;
_v4E238 = 0;
- _v50696 = 0;
_v501FC = 0;
+ _v50696 = 0;
_v5098C = 0;
_v5098D = 0;
_v51C42 = 0;
+ _v51C44 = 1;
_clip1Bullets = 8;
_clip2Bullets = 8;
}
Commit: fa63d81aaf569245ec1f140c5dc203593ffbd642
https://github.com/scummvm/scummvm/commit/fa63d81aaf569245ec1f140c5dc203593ffbd642
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-13T03:50:04-07:00
Commit Message:
TSAGE: Bugfix for correctly displaying radio conversation dialog
Changed paths:
engines/tsage/blue_force/blueforce_dialogs.cpp
engines/tsage/blue_force/blueforce_dialogs.h
diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp
index e074f88..1ef223a 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.cpp
+++ b/engines/tsage/blue_force/blueforce_dialogs.cpp
@@ -367,7 +367,7 @@ void AmmoBeltDialog::draw() {
/*--------------------------------------------------------------------------*/
-RadioConvDialog::RadioConvDialog() : ModalDialog() {
+RadioConvDialog::RadioConvDialog() : GfxDialog() {
int idx;
// Set up the list of buttons
@@ -400,7 +400,7 @@ RadioConvDialog::~RadioConvDialog() {
}
int RadioConvDialog::execute() {
- GfxButton *btn = ModalDialog::execute();
+ GfxButton *btn = GfxDialog::execute();
// Get which button was pressed
int btnIndex = -1;
diff --git a/engines/tsage/blue_force/blueforce_dialogs.h b/engines/tsage/blue_force/blueforce_dialogs.h
index e9ce29c..ca51c97 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.h
+++ b/engines/tsage/blue_force/blueforce_dialogs.h
@@ -74,7 +74,7 @@ public:
void execute();
};
-class RadioConvDialog : public ModalDialog {
+class RadioConvDialog : public GfxDialog {
private:
GfxButton _buttons[8];
public:
More information about the Scummvm-git-logs
mailing list