libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 09:56:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

TSAGE: Bugfixes for stool in Scene #7700

Browse Source
This commit is contained in:
Paul Gilbert 2011-04-30 19:46:40 +10:00
parent 712c3bc201
commit 6abcefb679
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/tsage/ringworld_scenes8.cpp
View File

@ -31,6 +31,12 @@
namespace tSage {
void NamedHotspotMult::synchronise(Serialiser &s) {
SceneHotspot::synchronise(s);
s.syncAsSint16LE(_useLineNum);
s.syncAsSint16LE(_lookLineNum);
}
/*--------------------------------------------------------------------------
* Scene 7000
*
@ -2049,10 +2055,10 @@ void Scene7700::Object8::doAction(int action) {
scene->_gfxButton.draw();
scene->_gfxButton._bounds.expandPanes();
_globals->_sceneItems.push_front(&scene->_object10);
_globals->_sceneItems.push_front(&scene->_sceneItem10);
_globals->_sceneItems.push_front(&scene->_object9);
_globals->_player._canWalk = false;
} else {
} else if (_globals->getFlag(78)) {
scene->_object15.postInit();
scene->_object15.setVisage(7701);
scene->_object15.setPosition(Common::Point(140, 165), 0);
@ -2068,11 +2074,13 @@ void Scene7700::Object8::doAction(int action) {
scene->_object19.setStrip(6);
scene->_object19.setPosition(Common::Point(140, 192), 0);
_globals->_sceneItems.push_front(&scene->_object10);
_globals->_sceneItems.push_front(&scene->_object8);
_globals->_sceneItems.push_front(&scene->_object9);
_globals->_sceneItems.push_front(&scene->_sceneItem10);
_globals->_sceneItems.push_front(&scene->_sceneHotspot8);
_globals->_sceneItems.push_front(&scene->_sceneHotspot9);
_globals->_events.setCursor(CURSOR_WALK);
_globals->_player._canWalk = false;
} else {
scene->setAction(&scene->_sequenceManager, scene, 7715, NULL);
}
} else {
SceneHotspot::doAction(action);
@ -2242,8 +2250,8 @@ void Scene7700::process(Event &event) {
if (contains<SceneItem *>(_globals->_sceneItems, &_sceneItem10)) {
if (_gfxButton.process(event)) {
_sceneItem10.remove();
_sceneHotspot15.remove();
_sceneHotspot9.remove();
_object15.remove();
_object9.remove();
if (_globals->_sceneObjects->contains(&_object10))
_object10.remove();
if (_globals->_sceneObjects->contains(&_object14))

1
engines/tsage/ringworld_scenes8.h
View File

@ -41,6 +41,7 @@ public:
NamedHotspotMult() : SceneHotspot() {}
virtual Common::String getClassName() { return "NamedHotspotMult"; }
virtual void synchronise(Serialiser &s);
};
class SceneObject7700 : public SceneObjectExt {