[Scummvm-cvs-logs] scummvm master -> ee2122f9c81a500557ffeb745a0014c0d6d5daad
dreammaster
dreammaster at scummvm.org
Wed Oct 5 12:37:20 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:
fcf9dab0da TSAGE: Fix debugger hotspots command not to crash for objects with no defined area
b6d341324b TSAGE: Cleanup of Blue Force scene 270
ee2122f9c8 TSAGE: Bugfixes for opening bank safe in Blue Force scene 560
Commit: fcf9dab0da8d5dcb852ca47dad44a8a984603035
https://github.com/scummvm/scummvm/commit/fcf9dab0da8d5dcb852ca47dad44a8a984603035
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-05T03:28:30-07:00
Commit Message:
TSAGE: Fix debugger hotspots command not to crash for objects with no defined area
Changed paths:
engines/tsage/debugger.cpp
diff --git a/engines/tsage/debugger.cpp b/engines/tsage/debugger.cpp
index 7d4a42e..a0e8b9e 100644
--- a/engines/tsage/debugger.cpp
+++ b/engines/tsage/debugger.cpp
@@ -457,8 +457,9 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) {
// Draw the contents of the hotspot area
if (o->_sceneRegionId == 0) {
// Scene item doesn't use a region, so fill in the entire area
- destSurface.fillRect(Rect(o->_bounds.left - sceneBounds.left, o->_bounds.top - sceneBounds.top,
- o->_bounds.right - sceneBounds.left - 1, o->_bounds.bottom - sceneBounds.top - 1), colIndex);
+ if ((o->_bounds.right > o->_bounds.left) && (o->_bounds.bottom > o->_bounds.top))
+ destSurface.fillRect(Rect(o->_bounds.left - sceneBounds.left, o->_bounds.top - sceneBounds.top,
+ o->_bounds.right - sceneBounds.left - 1, o->_bounds.bottom - sceneBounds.top - 1), colIndex);
} else {
// Scene uses a region, so get it and use it to fill out only the correct parts
SceneRegions::iterator ri = g_globals->_sceneRegions.begin();
Commit: b6d341324ba95f7c862b7d6c0170fe212aabad81
https://github.com/scummvm/scummvm/commit/b6d341324ba95f7c862b7d6c0170fe212aabad81
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-05T03:28:31-07:00
Commit Message:
TSAGE: Cleanup of Blue Force scene 270
Changed paths:
engines/tsage/blue_force/blueforce_logic.cpp
engines/tsage/blue_force/blueforce_scenes2.cpp
engines/tsage/blue_force/blueforce_scenes2.h
diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 53205aa..b76ec83 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -95,7 +95,7 @@ Scene *BlueForceGame::createScene(int sceneNumber) {
// Graduation Article
return new Scene265();
case 270:
- // Grandma's Living Room
+ // Living Room & Kitchen
return new Scene270();
case 271:
case 280:
diff --git a/engines/tsage/blue_force/blueforce_scenes2.cpp b/engines/tsage/blue_force/blueforce_scenes2.cpp
index 2b326f2..5f36945 100644
--- a/engines/tsage/blue_force/blueforce_scenes2.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes2.cpp
@@ -758,19 +758,19 @@ void Scene265::remove() {
}
/*--------------------------------------------------------------------------
- * Scene 270 - Grandma's Living Room
+ * Scene 270 - Living Room & Kitchen
*
*--------------------------------------------------------------------------*/
void Scene270::Action1::signal() {
Scene270 *scene = (Scene270 *)BF_GLOBALS._sceneManager._scene;
- scene->setAction(&scene->_sequenceManager2, this, 2703, &scene->_object6, NULL);
+ scene->setAction(&scene->_sequenceManager2, this, 2703, &scene->_tv, NULL);
}
/*--------------------------------------------------------------------------*/
-bool Scene270::Object8::startAction(CursorType action, Event &event) {
+bool Scene270::Lyle::startAction(CursorType action, Event &event) {
Scene270 *scene = (Scene270 *)BF_GLOBALS._sceneManager._scene;
switch (action) {
@@ -912,7 +912,7 @@ void Scene270::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._sound1.fadeSound(26);
_exit.setDetails(Rect(310, 115, 320, 167), 270, -1, -1, -1, 1, NULL);
-
+
if (BF_GLOBALS._dayNumber == 0) {
BF_GLOBALS._dayNumber = 1;
BF_INVENTORY.setObjectScene(INV_BASEBALL_CARD, 2);
@@ -920,9 +920,10 @@ void Scene270::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._sceneManager._previousScene = 710;
}
- if ((BF_GLOBALS._bookmark >= bLauraToParamedics) && (BF_GLOBALS._dayNumber == 1) &&
- (BF_INVENTORY.getObjectScene(INV_BASEBALL_CARD) != 2) &&
- (BF_INVENTORY.getObjectScene(INV_BASEBALL_CARD) != 1)) {
+ if (((BF_GLOBALS._bookmark >= bLauraToParamedics) && (BF_GLOBALS._dayNumber == 1) &&
+ (BF_INVENTORY.getObjectScene(INV_BASEBALL_CARD) != 2) &&
+ (BF_INVENTORY.getObjectScene(INV_BASEBALL_CARD) != 1)) ||
+ ((BF_GLOBALS._dayNumber == 3) && BF_GLOBALS.getFlag(fGotGreen355fTalkedToGrannyDay3))) {
BF_GLOBALS._walkRegions.proc1(6);
BF_GLOBALS._walkRegions.proc1(14);
BF_GLOBALS._walkRegions.proc1(19);
@@ -940,9 +941,9 @@ void Scene270::postInit(SceneObjectList *OwnerList) {
}
if (BF_GLOBALS._sceneManager._previousScene == 710) {
- _object5.postInit();
- _object4.postInit();
- _object8.postInit();
+ _skip.postInit();
+ _laura.postInit();
+ _lyle.postInit();
_grandma.postInit();
}
@@ -953,28 +954,28 @@ void Scene270::postInit(SceneObjectList *OwnerList) {
_stripManager.addSpeaker(&_lauraSpeaker);
_stripManager.addSpeaker(&_gameTextSpeaker);
- _object6.postInit();
- _object6.setVisage(270);
- _object6.setPosition(Common::Point(264, 74));
- _object6.setStrip(5);
- _object6.fixPriority(132);
- _object6._numFrames = 3;
- _object6.setAction(&_action1);
-
- _object7.postInit();
- _object7.setVisage(270);
- _object7.setStrip(2);
- _object7.setPosition(Common::Point(302, 121));
- _object7.fixPriority(132);
- _object7.animate(ANIM_MODE_2, NULL);
-
- _item6.setDetails(Rect(0, 56, 56, 130), 270, 9, 10, 11, 1, NULL);
+ _tv.postInit();
+ _tv.setVisage(270);
+ _tv.setPosition(Common::Point(264, 74));
+ _tv.setStrip(5);
+ _tv.fixPriority(132);
+ _tv._numFrames = 3;
+ _tv.setAction(&_action1);
+
+ _fireplace.postInit();
+ _fireplace.setVisage(270);
+ _fireplace.setStrip(2);
+ _fireplace.setPosition(Common::Point(302, 121));
+ _fireplace.fixPriority(132);
+ _fireplace.animate(ANIM_MODE_2, NULL);
+
+ _fridge.setDetails(Rect(0, 56, 56, 130), 270, 9, 10, 11, 1, NULL);
_object3.setDetails(270, 12, 13, 14, 1, NULL);
- _object4.setDetails(270, 15, -1, -1, 1, NULL);
- _object5.setDetails(270, 14, -1, -1, 1, NULL);
- _object8.setDetails(270, 34, 35, 36, 1, NULL);
- _object6.setDetails(270, 3, 4, 5, 1, NULL);
- _object7.setDetails(270, 6, 7, 8, 1, NULL);
+ _laura.setDetails(270, 15, -1, -1, 1, NULL);
+ _skip.setDetails(270, 14, -1, -1, 1, NULL);
+ _lyle.setDetails(270, 34, 35, 36, 1, NULL);
+ _tv.setDetails(270, 3, 4, 5, 1, NULL);
+ _fireplace.setDetails(270, 6, 7, 8, 1, NULL);
if ((BF_GLOBALS._sceneManager._previousScene == 710) && (BF_GLOBALS._bookmark == bTalkedToGrannyAboutSkipsCard)) {
_grandma.setDetails(270, 15, 16, 17, 1, NULL);
@@ -982,12 +983,12 @@ void Scene270::postInit(SceneObjectList *OwnerList) {
_grandma.setDetails(270, 40, 16, 17, 1, NULL);
}
- _item4.setDetails(4, 270, 27, 28, 29, 1);
- _item1.setDetails(1, 270, 18, 19, 20, 1);
- _item7.setDetails(Rect(278, 50, 318, 72), 270, 21, 22, 23, 1, NULL);
- _item3.setDetails(3, 270, 24, 25, 26, 1);
- _item5.setDetails(2, 270, 30, 31, 32, 1);
- _item12.setDetails(Rect(0, 0, 320, 168), 270, 0, 1, 2, 1, NULL);
+ _afgan.setDetails(4, 270, 27, 28, 29, 1);
+ _couch.setDetails(1, 270, 18, 19, 20, 1);
+ _photos.setDetails(Rect(278, 50, 318, 72), 270, 21, 22, 23, 1, NULL);
+ _appliances.setDetails(3, 270, 24, 25, 26, 1);
+ _ivy.setDetails(2, 270, 30, 31, 32, 1);
+ _background.setDetails(Rect(0, 0, 320, 168), 270, 0, 1, 2, 1, NULL);
BF_GLOBALS._player.postInit();
BF_GLOBALS._player._moveDiff.x = 8;
@@ -1017,7 +1018,7 @@ void Scene270::postInit(SceneObjectList *OwnerList) {
case 710:
BF_GLOBALS._player._moveDiff.x = 6;
_sceneMode = 2717;
- setAction(&_sequenceManager1, this, 2717, &BF_GLOBALS._player, &_object4, &_object5, &_object8, &_grandma, NULL);
+ setAction(&_sequenceManager1, this, 2717, &BF_GLOBALS._player, &_laura, &_skip, &_lyle, &_grandma, NULL);
break;
default:
_sceneMode = 2701;
@@ -1123,9 +1124,9 @@ void Scene270::signal() {
break;
case 2717:
_sceneMode = 2718;
- _object8.setFrame2(-1);
- setAction(&_sequenceManager1, this, 2718, &BF_GLOBALS._player, &_object4, &_object5,
- &_object8, &_grandma, NULL);
+ _lyle.setFrame2(-1);
+ setAction(&_sequenceManager1, this, 2718, &BF_GLOBALS._player, &_laura, &_skip,
+ &_lyle, &_grandma, NULL);
break;
case 2718:
BF_GLOBALS._walkRegions.proc1(6);
@@ -1148,8 +1149,8 @@ void Scene270::signal() {
_field384 = 0;
BF_GLOBALS._player._moveDiff.x = 6;
- _object8.setFrame2(-1);
- setAction(&_sequenceManager1, this, 2719, &BF_GLOBALS._player, &_object8, &_grandma, NULL);
+ _lyle.setFrame2(-1);
+ setAction(&_sequenceManager1, this, 2719, &BF_GLOBALS._player, &_lyle, &_grandma, NULL);
break;
default:
break;
@@ -1184,16 +1185,16 @@ void Scene270::process(Event &event) {
void Scene270::dispatch() {
if (_field384) {
- _object8.updateAngle(BF_GLOBALS._player._position);
-
- if (_object8._angle < 110)
- _object8.setFrame2(4);
- else if (_object8._angle < 180)
- _object8.setFrame2(3);
- else if (_object8._angle < 250)
- _object8.setFrame2(2);
+ _lyle.updateAngle(BF_GLOBALS._player._position);
+
+ if (_lyle._angle < 110)
+ _lyle.setFrame2(4);
+ else if (_lyle._angle < 180)
+ _lyle.setFrame2(3);
+ else if (_lyle._angle < 250)
+ _lyle.setFrame2(2);
else
- _object8.setFrame2(1);
+ _lyle.setFrame2(1);
}
if (_field386) {
@@ -1216,8 +1217,8 @@ void Scene270::dispatch() {
}
}
- if (!_action && !_field219A) {
- if ((BF_GLOBALS._player._position.x < 236) && (BF_GLOBALS._player._position.y < 125)) {
+ if (!_action && _field219A) {
+ if ((BF_GLOBALS._player._position.x > 236) && (BF_GLOBALS._player._position.y < 125)) {
_field219A = 0;
BF_GLOBALS._player.disableControl();
if (!_field384) {
diff --git a/engines/tsage/blue_force/blueforce_scenes2.h b/engines/tsage/blue_force/blueforce_scenes2.h
index 8970b59..75695d4 100644
--- a/engines/tsage/blue_force/blueforce_scenes2.h
+++ b/engines/tsage/blue_force/blueforce_scenes2.h
@@ -174,7 +174,7 @@ class Scene270: public SceneExt {
};
/* Objects */
- class Object8: public NamedObject {
+ class Lyle: public NamedObject {
public:
virtual bool startAction(CursorType action, Event &event);
};
@@ -201,15 +201,14 @@ public:
SpeakerSkip _skipSpeaker;
SpeakerGameText _gameTextSpeaker;
Action1 _action1;
- NamedObject _object1, _object2, _object3, _object4;
- NamedObject _object5, _object6, _object7;
- Object8 _object8;
+ NamedObject _object1, _object2, _object3, _laura;
+ NamedObject _skip, _tv, _fireplace;
+ Lyle _lyle;
Grandma _grandma;
- Item _item1;
- NamedHotspot _item2, _item3;
- Item _item4;
- NamedHotspot _item5, _item6, _item7, _item8, _item9;
- NamedHotspot _item10, _item11, _item12;
+ Item _couch, _afgan;
+ NamedHotspot _appliances;
+ NamedHotspot _ivy, _fridge, _photos, _item8, _item9;
+ NamedHotspot _item10, _item11, _background;
Exit _exit;
int _field380, _field382, _field384, _field386;
int _field219A, _field21A0;
Commit: ee2122f9c81a500557ffeb745a0014c0d6d5daad
https://github.com/scummvm/scummvm/commit/ee2122f9c81a500557ffeb745a0014c0d6d5daad
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-05T03:28:31-07:00
Commit Message:
TSAGE: Bugfixes for opening bank safe in Blue Force scene 560
Changed paths:
engines/tsage/blue_force/blueforce_scenes5.cpp
engines/tsage/blue_force/blueforce_scenes5.h
diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp
index 491c97f..a1c1528 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes5.cpp
@@ -1030,7 +1030,7 @@ bool Scene560::DeskChair::startAction(CursorType action, Event &event) {
}
}
-bool Scene560::Object2::startAction(CursorType action, Event &event) {
+bool Scene560::Box::startAction(CursorType action, Event &event) {
Scene560 *scene = (Scene560 *)BF_GLOBALS._sceneManager._scene;
switch (action) {
@@ -1038,7 +1038,10 @@ bool Scene560::Object2::startAction(CursorType action, Event &event) {
if (scene->_field380) {
SceneItem::display2(560, 54);
} else {
- ADD_PLAYER_MOVER(289, 108);
+ scene->_sceneMode = 9;
+ Common::Point destPos(289, 108);
+ PlayerMover *mover = new PlayerMover();
+ BF_GLOBALS._player.addMover(mover, &destPos, scene);
}
return true;
default:
@@ -1146,7 +1149,7 @@ void Scene560::SafeInset::remove() {
scene->_nickel.remove();
if (BF_GLOBALS._events.getCursor() == CURSOR_USE) {
- GfxSurface cursor = surfaceFromRes(1, 1, 2);
+ GfxSurface cursor = _cursorVisage.getFrame(2);
BF_GLOBALS._events.setCursor(cursor);
}
@@ -1176,7 +1179,8 @@ void Scene560::SafeInset::signal() {
BF_GLOBALS.setFlag(fGotPointsForBank);
}
- GfxSurface cursor = surfaceFromRes(1, 1, 2);
+ setFrame(2);
+ GfxSurface cursor = _cursorVisage.getFrame(2);
BF_GLOBALS._events.setCursor(cursor);
_item1.remove();
@@ -1205,11 +1209,14 @@ void Scene560::SafeInset::signal() {
}
void Scene560::SafeInset::process(Event &event) {
if (_bounds.contains(event.mousePos)) {
- if (BF_GLOBALS._events.getCursor() == CURSOR_USE) {
+ CursorType cursorId = BF_GLOBALS._events.getCursor();
+ if (cursorId == CURSOR_USE) {
+ // Instead of standard cursor, use special hand cursor
GfxSurface cursor = _cursorVisage.getFrame(6);
BF_GLOBALS._events.setCursor(cursor);
} else {
- BF_GLOBALS._events.proc1();
+ // Set cursor again just in case Exit cursor was showing
+ BF_GLOBALS._events.setCursor(cursorId);
}
if ((event.eventType == EVENT_BUTTON_DOWN) && (BF_GLOBALS._events.getCursor() == CURSOR_WALK) &&
@@ -1235,7 +1242,7 @@ bool Scene560::SafeInset::Item::startAction(CursorType action, Event &event) {
switch (action) {
case CURSOR_USE:
switch (_flag) {
- case 0: {
+ case 1: {
int newFrame = scene->_safeInset._digit2._frame + 1;
if (newFrame == 11)
newFrame = 1;
@@ -1243,7 +1250,7 @@ bool Scene560::SafeInset::Item::startAction(CursorType action, Event &event) {
scene->_safeInset._digit2.setFrame(newFrame);
break;
}
- case 1: {
+ case 2: {
int newFrame = scene->_safeInset._digit1._frame + 1;
if (newFrame == 11)
newFrame = 1;
@@ -1251,7 +1258,7 @@ bool Scene560::SafeInset::Item::startAction(CursorType action, Event &event) {
scene->_safeInset._digit1.setFrame(newFrame);
break;
}
- case 2: {
+ case 3: {
int newFrame = scene->_safeInset._digit0._frame + 1;
if (newFrame == 11)
newFrame = 1;
@@ -1259,7 +1266,7 @@ bool Scene560::SafeInset::Item::startAction(CursorType action, Event &event) {
scene->_safeInset._digit0.setFrame(newFrame);
break;
}
- case 3: {
+ case 4: {
int newFrame = scene->_safeInset._digit2._frame - 1;
if (newFrame == 0)
newFrame = 10;
@@ -1267,7 +1274,7 @@ bool Scene560::SafeInset::Item::startAction(CursorType action, Event &event) {
scene->_safeInset._digit2.setFrame(newFrame);
break;
}
- case 4: {
+ case 5: {
int newFrame = scene->_safeInset._digit1._frame - 1;
if (newFrame == 0)
newFrame = 10;
@@ -1275,7 +1282,7 @@ bool Scene560::SafeInset::Item::startAction(CursorType action, Event &event) {
scene->_safeInset._digit1.setFrame(newFrame);
break;
}
- case 5: {
+ case 6: {
int newFrame = scene->_safeInset._digit0._frame - 1;
if (newFrame == 0)
newFrame = 10;
@@ -1306,14 +1313,14 @@ bool Scene560::Nickel::startAction(CursorType action, Event &event) {
}
}
-void Scene560::Object5::postInit(SceneObjectList *OwnerList) {
+void Scene560::BoxInset::postInit(SceneObjectList *OwnerList) {
FocusObject::postInit();
_item1.setDetails(Rect(110, 48, 189, 102), 560, 43, 44, -1, 1, NULL);
BF_GLOBALS._sceneItems.remove(&_item1);
BF_GLOBALS._sceneItems.push_front(&_item1);
}
-void Scene560::Object5::remove() {
+void Scene560::BoxInset::remove() {
Scene560 *scene = (Scene560 *)BF_GLOBALS._sceneManager._scene;
if (scene->_sceneMode != 3)
@@ -1323,7 +1330,7 @@ void Scene560::Object5::remove() {
FocusObject::remove();
}
-bool Scene560::Object5::Item1::startAction(CursorType action, Event &event) {
+bool Scene560::BoxInset::Item1::startAction(CursorType action, Event &event) {
Scene560 *scene = (Scene560 *)BF_GLOBALS._sceneManager._scene;
if (action == CURSOR_USE) {
@@ -1340,7 +1347,7 @@ bool Scene560::Object5::Item1::startAction(CursorType action, Event &event) {
scene->_safeInset.setDetails(560, 45, 46, -1);
scene->_sceneMode = 3;
- scene->_object5.remove();
+ scene->_boxInset.remove();
GfxSurface cursor = surfaceFromRes(1, 5, 6);
BF_GLOBALS._events.setCursor(cursor);
@@ -1393,12 +1400,12 @@ void Scene560::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._dayNumber = 3;
if (BF_GLOBALS._bookmark >= bTalkedToGrannyAboutSkipsCard) {
- _object2.postInit();
- _object2.setVisage(560);
- _object2.setStrip(4);
- _object2.setFrame(1);
- _object2.setPosition(Common::Point(295, 37));
- _object2.setDetails(560, 41, 42, -1, 1, NULL);
+ _box.postInit();
+ _box.setVisage(560);
+ _box.setStrip(4);
+ _box.setFrame(1);
+ _box.setPosition(Common::Point(295, 37));
+ _box.setDetails(560, 41, 42, -1, 1, NULL);
}
_deskChair.postInit();
@@ -1489,6 +1496,7 @@ void Scene560::signal() {
_sceneMode = 1;
break;
case 9:
+ // Clicked on the Baseball Cards Box
_object6._strip = 4;
_object6._frame = 1;
@@ -1509,13 +1517,13 @@ void Scene560::signal() {
BF_GLOBALS.setFlag(fGotPointsForPunch);
}
- _object5.postInit();
- _object5.setVisage(560);
- _object5.setStrip(2);
- _object5.setFrame(4);
- _object5.setPosition(Common::Point(160, 141));
- _object5.fixPriority(251);
- _object5.setDetails(560, 43, 44, -1);
+ _boxInset.postInit();
+ _boxInset.setVisage(560);
+ _boxInset.setStrip(2);
+ _boxInset.setFrame(4);
+ _boxInset.setPosition(Common::Point(160, 141));
+ _boxInset.fixPriority(251);
+ _boxInset.setDetails(560, 43, 44, -1);
_sceneMode = 4;
}
diff --git a/engines/tsage/blue_force/blueforce_scenes5.h b/engines/tsage/blue_force/blueforce_scenes5.h
index d198e1b..8ff5b40 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.h
+++ b/engines/tsage/blue_force/blueforce_scenes5.h
@@ -147,7 +147,7 @@ class Scene560: public SceneExt {
public:
virtual bool startAction(CursorType action, Event &event);
};
- class Object2: public NamedObjectExt {
+ class Box: public NamedObjectExt {
public:
virtual bool startAction(CursorType action, Event &event);
};
@@ -172,7 +172,7 @@ class Scene560: public SceneExt {
public:
virtual bool startAction(CursorType action, Event &event);
};
- class Object5: public FocusObject {
+ class BoxInset: public FocusObject {
/* Items */
class Item1: public NamedHotspot {
public:
@@ -181,7 +181,7 @@ class Scene560: public SceneExt {
public:
Item1 _item1;
- virtual Common::String getClassName() { return "Scene560_Object5"; }
+ virtual Common::String getClassName() { return "Scene560_BoxInset"; }
virtual void postInit(SceneObjectList *OwnerList = NULL);
virtual void remove();
};
@@ -189,7 +189,7 @@ class Scene560: public SceneExt {
/* Item groups */
class PicturePart: public NamedHotspotExt {
public:
- virtual Common::String getClassName() { return "Scene560_Group1"; }
+ virtual Common::String getClassName() { return "Scene560_PicturePart"; }
virtual bool startAction(CursorType action, Event &event);
};
@@ -218,10 +218,10 @@ public:
Action3 _action3;
SpeakerGameText _gameTextSpeaker;
DeskChair _deskChair;
- Object2 _object2;
+ Box _box;
SafeInset _safeInset;
Nickel _nickel;
- Object5 _object5;
+ BoxInset _boxInset;
NamedObject _object6;
PicturePart _picture1, _picture2, _picture3, _picture4;
Computer _computer;
More information about the Scummvm-git-logs
mailing list