TSAGE: Fix similar issue in scene 2150

This commit is contained in:
strangerke 2011-05-28 08:13:51 +02:00
parent 1bd2f50dee
commit e213ecc74f

View File

@ -1530,15 +1530,15 @@ void Scene2100::Object3::doAction(int action) {
/*--------------------------------------------------------------------------*/
Scene2100::Scene2100() :
_hotspot1(0, CURSOR_LOOK, 2100, 2, LIST_END),
_hotspot5(0, CURSOR_LOOK, 2100, 9, LIST_END),
_hotspot6(0, CURSOR_LOOK, 2100, 7, CURSOR_USE, 2100, 8, LIST_END),
_hotspot7(0, CURSOR_LOOK, 2100, 7, CURSOR_USE, 2100, 11, LIST_END),
_hotspot9(0, CURSOR_LOOK, 2100, 14, LIST_END),
_hotspot11(0, CURSOR_LOOK, 2100, 15, CURSOR_USE, 2100, 16, LIST_END),
_hotspot12(0, CURSOR_LOOK, 2100, 24, CURSOR_USE, 2100, 25, LIST_END),
_hotspot13(0, CURSOR_LOOK, 2100, 17, LIST_END),
_hotspot15(0, CURSOR_LOOK, 2100, 22, CURSOR_USE, 2100, 23, LIST_END) {
_hotspot1(0, CURSOR_LOOK, 2100, 2, LIST_END),
_hotspot5(0, CURSOR_LOOK, 2100, 9, LIST_END),
_hotspot6(0, CURSOR_LOOK, 2100, 7, CURSOR_USE, 2100, 8, LIST_END),
_hotspot7(0, CURSOR_LOOK, 2100, 7, CURSOR_USE, 2100, 11, LIST_END),
_hotspot9(0, CURSOR_LOOK, 2100, 14, LIST_END),
_hotspot11(0, CURSOR_LOOK, 2100, 15, CURSOR_USE, 2100, 16, LIST_END),
_hotspot12(0, CURSOR_LOOK, 2100, 24, CURSOR_USE, 2100, 25, LIST_END),
_hotspot13(0, CURSOR_LOOK, 2100, 17, LIST_END),
_hotspot15(0, CURSOR_LOOK, 2100, 22, CURSOR_USE, 2100, 23, LIST_END) {
_area1.setup(2153, 2, 1, 2100);
_area1._pt = Common::Point(200, 31);
_area2.setup(2153, 3, 1, 2150);
@ -2484,6 +2484,15 @@ Scene2150::Scene2150() :
_hotspot11(0, CURSOR_LOOK, 2150, 12, LIST_END) {
_rect1 = Rect(260, 70, 270, 77);
_rect2 = Rect(222, 142, 252, 150);
_area1.setup(2153, 2, 1, 2100);
_area1._pt = Common::Point(200, 31);
_area2.setup(2153, 3, 1, 2150);
_area2._pt = Common::Point(200, 50);
_area3.setup(2153, 4, 1, 2320);
_area3._pt = Common::Point(200, 75);
_area4.setup(2153, 1, 1, 10);
_area4._pt = Common::Point(237, 77);
}
void Scene2150::postInit(SceneObjectList *OwnerList) {
@ -2549,15 +2558,6 @@ void Scene2150::postInit(SceneObjectList *OwnerList) {
_globals->_sceneItems.addItems(&_hotspot1, &_hotspot2, &_hotspot3, &_hotspot4, &_hotspot5,
&_hotspot6, &_hotspot7, &_hotspot10, &_hotspot9, &_hotspot11, &_hotspot8, NULL);
_area1.setup(2153, 2, 1, 2100);
_area1._pt = Common::Point(200, 31);
_area2.setup(2153, 3, 1, 2150);
_area2._pt = Common::Point(200, 50);
_area3.setup(2153, 4, 1, 2320);
_area3._pt = Common::Point(200, 75);
_area4.setup(2153, 1, 1, 10);
_area4._pt = Common::Point(237, 77);
switch (_globals->_sceneManager._previousScene) {
case 2120:
_globals->_soundHandler.startSound(160);