[Scummvm-cvs-logs] scummvm master -> b5ba7f058143c02cf991e9aa591292d8286b86e7
dreammaster
dreammaster at scummvm.org
Sat Sep 24 10:00:36 CEST 2011
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0e6e35b7c6 TSAGE: Fixed core engine display of background scene objects
d6097882b1 TSAGE: Fixed the yacht in Blue Force scene 350 to be in the background
b5ba7f0581 TSAGE: Fixed the priority of the Blue Force Driver speaker
Commit: 0e6e35b7c613bc35524bb31376ac090fcebd18d6
https://github.com/scummvm/scummvm/commit/0e6e35b7c613bc35524bb31376ac090fcebd18d6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-24T00:52:03-07:00
Commit Message:
TSAGE: Fixed core engine display of background scene objects
Changed paths:
engines/tsage/blue_force/blueforce_scenes0.h
engines/tsage/blue_force/blueforce_ui.cpp
engines/tsage/blue_force/blueforce_ui.h
engines/tsage/core.cpp
engines/tsage/core.h
engines/tsage/ringworld/ringworld_scenes10.cpp
engines/tsage/scenes.cpp
engines/tsage/scenes.h
diff --git a/engines/tsage/blue_force/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h
index f3fcbb9..06003e0 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.h
+++ b/engines/tsage/blue_force/blueforce_scenes0.h
@@ -159,7 +159,7 @@ public:
TicketBook _ticketBook;
CompartmentDoor _compartmentDoor;
SceneObject _dashboard;
- AltSceneObject _car;
+ BackgroundSceneObject _car;
NamedHotspot _item1;
Ignition _ignition;
Item3 _item3;
diff --git a/engines/tsage/blue_force/blueforce_ui.cpp b/engines/tsage/blue_force/blueforce_ui.cpp
index 89a7d85..15f4d99 100644
--- a/engines/tsage/blue_force/blueforce_ui.cpp
+++ b/engines/tsage/blue_force/blueforce_ui.cpp
@@ -38,7 +38,7 @@ void StripProxy::process(Event &event) {
/*--------------------------------------------------------------------------*/
void UIElement::synchronize(Serializer &s) {
- AltSceneObject::synchronize(s);
+ BackgroundSceneObject::synchronize(s);
s.syncAsSint16LE(_field88);
s.syncAsSint16LE(_enabled);
s.syncAsSint16LE(_frameNum);
diff --git a/engines/tsage/blue_force/blueforce_ui.h b/engines/tsage/blue_force/blueforce_ui.h
index d9c593b..29eb953 100644
--- a/engines/tsage/blue_force/blueforce_ui.h
+++ b/engines/tsage/blue_force/blueforce_ui.h
@@ -39,7 +39,7 @@ public:
virtual void process(Event &event);
};
-class UIElement: public AltSceneObject {
+class UIElement: public BackgroundSceneObject {
public:
int _field88;
bool _enabled;
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 733f270..f1542dc 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2528,17 +2528,18 @@ void SceneObject::setup(int visage, int stripFrameNum, int frameNum, int posX, i
/*--------------------------------------------------------------------------*/
-void AltSceneObject::postInit(SceneObjectList *OwnerList) {
- SceneObject::postInit(&_globals->_sceneManager._altSceneObjects);
+void BackgroundSceneObject::postInit(SceneObjectList *OwnerList) {
+ SceneObject::postInit(&_globals->_sceneManager._bgSceneObjects);
}
-void AltSceneObject::draw() {
+void BackgroundSceneObject::draw() {
+ assert(_globals->_sceneManager._scene);
Rect destRect = _bounds;
destRect.translate(-_globals->_sceneManager._scene->_sceneBounds.left,
-_globals->_sceneManager._scene->_sceneBounds.top);
Region *priorityRegion = _globals->_sceneManager._scene->_priorities.find(_priority);
GfxSurface frame = getFrame();
- _globals->_gfxManagerInstance.copyFrom(frame, destRect, priorityRegion);
+ _globals->_sceneManager._scene->_backSurface.copyFrom(frame, destRect, priorityRegion);
}
/*--------------------------------------------------------------------------*/
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 9bcf77b..4e219f6 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -606,9 +606,9 @@ public:
void setup(int visage, int stripFrameNum, int frameNum, int posX, int posY, int priority);
};
-class AltSceneObject: public SceneObject {
+class BackgroundSceneObject: public SceneObject {
public:
- virtual Common::String getClassName() { return "AltObjectExt"; }
+ virtual Common::String getClassName() { return "BackgroundSceneObject"; }
virtual void postInit(SceneObjectList *OwnerList = NULL);
virtual void draw();
};
diff --git a/engines/tsage/ringworld/ringworld_scenes10.cpp b/engines/tsage/ringworld/ringworld_scenes10.cpp
index 1d310c6..fdb0532 100644
--- a/engines/tsage/ringworld/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes10.cpp
@@ -37,7 +37,7 @@ Scene2::Scene2() : Scene() {
/*--------------------------------------------------------------------------*/
void Object9350::postInit(SceneObjectList *OwnerList) {
- //SceneObject::postInit(&_globals->_sceneManager._altSceneObjects);
+ //SceneObject::postInit(&_globals->_sceneManager._bgSceneObjects);
SceneObject::postInit(OwnerList);
}
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index d68f5c2..c2c35c4 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -81,7 +81,7 @@ void SceneManager::sceneChange() {
}
// Clear the secondary scene object list
- _altSceneObjects.clear();
+ _bgSceneObjects.clear();
// Clear the hotspot list
SynchronizedList<SceneItem *>::iterator ii = _globals->_sceneItems.begin();
@@ -234,7 +234,7 @@ void SceneManager::listenerSynchronize(Serializer &s) {
// in order for the savegame loading to work correctly
_globals->_sceneManager._scene = new Scene();
- _altSceneObjects.synchronize(s);
+ _bgSceneObjects.synchronize(s);
s.syncAsSint32LE(_sceneNumber);
s.syncAsUint16LE(_globals->_sceneManager._scene->_activeScreenNumber);
@@ -442,16 +442,16 @@ void Scene::refreshBackground(int xAmount, int yAmount) {
}
if (changedFlag) {
- drawAltObjects();
+ drawBackgroundObjects();
}
}
-void Scene::drawAltObjects() {
+void Scene::drawBackgroundObjects() {
Common::Array<SceneObject *> objList;
// Initial loop to set the priority for entries in the list
- for (SynchronizedList<SceneObject *>::iterator i = _globals->_sceneManager._altSceneObjects.begin();
- i != _globals->_sceneManager._altSceneObjects.end(); ++i) {
+ for (SynchronizedList<SceneObject *>::iterator i = _globals->_sceneManager._bgSceneObjects.begin();
+ i != _globals->_sceneManager._bgSceneObjects.end(); ++i) {
SceneObject *obj = *i;
objList.push_back(obj);
@@ -463,7 +463,7 @@ void Scene::drawAltObjects() {
}
// Sort the list by priority
- _globals->_sceneManager._altSceneObjects.sortList(objList);
+ _globals->_sceneManager._bgSceneObjects.sortList(objList);
// Drawing loop
for (uint objIndex = 0; objIndex < objList.size(); ++objIndex) {
diff --git a/engines/tsage/scenes.h b/engines/tsage/scenes.h
index b03b8fa..c0cdb9e 100644
--- a/engines/tsage/scenes.h
+++ b/engines/tsage/scenes.h
@@ -33,7 +33,7 @@ namespace TsAGE {
class Scene : public StripCallback {
private:
- void drawAltObjects();
+ void drawBackgroundObjects();
public:
int _field12;
int _screenNumber;
@@ -86,7 +86,7 @@ public:
Common::Point _sceneBgOffset;
int _sceneLoadCount;
Rect _scrollerRect;
- SceneObjectList _altSceneObjects;
+ SceneObjectList _bgSceneObjects;
int _objectCount;
public:
SceneManager();
Commit: d6097882b18ff174e0bc1c66f7055398acd8095d
https://github.com/scummvm/scummvm/commit/d6097882b18ff174e0bc1c66f7055398acd8095d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-24T00:52:33-07:00
Commit Message:
TSAGE: Fixed the yacht in Blue Force scene 350 to be in the background
Changed paths:
engines/tsage/blue_force/blueforce_scenes3.cpp
engines/tsage/blue_force/blueforce_scenes3.h
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 5bd62a9..69bfb11 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -2516,7 +2516,7 @@ bool Scene350::Yacht::startAction(CursorType action, Event &event) {
if ((BF_GLOBALS._dayNumber == 1) || (BF_GLOBALS._dayNumber == 4)) {
BF_GLOBALS._player.disableControl();
scene->_sceneMode = 1;
- scene->setAction(&scene->_sequenceManager1, scene, 3512, &BF_GLOBALS._player, &scene->_boat, NULL);
+ scene->setAction(&scene->_sequenceManager1, scene, 3512, &BF_GLOBALS._player, &scene->_yachtDoor, NULL);
return true;
}
} else {
@@ -2524,7 +2524,7 @@ bool Scene350::Yacht::startAction(CursorType action, Event &event) {
scene->_sceneMode = 1;
BF_GLOBALS._player.disableControl();
scene->setAction(&scene->_sequenceManager1, scene, BF_GLOBALS.getFlag(gunDrawn) ? 3504 : 3505,
- &BF_GLOBALS._player, &scene->_boat, NULL);
+ &BF_GLOBALS._player, &scene->_yachtDoor, NULL);
return true;
}
break;
@@ -2640,14 +2640,14 @@ void Scene350::postInit(SceneObjectList *OwnerList) {
if ((BF_GLOBALS._dayNumber != 1) && (BF_GLOBALS._dayNumber != 4)) {
_yacht.setDetails(28, 350, 15, 16, 17, 1);
} else {
- _boat.postInit();
- _boat.setVisage(350);
- _boat.setStrip(3);
- _boat.setFrame(1);
- _boat.fixPriority(72);
- _boat.setPosition(Common::Point(40, 74));
+ _yachtDoor.postInit();
+ _yachtDoor.setVisage(350);
+ _yachtDoor.setStrip(3);
+ _yachtDoor.setFrame(1);
+ _yachtDoor.fixPriority(72);
+ _yachtDoor.setPosition(Common::Point(40, 74));
- _yachtBody.setup(350, 1, 1, 129, 142, -1);
+ _yachtBody.setup(350, 1, 1, 129, 142, 255);
if (BF_GLOBALS.getFlag(fBackupIn350)) {
_harrison.postInit();
diff --git a/engines/tsage/blue_force/blueforce_scenes3.h b/engines/tsage/blue_force/blueforce_scenes3.h
index 2d3cc7a..e1b9c5f 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.h
+++ b/engines/tsage/blue_force/blueforce_scenes3.h
@@ -467,8 +467,8 @@ class Scene350: public SceneExt {
public:
SequenceManager _sequenceManager1, _sequenceManager2, _sequenceManager3;
NamedObject _harrison;
- SceneObject _boat;
- SceneObject _yachtBody;
+ SceneObject _yachtDoor;
+ BackgroundSceneObject _yachtBody;
Hook _hook;
Object5 _object5;
NamedHotspot _item1, _item2, _item3, _item4;
Commit: b5ba7f058143c02cf991e9aa591292d8286b86e7
https://github.com/scummvm/scummvm/commit/b5ba7f058143c02cf991e9aa591292d8286b86e7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-24T00:53:16-07:00
Commit Message:
TSAGE: Fixed the priority of the Blue Force Driver speaker
Changed paths:
engines/tsage/blue_force/blueforce_speakers.cpp
diff --git a/engines/tsage/blue_force/blueforce_speakers.cpp b/engines/tsage/blue_force/blueforce_speakers.cpp
index 66dd33c..1854e04 100644
--- a/engines/tsage/blue_force/blueforce_speakers.cpp
+++ b/engines/tsage/blue_force/blueforce_speakers.cpp
@@ -466,7 +466,7 @@ void SpeakerDriver::setText(const Common::String &msg) {
_object2.postInit();
_object2.setVisage(416);
_object2.setStrip2(1);
- _object2.fixPriority(-1);
+ _object2.fixPriority(255);
_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 263,
BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
@@ -495,7 +495,7 @@ void SpeakerShooter::setText(const Common::String &msg) {
_object2.postInit();
_object2.setVisage(418);
_object2.setStrip2(1);
- _object2.fixPriority(-1);
+ _object2.fixPriority(255);
_object2.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 268,
BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
More information about the Scummvm-git-logs
mailing list