From 880fcf11b5659634f890b19279d8254595c07a1d Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 27 Dec 2011 21:08:37 +1100 Subject: TSAGE: Fixed ambiguity with NULL parameters in R2R setDetails calls --- engines/tsage/ringworld2/ringworld2_scenes0.cpp | 76 +++++++------- engines/tsage/ringworld2/ringworld2_scenes2.cpp | 132 ++++++++++++------------ engines/tsage/ringworld2/ringworld2_scenes3.cpp | 80 +++++++------- 3 files changed, 144 insertions(+), 144 deletions(-) diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 9eb3e2b713..8252584b1c 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -121,7 +121,7 @@ bool Scene100::Table::startAction(CursorType action, Event &event) { scene->_stasisNegator.setup(100, 7, 2); } else { scene->_stasisNegator.setup(100, 7, 1); - scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, NULL); + scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, (SceneItem *)NULL); } scene->setAction(&scene->_sequenceManager2, scene, 108, this, &scene->_object3, @@ -145,7 +145,7 @@ bool Scene100::Table::startAction(CursorType action, Event &event) { scene->_stasisNegator.setup(100, 7, 2); } else { scene->_stasisNegator.setup(100, 7, 1); - scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, NULL); + scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, (SceneItem *)NULL); } scene->setAction(&scene->_sequenceManager2, scene, 102, this, &scene->_object3, @@ -240,17 +240,17 @@ void Scene100::postInit(SceneObjectList *OwnerList) { _door._state = 0; _door.setVisage(100); _door.setPosition(Common::Point(160, 84)); - _door.setDetails(100, 3, 4, 5, 1, NULL); + _door.setDetails(100, 3, 4, 5, 1, (SceneItem *)NULL); _doorDisplay.postInit(); _doorDisplay.setup(100, 2, 1); _doorDisplay.setPosition(Common::Point(202, 53)); - _doorDisplay.setDetails(100, -1, -1, -1, 1, NULL); + _doorDisplay.setDetails(100, -1, -1, -1, 1, (SceneItem *)NULL); _table.postInit(); _table.setup(100, 2, 3); _table.setPosition(Common::Point(175, 157)); - _table.setDetails(100, 17, 18, 20, 1, NULL); + _table.setDetails(100, 17, 18, 20, 1, (SceneItem *)NULL); _bedLights1.postInit(); _bedLights1.setup(100, 3, 1); @@ -270,13 +270,13 @@ void Scene100::postInit(SceneObjectList *OwnerList) { _wardrobe.setVisage(101); _wardrobe.setPosition(Common::Point(231, 126)); _wardrobe.fixPriority(10); - _wardrobe.setDetails(100, 37, -1, 39, 1, NULL); + _wardrobe.setDetails(100, 37, -1, 39, 1, (SceneItem *)NULL); if (R2_INVENTORY.getObjectScene(R2_STEPPING_DISKS) == 100) { _steppingDisks.postInit(); _steppingDisks.setup(100, 8, 1); _steppingDisks.setPosition(Common::Point(274, 130)); - _steppingDisks.setDetails(100, 40, -1, 42, 1, NULL); + _steppingDisks.setDetails(100, 40, -1, 42, 1, (SceneItem *)NULL); } _terminal.setDetails(11, 100, 14, 15, 16); @@ -1212,25 +1212,25 @@ void Scene150::postInit(SceneObjectList *OwnerList) { _door._state = 0; _door.setVisage(100); _door.setPosition(Common::Point(160, 84)); - _door.setDetails(100, 3, -1, -1, 1, NULL); + _door.setDetails(100, 3, -1, -1, 1, (SceneItem *)NULL); _doorDisplay.postInit(); _doorDisplay.setup(100, 2, 1); _doorDisplay.setPosition(Common::Point(202, 53)); - _doorDisplay.setDetails(100, -1, -1, -1, 1, NULL); + _doorDisplay.setDetails(100, -1, -1, -1, 1, (SceneItem *)NULL); _emptyRoomTable.postInit(); _emptyRoomTable.setVisage(100); _emptyRoomTable.setStrip(4); _emptyRoomTable.setFrame(1); _emptyRoomTable.setPosition(Common::Point(175, 157)); - _emptyRoomTable.setDetails(150, 3, 4, 5, 1, NULL); + _emptyRoomTable.setDetails(150, 3, 4, 5, 1, (SceneItem *)NULL); _wardrobe.postInit(); _wardrobe.setVisage(101); _wardrobe.setPosition(Common::Point(231, 126)); _wardrobe.fixPriority(10); - _wardrobe.setDetails(100, 37, -1, 39, 1, NULL); + _wardrobe.setDetails(100, 37, -1, 39, 1, (SceneItem *)NULL); _terminal.setDetails(11, 100, 14, 15, 16); _desk.setDetails(12, 100, 11, -1, 13); @@ -1367,19 +1367,19 @@ void Scene200::postInit(SceneObjectList *OwnerList) { _northDoor.postInit(); _northDoor.setVisage(200); _northDoor.setPosition(Common::Point(188, 79)); - _northDoor.setDetails(200, 3, -1, -1, 1, NULL); + _northDoor.setDetails(200, 3, -1, -1, 1, (SceneItem *)NULL); _eastDoor.postInit(); _eastDoor.setVisage(200); _eastDoor.setStrip(2); _eastDoor.setPosition(Common::Point(305, 124)); - _eastDoor.setDetails(200, 6, -1, -1, 1, NULL); + _eastDoor.setDetails(200, 6, -1, -1, 1, (SceneItem *)NULL); _westDoor.postInit(); _westDoor.setVisage(200); _westDoor.setStrip(3); _westDoor.setPosition(Common::Point(62, 84)); - _westDoor.setDetails(200, 9, -1, -1, 1, NULL); + _westDoor.setDetails(200, 9, -1, -1, 1, (SceneItem *)NULL); R2_GLOBALS._player.postInit(); R2_GLOBALS._player.setVisage(10); @@ -1533,7 +1533,7 @@ void Scene250::Button::setFloor(int floorNumber) { setPosition(Common::Point(111, (_floorNumber - 1) * 12 + 43)); fixPriority(10); - setDetails(250, -1, -1, -1, 1, NULL); + setDetails(250, -1, -1, -1, 1, (SceneItem *)NULL); } } @@ -1565,12 +1565,12 @@ void Scene250::postInit(SceneObjectList *OwnerList) { _currentFloor.setFloor(10); _currentFloor.setup(250, 1, 5); - _currentFloor.setDetails(250, 13, -1, -1, 1, NULL); + _currentFloor.setDetails(250, 13, -1, -1, 1, (SceneItem *)NULL); _button1.setFloor(11); _button1.setup(250, 1, 3); _button1.setPosition(Common::Point(400, 100)); - _button1.setDetails(250, 14, -1, -1, 1, NULL); + _button1.setDetails(250, 14, -1, -1, 1, (SceneItem *)NULL); _button1.fixPriority(190); _button1.hide(); @@ -2229,7 +2229,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) { _miranda.setup(302, 2, 1); _miranda.setPosition(Common::Point(47, 128)); _miranda.setAction(&_action3); - _miranda.setDetails(300, 39, 40, 41, 1, NULL); + _miranda.setDetails(300, 39, 40, 41, 1, (SceneItem *)NULL); if ((R2_GLOBALS._player._characterScene[2] == 300) || (R2_GLOBALS._player._characterScene[2] == 325)) { _seeker.postInit(); @@ -2237,7 +2237,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) { _seeker.setPosition(Common::Point(158, 108)); _seeker.fixPriority(130); _seeker.setAction(&_action2); - _seeker.setDetails(300, 42, 43, 44, 1, NULL); + _seeker.setDetails(300, 42, 43, 44, 1, (SceneItem *)NULL); } R2_GLOBALS._player.postInit(); @@ -2251,14 +2251,14 @@ void Scene300::postInit(SceneObjectList *OwnerList) { _miranda.setup(302, 2, 1); _miranda.setPosition(Common::Point(47, 128)); _miranda.setAction(&_action3); - _miranda.setDetails(300, 39, 40, 41, 1, NULL); + _miranda.setDetails(300, 39, 40, 41, 1, (SceneItem *)NULL); if ((R2_GLOBALS._player._characterScene[1] == 300) || (R2_GLOBALS._player._characterScene[1] == 325)) { _quinn.postInit(); _quinn.setup(302, 3, 1); _quinn.setPosition(Common::Point(271, 150)); _quinn.setAction(&_action1); - _quinn.setDetails(300, 50, 51, 52, 1, NULL); + _quinn.setDetails(300, 50, 51, 52, 1, (SceneItem *)NULL); } R2_GLOBALS._player.postInit(); @@ -2275,7 +2275,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) { _seeker.setPosition(Common::Point(158, 108)); _seeker.fixPriority(130); _seeker.setAction(&_action2); - _seeker.setDetails(300, 42, 43, 44, 1, NULL); + _seeker.setDetails(300, 42, 43, 44, 1, (SceneItem *)NULL); } if ((R2_GLOBALS._player._characterScene[1] == 300) || (R2_GLOBALS._player._characterScene[1] == 325)) { @@ -2283,7 +2283,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) { _quinn.setup(302, 3, 1); _quinn.setPosition(Common::Point(271, 150)); _quinn.setAction(&_action1); - _quinn.setDetails(300, 50, 51, 52, 1, NULL); + _quinn.setDetails(300, 50, 51, 52, 1, (SceneItem *)NULL); } R2_GLOBALS._player.postInit(); @@ -2305,11 +2305,11 @@ void Scene300::postInit(SceneObjectList *OwnerList) { _manualOverrides.setDetails(14, 300, 15, -1, 17); _scanners1.setDetails(Rect(126, 15, 183, 25), 300, 18, -1, 20, 1, NULL); _scanners2.setDetails(Rect(126, 80, 183, 90), 300, 18, -1, 20, 1, NULL); - _protocolDisplay.setDetails(300, 27, -1, 29, 1, NULL); + _protocolDisplay.setDetails(300, 27, -1, 29, 1, (SceneItem *)NULL); _indirectLighting1.setDetails(Rect(74, 71, 122, 89), 300, 21, -1, -1, 1, NULL); _indirectLighting2.setDetails(Rect(197, 71, 245, 89), 300, 21, -1, -1, 1, NULL); _lighting.setDetails(Rect(129, 3, 190, 14), 300, 24, -1, -1, 1, NULL); - _doorway.setDetails(300, 3, -1, 5, 1, NULL); + _doorway.setDetails(300, 3, -1, 5, 1, (SceneItem *)NULL); _background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 300, 0, -1, -1, 1, NULL); switch (R2_GLOBALS._player._characterIndex) { @@ -2753,7 +2753,7 @@ void Scene400::postInit(SceneObjectList *OwnerList) { _door.postInit(); _door.setVisage(100); _door.setPosition(Common::Point(123, 84)); - _door.setDetails(400, 24, -1, 26, 1, NULL); + _door.setDetails(400, 24, -1, 26, 1, (SceneItem *)NULL); _consoleDisplay.postInit(); _consoleDisplay.setup(400, 4, 1); @@ -2772,7 +2772,7 @@ void Scene400::postInit(SceneObjectList *OwnerList) { _reader.postInit(); _reader.setup(400, 5, 2); _reader.setPosition(Common::Point(301, 95)); - _reader.setDetails(400, 54, -1, 56, 1, NULL); + _reader.setDetails(400, 54, -1, 56, 1, (SceneItem *)NULL); } if (R2_INVENTORY.getObjectScene(R2_SENSOR_PROBE) == 400) { @@ -2780,14 +2780,14 @@ void Scene400::postInit(SceneObjectList *OwnerList) { _sensorProbe.setup(400, 5, 1); _sensorProbe.setPosition(Common::Point(251, 104)); _sensorProbe.fixPriority(121); - _sensorProbe.setDetails(400, 57, -1, 59, 1, NULL); + _sensorProbe.setDetails(400, 57, -1, 59, 1, (SceneItem *)NULL); } if (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_UNIT) == 400) { _attractorUnit.postInit(); _attractorUnit.setup(400, 5, 3); _attractorUnit.setPosition(Common::Point(265, 129)); - _attractorUnit.setDetails(400, 60, -1, 62, 1, NULL); + _attractorUnit.setDetails(400, 60, -1, 62, 1, (SceneItem *)NULL); } R2_GLOBALS._player.postInit(); @@ -3052,12 +3052,12 @@ void Scene800::postInit(SceneObjectList *OwnerList) { _door.setVisage(800); _door.setPosition(Common::Point(286, 108)); _door.fixPriority(50); - _door.setDetails(800, 3, -1, -1, 1, NULL); + _door.setDetails(800, 3, -1, -1, 1, (SceneItem *)NULL); _autodocCover.postInit(); _autodocCover.setup(800, 2, 1); _autodocCover.setPosition(Common::Point(119, 161)); - _autodocCover.setDetails(800, 6, 7, -1, 1, NULL); + _autodocCover.setDetails(800, 6, 7, -1, 1, (SceneItem *)NULL); if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) { _opticalFibre.postInit(); @@ -3087,13 +3087,13 @@ void Scene800::postInit(SceneObjectList *OwnerList) { _cabinet.postInit(); _cabinet.setup(801, 1, R2_GLOBALS.getFlag(56) ? 6 : 1); _cabinet.setPosition(Common::Point(169, 79)); - _cabinet.setDetails(800, 41, -1, -1, 1, NULL); + _cabinet.setDetails(800, 41, -1, -1, 1, (SceneItem *)NULL); if (R2_INVENTORY.getObjectScene(R2_9) == 800) { _comScanner.postInit(); _comScanner.setup(801, 2, 1); _comScanner.setPosition(Common::Point(174, 73)); - _comScanner.setDetails(800, 34, 35, -1, 1, NULL); + _comScanner.setDetails(800, 34, 35, -1, 1, (SceneItem *)NULL); } _tray.postInit(); @@ -3101,7 +3101,7 @@ void Scene800::postInit(SceneObjectList *OwnerList) { if (R2_GLOBALS.getFlag(10)) _tray.setFrame(5); _tray.setPosition(Common::Point(203, 144)); - _tray.setDetails(800, 12, -1, 14, 1, NULL); + _tray.setDetails(800, 12, -1, 14, 1, (SceneItem *)NULL); R2_GLOBALS._player.postInit(); R2_GLOBALS._player.setVisage(10); @@ -3641,12 +3641,12 @@ void Scene850::postInit(SceneObjectList *OwnerList) { _liftDoor.postInit(); _liftDoor.setup(850, 2, 1); _liftDoor.setPosition(Common::Point(188, 79)); - _liftDoor.setDetails(850, 3, -1, -1, 1, NULL); + _liftDoor.setDetails(850, 3, -1, -1, 1, (SceneItem *)NULL); _sickBayDoor.postInit(); _sickBayDoor.setup(850, 3, 1); _sickBayDoor.setPosition(Common::Point(62, 84)); - _sickBayDoor.setDetails(850, 9, -1, -1, 1, NULL); + _sickBayDoor.setDetails(850, 9, -1, -1, 1, (SceneItem *)NULL); if (R2_INVENTORY.getObjectScene(R2_CLAMP) == 850) { _clamp.postInit(); @@ -3654,7 +3654,7 @@ void Scene850::postInit(SceneObjectList *OwnerList) { _clamp.setPosition(Common::Point(242, 93)); _clamp.fixPriority(81); _clamp.animate(ANIM_MODE_2, NULL); - _clamp.setDetails(850, 27, -1, -1, 1, NULL); + _clamp.setDetails(850, 27, -1, -1, 1, (SceneItem *)NULL); } _panel.postInit(); @@ -3665,7 +3665,7 @@ void Scene850::postInit(SceneObjectList *OwnerList) { _panel.setPosition(Common::Point(232, 119)); _panel.fixPriority(82); - _panel.setDetails(850, 24, -1, -1, 1, NULL); + _panel.setDetails(850, 24, -1, -1, 1, (SceneItem *)NULL); if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 850) { _fibre.postInit(); diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp index 1fe920e65c..ef2d0526ae 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp @@ -137,10 +137,10 @@ void Scene2000::initPlayer() { _object1.postInit(); if (R2_GLOBALS._player._characterIndex == 1) { _object1.setup(20, 5, 1); - _object1.setDetails(9002, 0, 4, 3, 1, NULL); + _object1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); } else { _object1.setup(2008, 5, 1); - _object1.setDetails(9001, 0, 5, 3, 1, NULL); + _object1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } if (_exit1._enabled) { if (_exit2._enabled) @@ -806,47 +806,47 @@ void Scene2000::postInit(SceneObjectList *OwnerList) { _objList1[0].setVisage(2000); _objList1[0].setStrip(2); - _objList1[0].setDetails(2001, 0, -1, -1, 1, NULL); + _objList1[0].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL); _objList1[1].setVisage(2001); _objList1[1].setStrip(2); - _objList1[1].setDetails(2001, 0, -1, -1, 1, NULL); + _objList1[1].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL); _objList1[2].setVisage(2003); _objList1[2].setStrip(1); - _objList1[2].setDetails(2001, 0, -1, -1, 1, NULL); + _objList1[2].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL); _objList1[3].setVisage(2007); _objList1[3].setStrip(2); - _objList1[3].setDetails(2001, 12, -1, -1, 1, NULL); + _objList1[3].setDetails(2001, 12, -1, -1, 1, (SceneItem *)NULL); _objList1[4].setVisage(2004); _objList1[4].setStrip(2); - _objList1[4].setDetails(2001, 19, -1, -1, 1, NULL); + _objList1[4].setDetails(2001, 19, -1, -1, 1, (SceneItem *)NULL); _objList1[5].setVisage(2003); _objList1[5].setStrip(2); - _objList1[5].setDetails(2001, 0, -1, -1, 1, NULL); + _objList1[5].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL); _objList1[6].setVisage(2000); _objList1[6].setStrip(1); - _objList1[6].setDetails(2001, 0, -1, -1, 1, NULL); + _objList1[6].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL); _objList1[7].setVisage(2000); _objList1[7].setStrip(2); - _objList1[7].setDetails(2001, 0, -1, -1, 1, NULL); + _objList1[7].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL); _objList1[8].setVisage(2000); _objList1[8].setStrip(2); - _objList1[8].setDetails(2001, 0, -1, -1, 1, NULL); + _objList1[8].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL); _objList1[9].setVisage(2006); _objList1[9].setStrip(1); - _objList1[9].setDetails(2001, 6, -1, -1, 1, NULL); + _objList1[9].setDetails(2001, 6, -1, -1, 1, (SceneItem *)NULL); _objList1[10].setVisage(2007); _objList1[10].setStrip(1); - _objList1[10].setDetails(2001, 12, -1, -1, 1, NULL); + _objList1[10].setDetails(2001, 12, -1, -1, 1, (SceneItem *)NULL); for (int i = 0; i < 11; i++) { _objList1[i].animate(ANIM_MODE_1, NULL); @@ -1099,10 +1099,10 @@ void Scene2350::postInit(SceneObjectList *OwnerList) { _actor2.postInit(); if (R2_GLOBALS._player._characterIndex == 1) { _actor2.setup(20, 5, 1); - _actor2.setDetails(9002, 0, 4, 3, 1, NULL); + _actor2.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); } else { _actor2.setup(2008, 5, 1); - _actor2.setDetails(9001, 0, 5, 3, 1, NULL); + _actor2.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } _actor2.setPosition(Common::Point(135, 128)); } @@ -1115,11 +1115,11 @@ void Scene2350::postInit(SceneObjectList *OwnerList) { } else { _actor3.setup(2350, 0, 1); _actor3.setPosition(Common::Point(197, 101)); - _actor3.setDetails(2000, 12, -1, -1, 1, NULL); + _actor3.setDetails(2000, 12, -1, -1, 1, (SceneItem *)NULL); _actor3.fixPriority(10); _actor4.setup(2350, 1, 2); _actor4.setPosition(Common::Point(199, 129)); - _actor4.setDetails(2000, 12, -1, -1, 1, NULL); + _actor4.setDetails(2000, 12, -1, -1, 1, (SceneItem *)NULL); _actor4.fixPriority(10); } _item1.setDetails(Rect(0, 0, 320, 200), 2000, 9, -1, -1, 1, NULL); @@ -1392,10 +1392,10 @@ void Scene2425::postInit(SceneObjectList *OwnerList) { _actor2.postInit(); if (R2_GLOBALS._player._characterIndex == 1) { _actor2.setup(20, 5, 1); - _actor2.setDetails(9002, 0, 4, 3, 1, NULL); + _actor2.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); } else { _actor2.setup(2008, 5, 1); - _actor2.setDetails(9001, 0, 5, 3, 1, NULL); + _actor2.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } _actor2.setPosition(Common::Point(250, 185)); } @@ -1408,7 +1408,7 @@ void Scene2425::postInit(SceneObjectList *OwnerList) { _actor1.setPosition(Common::Point(290, 9)); _actor1.fixPriority(20); - _actor1.setDetails(2455, 12, -1, -1, 1, NULL); + _actor1.setDetails(2455, 12, -1, -1, 1, (SceneItem *)NULL); _item1.setDetails(Rect(225, 52, 248, 65), 2425, -1, -1, -1, 1, NULL); _item2.setDetails(Rect(292, 81, 316, 94), 2425, -1, -1, -1, 1, NULL); @@ -1532,14 +1532,14 @@ void Scene2430::postInit(SceneObjectList *OwnerList) { _actor2.setup(2435, 1, 5); _actor2.setPosition(Common::Point(205, 119)); _actor2.fixPriority(152); - _actor2.setDetails(2430, 51, -1, 53, 1, NULL); + _actor2.setDetails(2430, 51, -1, 53, 1, (SceneItem *)NULL); } if (R2_INVENTORY.getObjectScene(50) == 2435) { _actor3.postInit(); _actor3.setup(2435, 1, 1); _actor3.setPosition(Common::Point(31, 65)); - _actor3.setDetails(2430, 48, -1, -1, 1, NULL); + _actor3.setDetails(2430, 48, -1, -1, 1, (SceneItem *)NULL); } R2_GLOBALS._player.postInit(); @@ -1557,10 +1557,10 @@ void Scene2430::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); if (R2_GLOBALS._player._characterIndex == 1) { _actor1.setup(20, 5, 1); - _actor1.setDetails(9002, 0, 4, 3, 1, NULL); + _actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); } else { _actor1.setup(2008, 5, 1); - _actor1.setDetails(9001, 0, 5, 3, 1, NULL); + _actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } _actor1.setPosition(Common::Point(189, 137)); R2_GLOBALS._walkRegions.enableRegion(4); @@ -1685,7 +1685,7 @@ void Scene2435::postInit(SceneObjectList *OwnerList) { _actor2.postInit(); _actor2.setup(2005, 3, 1); _actor2.setPosition(Common::Point(219, 106)); - _actor2.setDetails(2001, 25, 26, -1, 1, NULL); + _actor2.setDetails(2001, 25, 26, -1, 1, (SceneItem *)NULL); R2_GLOBALS._player.postInit(); R2_GLOBALS._player.animate(ANIM_MODE_1, NULL); if (R2_GLOBALS._player._characterIndex == 1) { @@ -1700,10 +1700,10 @@ void Scene2435::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); if (R2_GLOBALS._player._characterIndex == 1) { _actor1.setup(20, 5, 1); - _actor1.setDetails(9002, 0, 4, 3, 1, NULL); + _actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); } else { _actor1.setup(2008, 5, 1); - _actor1.setDetails(9001, 0, 5, 3, 1, NULL); + _actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } _actor1.setPosition(Common::Point(107, 145)); R2_GLOBALS._walkRegions.enableRegion(2); @@ -1818,7 +1818,7 @@ void Scene2440::postInit(SceneObjectList *OwnerList) { _actor2.setup(2435, 1, 1); _actor2.setPosition(Common::Point(94, 80)); _actor2.fixPriority(106); - _actor2.setDetails(2430, 48, -1, -1, 1, NULL); + _actor2.setDetails(2430, 48, -1, -1, 1, (SceneItem *)NULL); } R2_GLOBALS._player.postInit(); R2_GLOBALS._player.enableControl(); @@ -1836,10 +1836,10 @@ void Scene2440::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); if (R2_GLOBALS._player._characterIndex == 1) { _actor1.setup(20, 5, 1); - _actor1.setDetails(9002, 0, 4, 3, 1, NULL); + _actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); } else { _actor1.setup(2008, 5, 1); - _actor1.setDetails(9002, 0, 5, 3, 1, NULL); + _actor1.setDetails(9002, 0, 5, 3, 1, (SceneItem *)NULL); } _actor1.setPosition(Common::Point(38, 119)); } @@ -1983,7 +1983,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) { _actor2.setVisage(2009); _actor2.setPosition(Common::Point(190, 119)); _actor2.fixPriority(50); - _actor2.setDetails(2450, 0, -1, -1, 1, NULL); + _actor2.setDetails(2450, 0, -1, -1, 1, (SceneItem *)NULL); } R2_GLOBALS._player.postInit(); @@ -2006,7 +2006,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); _actor1.setup(20, 6, 1); _actor1.setPosition(Common::Point(240, 120)); - _actor1.setDetails(9002, 0, 4, 3, 1, NULL); + _actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); } setAction(&_sequenceManager, this, 2451, &R2_GLOBALS._player, NULL); } else { @@ -2018,7 +2018,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) { _actor1.setup(2008, 6, 1); else _actor1.setup(10, 6, 1); - _actor1.setDetails(9001, 0, 5, 3, 1, NULL); + _actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); _actor1.setPosition(Common::Point(106, 111)); } setAction(&_sequenceManager, this, 2456, &R2_GLOBALS._player, NULL); @@ -2039,18 +2039,18 @@ void Scene2450::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); _actor1.setup(20, 6, 1); _actor1.setPosition(Common::Point(240, 120)); - _actor1.setDetails(9002, 0, 4, 3, 1, NULL); + _actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); } } else { _actor1.postInit(); _actor1.setup(20, 8, 1); _actor1.setPosition(Common::Point(93, 158)); - _actor1.setDetails(9002, 0, 4, 3, 1, NULL); + _actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); _actor3.postInit(); _actor3.setup(2001, 7, 1); _actor3.setPosition(Common::Point(34, 153)); - _actor3.setDetails(2001, 40, -1, -1, 1, NULL); + _actor3.setDetails(2001, 40, -1, -1, 1, (SceneItem *)NULL); _exit1._enabled = false; } @@ -2068,7 +2068,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) { _actor1.setup(10, 6, 1); } _actor1.setPosition(Common::Point(106, 111)); - _actor1.setDetails(9001, 0, 5, 3, 1, NULL); + _actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } } else { _actor1.postInit(); @@ -2078,12 +2078,12 @@ void Scene2450::postInit(SceneObjectList *OwnerList) { _actor1.setup(10, 6, 1); } _actor1.setPosition(Common::Point(106, 111)); - _actor1.setDetails(9001, 0, 5, 3, 1, NULL); + _actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); _actor3.postInit(); _actor3.setup(2001, 7, 1); _actor3.setPosition(Common::Point(34, 153)); - _actor3.setDetails(2001, 40, -1, -1, 1, NULL); + _actor3.setDetails(2001, 40, -1, -1, 1, (SceneItem *)NULL); _exit1._enabled = false; } @@ -2187,9 +2187,9 @@ void Scene2450::signal() { break; default: _actor1.postInit(); - _actor1.setDetails(9002, 0, 4, 3, 2, NULL); + _actor1.setDetails(9002, 0, 4, 3, 2, (SceneItem *)NULL); _actor3.postInit(); - _actor3.setDetails(2001, 40, -1, -1, 2, NULL); + _actor3.setDetails(2001, 40, -1, -1, 2, (SceneItem *)NULL); _sceneMode = 2453; setAction(&_sequenceManager, this, 2453, &_actor3, &_actor1, NULL); break; @@ -2211,7 +2211,7 @@ bool Scene2455::Actor1::startAction(CursorType action, Event &event) { scene->_actor2._lookLineNum = 9; scene->_actor1.remove(); scene->_actor3.postInit(); - scene->_actor3.setDetails(2455, 16, 1, -1, 2, NULL); + scene->_actor3.setDetails(2455, 16, 1, -1, 2, (SceneItem *)NULL); scene->setAction(&scene->_sequenceManager, scene, 2458, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor3, NULL); return true; } @@ -2230,7 +2230,7 @@ bool Scene2455::Actor2::startAction(CursorType action, Event &event) { scene->_actor1.postInit(); scene->_actor1.setup(2456, 3, 3); scene->_actor1.setPosition(Common::Point(162, 165)); - scene->_actor1.setDetails(2455, 15, 1, -1, 2, NULL); + scene->_actor1.setDetails(2455, 15, 1, -1, 2, (SceneItem *)NULL); scene->_sceneMode = 11; scene->setAction(&scene->_sequenceManager, scene, 2457, &R2_GLOBALS._player, &scene->_actor2, NULL); return true; @@ -2242,7 +2242,7 @@ bool Scene2455::Actor2::startAction(CursorType action, Event &event) { scene->_actor1.postInit(); scene->_actor1.setup(2456, 3, 3); scene->_actor1.setPosition(Common::Point(162, 165)); - scene->_actor1.setDetails(2455, 15, 1, -1, 2, NULL); + scene->_actor1.setDetails(2455, 15, 1, -1, 2, (SceneItem *)NULL); scene->_sceneMode = 12; scene->setAction(&scene->_sequenceManager, scene, 2457, &R2_GLOBALS._player, &scene->_actor2, NULL); return true; @@ -2295,25 +2295,25 @@ void Scene2455::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); _actor1.setup(2456, 3, 3); _actor1.setPosition(Common::Point(162, 165)); - _actor1.setDetails(2455, 15, 1, -1, 1, NULL); + _actor1.setDetails(2455, 15, 1, -1, 1, (SceneItem *)NULL); } } else { _actor3.postInit(); _actor3.setup(2456, 3, 1); _actor3.setPosition(Common::Point(176, 165)); - _actor3.setDetails(2455, 16, 1, -1, 1, NULL); + _actor3.setDetails(2455, 16, 1, -1, 1, (SceneItem *)NULL); } _actor2.postInit(); if (R2_INVENTORY.getObjectScene(29) == 2455) { _actor2.setup(2456, 3, 2); - _actor2.setDetails(2455, 9, 1, -1, 1, NULL); + _actor2.setDetails(2455, 9, 1, -1, 1, (SceneItem *)NULL); } else { if ((R2_INVENTORY.getObjectScene(50) != 2455) && (R2_INVENTORY.getObjectScene(49) != 2455)) _actor2.setup(2455, 1, 1); else _actor2.setup(2456, 1, 1); - _actor2.setDetails(2455, 3, 1, -1, 1, NULL); + _actor2.setDetails(2455, 3, 1, -1, 1, (SceneItem *)NULL); } _actor2.setPosition(Common::Point(162, 165)); _actor2.fixPriority(20); @@ -2426,11 +2426,11 @@ void Scene2500::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); if (R2_GLOBALS._player._characterIndex == 1) { _actor1.setup(21, 3, 1); - _actor1.setDetails(9002, 1, -1, -1, 1, NULL); + _actor1.setDetails(9002, 1, -1, -1, 1, (SceneItem *)NULL); } else { _actor1.setup(2008, 3, 1); _actor1.changeZoom(50); - _actor1.setDetails(9001, 0, -1, -1, 1, NULL); + _actor1.setDetails(9001, 0, -1, -1, 1, (SceneItem *)NULL); } _actor1.setPosition(Common::Point(141, 94)); } @@ -2540,13 +2540,13 @@ void Scene2525::postInit(SceneObjectList *OwnerList) { _actor3.setup(2435, 1, 2); _actor3.setPosition(Common::Point(78, 155)); _actor3.fixPriority(155); - _actor3.setDetails(2525, 27, -1, -1, 1, NULL); + _actor3.setDetails(2525, 27, -1, -1, 1, (SceneItem *)NULL); } _actor2.postInit(); _actor2.setup(2525, 1, 1); _actor2.setPosition(Common::Point(183, 114)); - _actor2.setDetails(2525, 15, -1, -1, 1, NULL); + _actor2.setDetails(2525, 15, -1, -1, 1, (SceneItem *)NULL); _actor2.animate(ANIM_MODE_2, NULL); _actor2._numFrames = 3; @@ -2564,10 +2564,10 @@ void Scene2525::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); if (R2_GLOBALS._player._characterIndex == 1) { _actor1.setup(20, 5, 1); - _actor1.setDetails(9002, 0, 4, 3, 1, NULL); + _actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); } else { _actor1.setup(2008, 5, 1); - _actor1.setDetails(9001, 0, 5, 3, 1, NULL); + _actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } _actor1.setPosition(Common::Point(209, 162)); @@ -2696,7 +2696,7 @@ void Scene2530::postInit(SceneObjectList *OwnerList) { _actor2.setup(2435, 1, 3); _actor2.setPosition(Common::Point(299, 80)); _actor2.fixPriority(80); - _actor2.setDetails(2530, 28, -1, -1, 1, NULL); + _actor2.setDetails(2530, 28, -1, -1, 1, (SceneItem *)NULL); } _actor3.postInit(); @@ -2707,7 +2707,7 @@ void Scene2530::postInit(SceneObjectList *OwnerList) { _actor3.setup(2531, 4, 1); _actor3.setPosition(Common::Point(173, 131)); } - _actor3.setDetails(2530, 22, -1, -1, 1, NULL); + _actor3.setDetails(2530, 22, -1, -1, 1, (SceneItem *)NULL); R2_GLOBALS._player.postInit(); R2_GLOBALS._player.animate(ANIM_MODE_1, NULL); @@ -2725,10 +2725,10 @@ void Scene2530::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); if (R2_GLOBALS._player._characterIndex == 1) { _actor1.setup(20, 5, 1); - _actor1.setDetails(9002, 0, 4, 3, 1, NULL); + _actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); } else { _actor1.setup(2008, 5, 1); - _actor1.setDetails(9001, 0, 5, 3, 1, NULL); + _actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } _actor1.setPosition(Common::Point(20, 130)); R2_GLOBALS._walkRegions.enableRegion(1); @@ -2849,14 +2849,14 @@ void Scene2535::postInit(SceneObjectList *OwnerList) { _actor4.setup(2435, 1, 4); _actor4.setPosition(Common::Point(47, 74)); _actor4.fixPriority(74); - _actor4.setDetails(2535, 21, -1, -1, 1, NULL); + _actor4.setDetails(2535, 21, -1, -1, 1, (SceneItem *)NULL); } if (R2_INVENTORY.getObjectScene(20) == 2535) { _actor3.postInit(); _actor3.setup(2535, 3, 1); _actor3.setPosition(Common::Point(203, 131)); - _actor3.setDetails(3, 20, -1, -1, 1, NULL); + _actor3.setDetails(3, 20, -1, -1, 1, (SceneItem *)NULL); R2_GLOBALS._walkRegions.enableRegion(6); } @@ -2864,7 +2864,7 @@ void Scene2535::postInit(SceneObjectList *OwnerList) { _actor3.postInit(); _actor3.setup(2536, 1, 2); _actor3.setPosition(Common::Point(164, 133)); - _actor3.setDetails(3, 20, -1, -1, 1, NULL); + _actor3.setDetails(3, 20, -1, -1, 1, (SceneItem *)NULL); } if (R2_GLOBALS.getFlag(73)) { @@ -2872,7 +2872,7 @@ void Scene2535::postInit(SceneObjectList *OwnerList) { _actor2.setup(2536, 1, 1); _actor2.setPosition(Common::Point(160, 130)); _actor2.fixPriority(122); - _actor2.setDetails(2535, 37, -1, -1, 1, NULL); + _actor2.setDetails(2535, 37, -1, -1, 1, (SceneItem *)NULL); } R2_GLOBALS._player.postInit(); @@ -2890,10 +2890,10 @@ void Scene2535::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); if (R2_GLOBALS._player._characterIndex == 1) { _actor1.setup(20, 5, 1); - _actor1.setDetails(9002, 0, 4, 3, 1, NULL); + _actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL); } else { _actor1.setup(2008, 5, 1); - _actor1.setDetails(9001, 0, 5, 3, 1, NULL); + _actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL); } _actor1.setPosition(Common::Point(245, 115)); R2_GLOBALS._walkRegions.enableRegion(2); @@ -2940,7 +2940,7 @@ void Scene2535::signal() { _sceneMode = 20; _actor3.show(); _actor3.setup(2536, 1, 2); - _actor3.setDetails(3, 20, -1, -1, 3, NULL); + _actor3.setDetails(3, 20, -1, -1, 3, (SceneItem *)NULL); _actor3.setPosition(Common::Point(164, 150)); _actor3.fixPriority(130); _actor3._moveDiff.y = 1; @@ -4430,7 +4430,7 @@ void Scene2800::postInit(SceneObjectList *OwnerList) { _actor1._moveDiff = Common::Point(2, 1); _actor1.setPosition(Common::Point(122, 82)); _actor1.animate(ANIM_MODE_NONE, NULL); - _actor1.setDetails(2800, -1, -1, -1, 1, NULL); + _actor1.setDetails(2800, -1, -1, -1, 1, (SceneItem *)NULL); } _item1.setDetails(Rect(0, 0, 320, 200), 2800, -1, -1, -1, 1, NULL); diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index adcd86e391..85e1f7760b 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -102,16 +102,16 @@ void Scene3100::postInit(SceneObjectList *OwnerList) { _guard.setup(3110, 5, 1); _guard.changeZoom(50); _guard.setPosition(Common::Point(10, 149)); - _guard.setDetails(3100, 6, -1, -1, 2, NULL); + _guard.setDetails(3100, 6, -1, -1, 2, (SceneItem *)NULL); _actor4.postInit(); _actor4.setup(3103, 1, 1); _actor4.setPosition(Common::Point(278, 113)); - _actor4.setDetails(3100, 9, -1, -1, 2, NULL); + _actor4.setDetails(3100, 9, -1, -1, 2, (SceneItem *)NULL); _actor4.animate(ANIM_MODE_2, NULL); _field412 = 1; - _actor1.setDetails(3100, 3, -1, -1, 2, NULL); + _actor1.setDetails(3100, 3, -1, -1, 2, (SceneItem *)NULL); R2_GLOBALS._sound1.play(243); R2_GLOBALS._sound2.play(130); _sceneMode = 3100; @@ -130,18 +130,18 @@ void Scene3100::postInit(SceneObjectList *OwnerList) { _guard.setup(3110, 5, 1); _guard.changeZoom(50); _guard.setPosition(Common::Point(10, 149)); - _guard.setDetails(3100, 6, -1, -1, 2, NULL); + _guard.setDetails(3100, 6, -1, -1, 2, (SceneItem *)NULL); _actor4.postInit(); _actor4.setup(3103, 1, 1); _actor4.setPosition(Common::Point(278, 113)); - _actor4.setDetails(3100, 9, -1, -1, 2, NULL); + _actor4.setDetails(3100, 9, -1, -1, 2, (SceneItem *)NULL); _actor4.animate(ANIM_MODE_2, NULL); _actor1.postInit(); _actor1.setup(3104, 4, 1); _actor1.setPosition(Common::Point(143, 104)); - _actor1.setDetails(3100, 3, -1, -1, 2, NULL); + _actor1.setDetails(3100, 3, -1, -1, 2, (SceneItem *)NULL); R2_GLOBALS._player.setup(3110, 3, 1); R2_GLOBALS._player.changeZoom(50); @@ -306,7 +306,7 @@ void Scene3125::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); _actor1.setup(3175, 1, 1); _actor1.setPosition(Common::Point(35, 72)); - _actor1.setDetails(3125, 12, 13, -1, 1, NULL); + _actor1.setDetails(3125, 12, 13, -1, 1, (SceneItem *)NULL); _actor2.postInit(); _actor2.setup(3126, 4, 1); @@ -421,7 +421,7 @@ bool Scene3150::Item6::startAction(CursorType action, Event &event) { scene->_actor5.postInit(); scene->_actor5._effect = 6; scene->_actor5._shade = 3; - scene->_actor5.setDetails(3150, 30, -1, -1, 2, NULL); + scene->_actor5.setDetails(3150, 30, -1, -1, 2, (SceneItem *)NULL); R2_GLOBALS._player.disableControl(); scene->_sceneMode = 3159; @@ -562,7 +562,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { _actor2.fixPriority(125); } else { _actor2.setup(3151, 1, 1); - _actor2.setDetails(3150, 8, -1, 9, 1, NULL); + _actor2.setDetails(3150, 8, -1, 9, 1, (SceneItem *)NULL); } if (R2_GLOBALS.getFlag(78)) { @@ -571,7 +571,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { _actor1.setPosition(Common::Point(104, 129)); _actor1._effect = 6; _actor1._shade = 3; - _actor1.setDetails(3150, 24, -1, -1, -1, NULL); + _actor1.setDetails(3150, 24, -1, -1, -1, (SceneItem *)NULL); } _actor7.postInit(); @@ -581,7 +581,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { else _actor7.setPosition(Common::Point(264, 58)); _actor7.fixPriority(50); - _actor7.setDetails(3150, 17, -1, 19, 1, NULL); + _actor7.setDetails(3150, 17, -1, 19, 1, (SceneItem *)NULL); if (R2_INVENTORY.getObjectScene(41) == 3150) { _actor4.postInit(); @@ -592,10 +592,10 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { R2_GLOBALS._walkRegions.enableRegion(5); R2_GLOBALS._walkRegions.enableRegion(6); _actor4.setup(3152, 4, 10); - _actor4.setDetails(3150, 14, -1, -1, 1, NULL); + _actor4.setDetails(3150, 14, -1, -1, 1, (SceneItem *)NULL); } else { _actor4.setup(3152, 7, 4); - _actor4.setDetails(3150, 13, -1, -1, 1, NULL); + _actor4.setDetails(3150, 13, -1, -1, 1, (SceneItem *)NULL); } _actor4.fixPriority(110); _actor4.setPosition(Common::Point(83, 88)); @@ -604,7 +604,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { } else { _actor4.setup(3152, 7, 3); _actor4.setPosition(Common::Point(143, 70)); - _actor4.setDetails(3150, 15, -1, -1, 1, NULL); + _actor4.setDetails(3150, 15, -1, -1, 1, (SceneItem *)NULL); } } @@ -635,13 +635,13 @@ void Scene3150::postInit(SceneObjectList *OwnerList) { _actor5.setup(3152, 7, 7); _actor5.setPosition(Common::Point(155, 79)); } - _actor5.setDetails(3150, 30, -1, -1, 2, NULL); + _actor5.setDetails(3150, 30, -1, -1, 2, (SceneItem *)NULL); } _actor6.postInit(); _actor6.setup(3152, 7, 6); _actor6.setPosition(Common::Point(98, 73)); - _actor6.setDetails(3150, 43, -1, -1, 1, NULL); + _actor6.setDetails(3150, 43, -1, -1, 1, (SceneItem *)NULL); _item2.setDetails(12, 3150, 10, -1, 12); _item3.setDetails(Rect(186, 17, 210, 36), 3150, 6, -1, -1, 1, NULL); @@ -718,9 +718,9 @@ void Scene3150::signal() { break; case 3153: R2_GLOBALS.setFlag(76); - _actor4.setDetails(3150, 14, -1, -1, 3, NULL); + _actor4.setDetails(3150, 14, -1, -1, 3, (SceneItem *)NULL); _actor1.postInit(); - _actor1.setDetails(3150, 24, -1, -1, 2, NULL); + _actor1.setDetails(3150, 24, -1, -1, 2, (SceneItem *)NULL); _sceneMode = 3161; setAction(&_sequenceManager, this, 3161, &_actor1, &_actor2, NULL); break; @@ -734,7 +734,7 @@ void Scene3150::signal() { R2_GLOBALS._player.enableControl(); break; case 3156: - _actor5.setDetails(3150, 30, -1, -1, 2, NULL); + _actor5.setDetails(3150, 30, -1, -1, 2, (SceneItem *)NULL); R2_INVENTORY.setObjectScene(42, 3150); R2_GLOBALS._player.enableControl(); break; @@ -747,7 +747,7 @@ void Scene3150::signal() { R2_GLOBALS.setFlag(75); R2_INVENTORY.setObjectScene(41, 3150); _actor4.fixPriority(110); - _actor4.setDetails(3150, 13, -1, -1, 2, NULL); + _actor4.setDetails(3150, 13, -1, -1, 2, (SceneItem *)NULL); R2_GLOBALS._player.enableControl(); break; case 3159: @@ -884,7 +884,7 @@ void Scene3175::postInit(SceneObjectList *OwnerList) { _actor1.postInit(); _actor1.setup(3175, 1, 1); _actor1.setPosition(Common::Point(35, 72)); - _actor1.setDetails(3175, 9, 10, -1, 1, NULL); + _actor1.setDetails(3175, 9, 10, -1, 1, (SceneItem *)NULL); _actor2.postInit(); _actor2.setup(3175, 2, 1); @@ -893,7 +893,7 @@ void Scene3175::postInit(SceneObjectList *OwnerList) { _actor3.postInit(); _actor3.setup(3175, 3, 1); _actor3.setPosition(Common::Point(199, 117)); - _actor3.setDetails(3175, 15, 16, 17, 1, NULL); + _actor3.setDetails(3175, 15, 16, 17, 1, (SceneItem *)NULL); _item2.setDetails(12, 3175, 3, 1, 5); _item3.setDetails(11, 3175, 6, 7, 8); @@ -1162,19 +1162,19 @@ void Scene3250::postInit(SceneObjectList *OwnerList) { _actor1.setup(3250, 6, 1); _actor1.setPosition(Common::Point(25, 148)); _actor1.fixPriority(10); - _actor1.setDetails(3250, 9, 10, -1, 1, NULL); + _actor1.setDetails(3250, 9, 10, -1, 1, (SceneItem *)NULL); _actor2.postInit(); _actor2.setup(3250, 4, 1); _actor2.setPosition(Common::Point(259, 126)); _actor2.fixPriority(10); - _actor2.setDetails(3250, 9, 10, -1, 1, NULL); + _actor2.setDetails(3250, 9, 10, -1, 1, (SceneItem *)NULL); _actor3.postInit(); _actor3.setup(3250, 5, 1); _actor3.setPosition(Common::Point(302, 138)); _actor3.fixPriority(10); - _actor3.setDetails(3250, 9, 10, -1, 1, NULL); + _actor3.setDetails(3250, 9, 10, -1, 1, (SceneItem *)NULL); _item3.setDetails(Rect(119, 111, 149, 168), 3250, 6, 7, 2, 1, NULL); _item2.setDetails(Rect(58, 85, 231, 138), 3250, 12, 7, 2, 1, NULL); @@ -1405,67 +1405,67 @@ void Scene3260::postInit(SceneObjectList *OwnerList) { _actor13.postInit(); _actor13.setup(3260, 6, 1); _actor13.setPosition(Common::Point(40, 106)); - _actor13.setDetails(3260, 18, 1, -1, 1, NULL); + _actor13.setDetails(3260, 18, 1, -1, 1, (SceneItem *)NULL); if (R2_INVENTORY.getObjectScene(52) == 3260) { _actor14.postInit(); _actor14.setup(3260, 7, 1); _actor14.setPosition(Common::Point(202, 66)); - _actor14.setDetails(3260, 12, 1, -1, 1, NULL); + _actor14.setDetails(3260, 12, 1, -1, 1, (SceneItem *)NULL); } _actor1.postInit(); _actor1.setup(3260, 1, 1); _actor1.setPosition(Common::Point(93, 73)); - _actor1.setDetails(3260, 3, 1, 5, 1, NULL); + _actor1.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL); _actor1.setAction(&_action1, &_actor1); _actor2.postInit(); _actor2.setup(3260, 2, 1); _actor2.setPosition(Common::Point(142, 63)); - _actor2.setDetails(3260, 3, 1, 5, 1, NULL); + _actor2.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL); _actor2.setAction(&_action2, &_actor2); _actor3.postInit(); _actor3.setup(3260, 2, 1); _actor3.setPosition(Common::Point(166, 54)); - _actor3.setDetails(3260, 3, 1, 5, 1, NULL); + _actor3.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL); _actor3.setAction(&_action3, &_actor3); _actor4.postInit(); _actor4.setup(3260, 2, 1); _actor4.setPosition(Common::Point(190, 46)); - _actor4.setDetails(3260, 3, 1, 5, 1, NULL); + _actor4.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL); _actor4.setAction(&_action4, &_actor4); _actor5.postInit(); _actor5.setup(3260, 2, 1); _actor5.setPosition(Common::Point(142, 39)); - _actor5.setDetails(3260, 3, 1, 5, 1, NULL); + _actor5.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL); _actor5.setAction(&_action5, &_actor5); _actor6.postInit(); _actor6.setup(3260, 2, 1); _actor6.setPosition(Common::Point(166, 30)); - _actor6.setDetails(3260, 3, 1, 5, 1, NULL); + _actor6.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL); _actor6.setAction(&_action6, &_actor6); _actor7.postInit(); _actor7.setup(3260, 2, 1); _actor7.setPosition(Common::Point(190, 22)); - _actor7.setDetails(3260, 3, 1, 5, 1, NULL); + _actor7.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL); _actor7.setAction(&_action7, &_actor7); _actor8.postInit(); _actor8.setup(3260, 2, 1); _actor8.setPosition(Common::Point(142, 14)); - _actor8.setDetails(3260, 3, 1, 5, 1, NULL); + _actor8.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL); _actor8.setAction(&_action8, &_actor8); _actor9.postInit(); _actor9.setup(3260, 2, 1); _actor9.setPosition(Common::Point(166, 6)); - _actor9.setDetails(3260, 3, 1, 5, 1, NULL); + _actor9.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL); _actor9.setAction(&_action9, &_actor9); _actor10.postInit(); @@ -1473,7 +1473,7 @@ void Scene3260::postInit(SceneObjectList *OwnerList) { _actor10.setPosition(Common::Point(265, 163)); _actor10.fixPriority(180); _actor10._numFrames = 10; - _actor10.setDetails(3260, 6, 1, 8, 1, NULL); + _actor10.setDetails(3260, 6, 1, 8, 1, (SceneItem *)NULL); _actor10.animate(ANIM_MODE_2, NULL); _actor11.postInit(); @@ -1482,7 +1482,7 @@ void Scene3260::postInit(SceneObjectList *OwnerList) { _actor11.fixPriority(120); _actor11.setAction(&_action11, &_actor11); _actor11._numFrames = 15; - _actor11.setDetails(3260, 6, 1, 8, 1, NULL); + _actor11.setDetails(3260, 6, 1, 8, 1, (SceneItem *)NULL); _actor11.animate(ANIM_MODE_2, NULL); _actor12.postInit(); @@ -1490,7 +1490,7 @@ void Scene3260::postInit(SceneObjectList *OwnerList) { _actor12.setPosition(Common::Point(274, 65)); _actor12.setAction(&_action12, &_actor12); _actor12._numFrames = 5; - _actor12.setDetails(3260, 9, 1, 11, 1, NULL); + _actor12.setDetails(3260, 9, 1, 11, 1, (SceneItem *)NULL); _actor12.animate(ANIM_MODE_2, NULL); _item1.setDetails(Rect(0, 0, 320, 200), 3260, 0, 1, 2, 1, NULL); @@ -1588,7 +1588,7 @@ void Scene3275::postInit(SceneObjectList *OwnerList) { _actor2.postInit(); _actor2.setup(3275, 2, 1); _actor2.setPosition(Common::Point(56, 118)); - _actor2.setDetails(3275, 3, 4, -1, 1, NULL); + _actor2.setDetails(3275, 3, 4, -1, 1, (SceneItem *)NULL); _item2.setDetails(Rect(153, 58, 200, 120), 3275, 6, 7, 8, 1, NULL); _item3.setDetails(Rect(275, 58, 331, 120), 3275, 6, 7, 8, 1, NULL); -- cgit v1.2.3