From 5d195fe3294e782259922425ffac445cf15ab87c Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 27 Dec 2011 20:57:50 +1100 Subject: TSAGE: Added explicit prefixes to more NULL's used in setDetails calls --- engines/tsage/blue_force/blueforce_scenes3.cpp | 46 +++++++++++++------------- engines/tsage/blue_force/blueforce_scenes4.cpp | 24 +++++++------- engines/tsage/blue_force/blueforce_scenes5.cpp | 38 ++++++++++----------- engines/tsage/blue_force/blueforce_scenes6.cpp | 12 +++---- engines/tsage/blue_force/blueforce_scenes7.cpp | 8 ++--- engines/tsage/blue_force/blueforce_scenes8.cpp | 42 +++++++++++------------ engines/tsage/blue_force/blueforce_scenes9.cpp | 24 +++++++------- 7 files changed, 97 insertions(+), 97 deletions(-) (limited to 'engines') diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp index a63f45d8df..8955199286 100644 --- a/engines/tsage/blue_force/blueforce_scenes3.cpp +++ b/engines/tsage/blue_force/blueforce_scenes3.cpp @@ -269,20 +269,20 @@ void Scene300::postInit(SceneObjectList *OwnerList) { _object17.setVisage(301); _object17.setStrip(1); _object17.setPosition(Common::Point(87, 88)); - _object17.setDetails(300, 11, 13, 2, 1, NULL); + _object17.setDetails(300, 11, 13, 2, 1, (SceneItem *)NULL); _object18.postInit(); _object18.setVisage(301); _object18.setStrip(1); _object18.setPosition(Common::Point(137, 92)); - _object18.setDetails(300, 11, 13, 3, 1, NULL); + _object18.setDetails(300, 11, 13, 3, 1, (SceneItem *)NULL); } _object19.postInit(); _object19.setVisage(301); _object19.setStrip(1); _object19.setPosition(Common::Point(175, 99)); - _object19.setDetails(300, 11, 13, 34, 1, NULL); + _object19.setDetails(300, 11, 13, 34, 1, (SceneItem *)NULL); _object11.postInit(); _object11.setVisage(301); @@ -1015,7 +1015,7 @@ void Scene315::postInit(SceneObjectList *OwnerList) { _atfMemo.setStrip(4); _atfMemo.setFrame(4); _atfMemo.fixPriority(82); - _atfMemo.setDetails(315, -1, -1, -1, 1, NULL); + _atfMemo.setDetails(315, -1, -1, -1, 1, (SceneItem *)NULL); } if (BF_GLOBALS._dayNumber == 1) { @@ -1026,7 +1026,7 @@ void Scene315::postInit(SceneObjectList *OwnerList) { _bulletinMemo.setStrip(4); _bulletinMemo.setFrame(2); _bulletinMemo.fixPriority(82); - _bulletinMemo.setDetails(315, -1, -1, -1, 1, NULL); + _bulletinMemo.setDetails(315, -1, -1, -1, 1, (SceneItem *)NULL); } } else if ((BF_INVENTORY._daNote._sceneNumber != 1) && (BF_GLOBALS._dayNumber < 3)) { _object2.postInit(); @@ -1035,7 +1035,7 @@ void Scene315::postInit(SceneObjectList *OwnerList) { _object2.setFrame(2); _object2.setPosition(Common::Point(304, 31)); _object2.fixPriority(70); - _object2.setDetails(315, 3, 4, -1, 1, NULL); + _object2.setDetails(315, 3, 4, -1, 1, (SceneItem *)NULL); } _sutterSlot.setDetails(12, 315, 35, -1, 36, 1); @@ -2686,7 +2686,7 @@ void Scene350::postInit(SceneObjectList *OwnerList) { _harrison.setObjectWrapper(new SceneObjectWrapper()); _harrison.animate(ANIM_MODE_1, NULL); _harrison.changeZoom(-1); - _harrison.setDetails(350, 12, 13, 14, 1, NULL); + _harrison.setDetails(350, 12, 13, 14, 1, (SceneItem *)NULL); _harrison._moveDiff = Common::Point(2, 1); _stripManager.addSpeaker(&_harrisonSpeaker); @@ -3586,7 +3586,7 @@ void Scene355::postInit(SceneObjectList *OwnerList) { _lyle.setStrip(1); _lyle.setAction(&_action1); _lyle._flag = BF_GLOBALS.getFlag(fTookTrailerAmmo) ? 1 : 0; - _lyle.setDetails(355, 40, 42, 41, 1, NULL); + _lyle.setDetails(355, 40, 42, 41, 1, (SceneItem *)NULL); } if ((BF_INVENTORY.getObjectScene(INV_RAGS) == 0) && (BF_INVENTORY.getObjectScene(INV_JAR) == 0) && @@ -3671,7 +3671,7 @@ void Scene355::postInit(SceneObjectList *OwnerList) { } _item3._sceneRegionId = 18; - _harrison.setDetails(355, 18, 20, 19, 1, NULL); + _harrison.setDetails(355, 18, 20, 19, 1, (SceneItem *)NULL); _item6.setDetails(10, 355, 2, -1, 14, 1); _item7.setDetails(11, 355, 3, -1, 15, 1); _item8.setDetails(12, 355, 4, -1, 8, 1); @@ -4944,7 +4944,7 @@ void Scene370::signal() { case 3: break; case 3707: - _object5.setDetails(370, 6, -1, 7, 1, NULL); + _object5.setDetails(370, 6, -1, 7, 1, (SceneItem *)NULL); BF_GLOBALS._sceneItems.push_back(&_object5); // Deliberate fall-through case 3700: @@ -5138,7 +5138,7 @@ void Scene380::postInit(SceneObjectList *OwnerList) { _door.setVisage(380); _door.setStrip(4); _door.setPosition(Common::Point(132, 66)); - _door.setDetails(380, 12, 13, -1, 1, NULL); + _door.setDetails(380, 12, 13, -1, 1, (SceneItem *)NULL); BF_GLOBALS._player.postInit(); BF_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper()); @@ -5153,7 +5153,7 @@ void Scene380::postInit(SceneObjectList *OwnerList) { // Show vechile as car _vechile.setStrip(3); _vechile.setPosition(Common::Point(273, 125)); - _vechile.setDetails(580, 2, 3, -1, 1, NULL); + _vechile.setDetails(580, 2, 3, -1, 1, (SceneItem *)NULL); BF_GLOBALS._player.setVisage(129); BF_GLOBALS._walkRegions.disableRegion(12); @@ -5166,14 +5166,14 @@ void Scene380::postInit(SceneObjectList *OwnerList) { } else if (BF_GLOBALS.getFlag(onDuty)) { // Show on duty motorcycle _vechile.setStrip(2); - _vechile.setDetails(300, 11, 13, -1, 1, NULL); + _vechile.setDetails(300, 11, 13, -1, 1, (SceneItem *)NULL); _vechile.setPosition(Common::Point(252, 115)); BF_GLOBALS._player.setVisage(1341); } else { // Show off duty motorcycle _vechile.setStrip(1); - _vechile.setDetails(580, 0, 1, -1, 1, NULL); + _vechile.setDetails(580, 0, 1, -1, 1, (SceneItem *)NULL); _vechile.setPosition(Common::Point(249, 110)); BF_GLOBALS._player.setVisage(129); @@ -5479,19 +5479,19 @@ void Scene385::postInit(SceneObjectList *OwnerList) { _jim.setVisage(385); _jim.setStrip(3); _jim.setPosition(Common::Point(304, 113)); - _jim.setDetails(385, 1, -1, 2, 1, NULL); + _jim.setDetails(385, 1, -1, 2, 1, (SceneItem *)NULL); _dezi.postInit(); _dezi.setVisage(385); _dezi.setStrip(2); _dezi.setPosition(Common::Point(235, 93)); _dezi.fixPriority(120); - _dezi.setDetails(385, 3, -1, 2, 1, NULL); + _dezi.setDetails(385, 3, -1, 2, 1, (SceneItem *)NULL); _door.postInit(); _door.setVisage(385); _door.setPosition(Common::Point(107, 27)); - _door.setDetails(385, 0, -1, -1, 1, NULL); + _door.setDetails(385, 0, -1, -1, 1, (SceneItem *)NULL); BF_GLOBALS._walkRegions.disableRegion(6); @@ -5875,13 +5875,13 @@ void Scene390::postInit(TsAGE::SceneObjectList *OwnerList) { _object2.setPosition(Common::Point(38, 84)); _object2.fixPriority(50); _object2._flag = 0; - _object2.setDetails(390, 10, 17, 10, 1, NULL); + _object2.setDetails(390, 10, 17, 10, 1, (SceneItem *)NULL); _door.postInit(); _door.setVisage(390); _door.setStrip(2); _door.setPosition(Common::Point(151, 18)); - _door.setDetails(390, 5, -1, -1, 1, NULL); + _door.setDetails(390, 5, -1, -1, 1, (SceneItem *)NULL); BF_GLOBALS._player.disableControl(); _sceneMode = 3901; @@ -5892,7 +5892,7 @@ void Scene390::postInit(TsAGE::SceneObjectList *OwnerList) { _green.setVisage(392); _green.setPosition(Common::Point(241, 164)); _green.fixPriority(153); - _green.setDetails(390, 12, -1, 13, 1, NULL); + _green.setDetails(390, 12, -1, 13, 1, (SceneItem *)NULL); _green._flag = 0; } @@ -5902,7 +5902,7 @@ void Scene390::postInit(TsAGE::SceneObjectList *OwnerList) { _gangMember1.setPosition(Common::Point(273, 169)); _gangMember1.fixPriority(152); _gangMember1._flag = 0; - _gangMember1.setDetails(390, 19, -1, 20, 1, NULL); + _gangMember1.setDetails(390, 19, -1, 20, 1, (SceneItem *)NULL); _gangMember2.postInit(); _gangMember2.setVisage(396); @@ -5910,7 +5910,7 @@ void Scene390::postInit(TsAGE::SceneObjectList *OwnerList) { _gangMember2.setPosition(Common::Point(241, 153)); _gangMember2.fixPriority(152); _gangMember2._flag = 0; - _gangMember2.setDetails(390, 19, -1, 20, 1, NULL); + _gangMember2.setDetails(390, 19, -1, 20, 1, (SceneItem *)NULL); } _item1.setDetails(Rect(22, 40, 77, 67), 390, 0, -1, 1, 1, NULL); @@ -5944,7 +5944,7 @@ void Scene390::signal() { _object3.setVisage(390); _object3.setPosition(Common::Point(250, 60)); _object3.fixPriority(255); - _object3.setDetails(390, 8, -1, 9, 2, NULL); + _object3.setDetails(390, 8, -1, 9, 2, (SceneItem *)NULL); BF_GLOBALS._player.enableControl(); break; diff --git a/engines/tsage/blue_force/blueforce_scenes4.cpp b/engines/tsage/blue_force/blueforce_scenes4.cpp index deff4f2518..e966daf34e 100644 --- a/engines/tsage/blue_force/blueforce_scenes4.cpp +++ b/engines/tsage/blue_force/blueforce_scenes4.cpp @@ -547,13 +547,13 @@ void Scene410::postInit(SceneObjectList *OwnerList) { _passenger.setVisage(415); _passenger.setStrip(1); _passenger.setPosition(Common::Point(278, 92)); - _passenger.setDetails(410, 4, -1, 5, 1, NULL); + _passenger.setDetails(410, 4, -1, 5, 1, (SceneItem *)NULL); _driver.postInit(); _driver.setVisage(416); _driver.setStrip(2); _driver.setPosition(Common::Point(244, 85)); - _driver.setDetails(410, 6, -1, 7, 1, NULL); + _driver.setDetails(410, 6, -1, 7, 1, (SceneItem *)NULL); _driver.changeZoom(-1); _object5.postInit(); @@ -583,13 +583,13 @@ void Scene410::postInit(SceneObjectList *OwnerList) { _harrison.setVisage(343); _harrison.setObjectWrapper(new SceneObjectWrapper()); _harrison.animate(ANIM_MODE_1, NULL); - _harrison.setDetails(350, 12, 13, 14, 1, NULL); + _harrison.setDetails(350, 12, 13, 14, 1, (SceneItem *)NULL); _harrison.setPosition(Common::Point(97, 185)); _harrison.changeZoom(-1); _patrolCar.postInit(); _patrolCar.setVisage(410); - _patrolCar.setDetails(410, 8, 9, 10, 1, NULL); + _patrolCar.setDetails(410, 8, 9, 10, 1, (SceneItem *)NULL); _patrolCar.fixPriority(148); _patrolCar.setPosition(Common::Point(39, 168)); @@ -640,7 +640,7 @@ void Scene410::postInit(SceneObjectList *OwnerList) { _harrison.setVisage(343); _harrison.setObjectWrapper(new SceneObjectWrapper()); _harrison.animate(ANIM_MODE_1, NULL); - _harrison.setDetails(350, 12, 13, 14, 1, NULL); + _harrison.setDetails(350, 12, 13, 14, 1, (SceneItem *)NULL); BF_GLOBALS._sceneItems.addBefore(&_driver, &_harrison); _harrison.setPosition(Common::Point(-10, 124)); @@ -648,7 +648,7 @@ void Scene410::postInit(SceneObjectList *OwnerList) { _patrolCar.postInit(); _patrolCar.setVisage(410); - _patrolCar.setDetails(410, 8, 9, 10, 1, NULL); + _patrolCar.setDetails(410, 8, 9, 10, 1, (SceneItem *)NULL); _patrolCar.fixPriority(148); if (_field1FC4) { @@ -1076,7 +1076,7 @@ void Scene415::postInit(SceneObjectList *OwnerList) { _dashDrawer.setVisage(411); _dashDrawer.setStrip(3); _dashDrawer.setPosition(Common::Point(151, 97)); - _dashDrawer.setDetails(415, 22, -1, -1, 1, NULL); + _dashDrawer.setDetails(415, 22, -1, -1, 1, (SceneItem *)NULL); _animatedSeat.postInit(); _animatedSeat.setVisage(419); @@ -1140,7 +1140,7 @@ void Scene415::showBullets() { _theBullets.setFrame(2); _theBullets.setPosition(Common::Point(184, 86)); _theBullets.fixPriority(105); - _theBullets.setDetails(415, 16, 17, 18, 1, NULL); + _theBullets.setDetails(415, 16, 17, 18, 1, (SceneItem *)NULL); BF_GLOBALS._sceneItems.remove(&_theBullets); BF_GLOBALS._sceneItems.push_front(&_theBullets); } @@ -1158,7 +1158,7 @@ void Scene415::showGunAndWig() { _gunAndWig.setFrame(2); _gunAndWig.setPosition(Common::Point(159, 88)); _gunAndWig.fixPriority(105); - _gunAndWig.setDetails(415, 13, 14, 15, 1, NULL); + _gunAndWig.setDetails(415, 13, 14, 15, 1, (SceneItem *)NULL); BF_GLOBALS._sceneItems.remove(&_gunAndWig); BF_GLOBALS._sceneItems.push_front(&_gunAndWig); @@ -1559,13 +1559,13 @@ void Scene450::postInit(SceneObjectList *OwnerList) { _door.setVisage(450); _door.setStrip(2); _door.setPosition(Common::Point(72, 80)); - _door.setDetails(450, 15, -1, 13, 1, NULL); + _door.setDetails(450, 15, -1, 13, 1, (SceneItem *)NULL); _counterDoor.postInit(); _counterDoor.setVisage(450); _counterDoor.setPosition(Common::Point(39, 104)); _counterDoor.fixPriority(100); - _counterDoor.setDetails(450, 12, -1, 13, 1, NULL); + _counterDoor.setDetails(450, 12, -1, 13, 1, (SceneItem *)NULL); if (BF_GLOBALS._dayNumber != 3) { _pinBoy.postInit(); @@ -1598,7 +1598,7 @@ void Scene450::postInit(SceneObjectList *OwnerList) { _object2.setPosition(Common::Point(-30, 126)); ADD_MOVER_NULL(_object2, 27, 126); _object2.changeZoom(-1); - _object2.setDetails(450, 2, 18, 3, 1, NULL); + _object2.setDetails(450, 2, 18, 3, 1, (SceneItem *)NULL); BF_GLOBALS._walkRegions.disableRegion(4); diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp index 7a250e2233..692e142f55 100644 --- a/engines/tsage/blue_force/blueforce_scenes5.cpp +++ b/engines/tsage/blue_force/blueforce_scenes5.cpp @@ -201,7 +201,7 @@ void Scene550::postInit(SceneObjectList *OwnerList) { _lyle.postInit(); _lyle.setVisage(835); _lyle.setPosition(Common::Point(139, 83)); - _lyle.setDetails(550, 29, 30, 31, 1, NULL); + _lyle.setDetails(550, 29, 30, 31, 1, (SceneItem *)NULL); _lyle.setStrip(8); BF_GLOBALS._player.setVisage(303); @@ -702,14 +702,14 @@ void Scene551::postInit(SceneObjectList *OwnerList) { _object13.setStrip(2); _object13.setPosition(Common::Point(29, 92)); _object13.fixPriority(82); - _object13.setDetails(550, 8, -1, 9, 1, NULL); + _object13.setDetails(550, 8, -1, 9, 1, (SceneItem *)NULL); if (BF_GLOBALS.getFlag(didDrunk)) { _drunk._flag = 3; _drunk.setStrip(3); _object12.show(); - _object12.setDetails(550, 25, -1, 26, 1, NULL); + _object12.setDetails(550, 25, -1, 26, 1, (SceneItem *)NULL); BF_GLOBALS._sceneItems.push_front(&_object12); _harrison.postInit(); @@ -733,7 +733,7 @@ void Scene551::postInit(SceneObjectList *OwnerList) { _object11.setFrame(2); _object11.setPosition(Common::Point(116, 84)); _object11.fixPriority(77); - _object11.setDetails(550, 32, -1, 10, 1, NULL); + _object11.setDetails(550, 32, -1, 10, 1, (SceneItem *)NULL); _drunkStanding.postInit(); _drunkStanding._flag = 0; @@ -764,7 +764,7 @@ void Scene551::postInit(SceneObjectList *OwnerList) { _patrolCarTrunk.setFrame(1); _patrolCarTrunk.setPosition(Common::Point(149, 69)); _patrolCarTrunk.fixPriority(79); - _patrolCarTrunk.setDetails(550, 18, -1, 9, 1, NULL); + _patrolCarTrunk.setDetails(550, 18, -1, 9, 1, (SceneItem *)NULL); _object11.postInit(); _object11.setVisage(550); @@ -772,7 +772,7 @@ void Scene551::postInit(SceneObjectList *OwnerList) { _object11.setFrame(2); _object11.setPosition(Common::Point(116, 84)); _object11.fixPriority(77); - _object11.setDetails(550, 32, -1, 10, 1, NULL); + _object11.setDetails(550, 32, -1, 10, 1, (SceneItem *)NULL); _drunkStanding.postInit(); _drunkStanding._flag = 0; @@ -842,7 +842,7 @@ void Scene551::signal() { ADD_PLAYER_MOVER_NULL(_harrison, 88, 91); _object12.show(); - _object12.setDetails(550, 25, -1, 26, 1, NULL); + _object12.setDetails(550, 25, -1, 26, 1, (SceneItem *)NULL); BF_GLOBALS._sceneItems.push_front(&_object12); BF_GLOBALS._player.enableControl(); @@ -1064,7 +1064,7 @@ void Scene560::SafeInset::postInit(SceneObjectList *OwnerList) { scene->_nickel.setFrame(3); scene->_nickel.fixPriority(252); scene->_nickel.setPosition(Common::Point(181, 140)); - scene->_nickel.setDetails(560, 47, 48, -1, 1, NULL); + scene->_nickel.setDetails(560, 47, 48, -1, 1, (SceneItem *)NULL); BF_GLOBALS._sceneItems.remove(&scene->_nickel); BF_GLOBALS._sceneItems.push_front(&scene->_nickel); } @@ -1201,7 +1201,7 @@ void Scene560::SafeInset::signal() { scene->_nickel.setFrame(3); scene->_nickel.fixPriority(252); scene->_nickel.setPosition(Common::Point(181, 140)); - scene->_nickel.setDetails(560, 47, 48, -1, 1, NULL); + scene->_nickel.setDetails(560, 47, 48, -1, 1, (SceneItem *)NULL); BF_GLOBALS._sceneItems.remove(&scene->_nickel); BF_GLOBALS._sceneItems.push_front(&scene->_nickel); } @@ -1405,7 +1405,7 @@ void Scene560::postInit(SceneObjectList *OwnerList) { _box.setStrip(4); _box.setFrame(1); _box.setPosition(Common::Point(295, 37)); - _box.setDetails(560, 41, 42, -1, 1, NULL); + _box.setDetails(560, 41, 42, -1, 1, (SceneItem *)NULL); } _deskChair.postInit(); @@ -1454,7 +1454,7 @@ void Scene560::postInit(SceneObjectList *OwnerList) { } _computer.setDetails(Rect(16, 77, 58, 107), 560, 2, -1, -1, 1, NULL); - _deskChair.setDetails(560, 3, -1, -1, 1, NULL); + _deskChair.setDetails(560, 3, -1, -1, 1, (SceneItem *)NULL); _chair.setDetails(Rect(163, 64, 196, 102), 560, 13, 25, 36, 1, NULL); _lamp.setDetails(Rect(197, 43, 214, 56), 560, 7, 19, 30, 1, NULL); _item4.setDetails(Rect(121, 18, 156, 54), 560, 8, 20, 31, 1, NULL); @@ -2039,7 +2039,7 @@ void Scene570::postInit(SceneObjectList *OwnerList) { _powerSwitch.setStrip(4); _powerSwitch.setFrame(1); _powerSwitch.setPosition(Common::Point(163, 131)); - _powerSwitch.setDetails(570, 1, 15, -1, 1, NULL); + _powerSwitch.setDetails(570, 1, 15, -1, 1, (SceneItem *)NULL); _floppyDrive.setDetails(Rect(258, 111, 303, 120), 570, 0, 15, -1, 1, NULL); _item11.setDetails(0, 570, 15, 15, 15, 1); @@ -2070,7 +2070,7 @@ void Scene570::signal() { _printerIcon.setFrame(3); _printerIcon.setPosition(Common::Point(172, 71)); _printerIcon.fixPriority(2); - _printerIcon.setDetails(570, 14, 15, -1, 2, NULL); + _printerIcon.setDetails(570, 14, 15, -1, 2, (SceneItem *)NULL); _iconManager.setup(2); _folder1.setDetails(1, 1, 0, 2, SCENE570_C_DRIVE); @@ -2201,7 +2201,7 @@ void Scene580::postInit(SceneObjectList *OwnerList) { _door.setStrip(4); _door.setPosition(Common::Point(168, 41)); _door.hide(); - _door.setDetails(580, 5, -1, -1, 1, NULL); + _door.setDetails(580, 5, -1, -1, 1, (SceneItem *)NULL); _vechile.postInit(); _vechile.setVisage(580); @@ -2219,7 +2219,7 @@ void Scene580::postInit(SceneObjectList *OwnerList) { _vechile.changeZoom(90); _vechile.setStrip(3); _vechile.setPosition(Common::Point(165, 76)); - _vechile.setDetails(580, 2, 3, -1, 1, NULL); + _vechile.setDetails(580, 2, 3, -1, 1, (SceneItem *)NULL); BF_GLOBALS._player.setVisage(303); @@ -2233,13 +2233,13 @@ void Scene580::postInit(SceneObjectList *OwnerList) { if (BF_GLOBALS.getFlag(onDuty)) { _vechile.setStrip(1); _vechile.setFrame(2); - _vechile.setDetails(300, 11, 13, -1, 1, NULL); + _vechile.setDetails(300, 11, 13, -1, 1, (SceneItem *)NULL); BF_GLOBALS._player.setVisage(304); } else { _vechile.setStrip(2); _vechile.setFrame(3); - _vechile.setDetails(580, 0, 1, -1, 1, NULL); + _vechile.setDetails(580, 0, 1, -1, 1, (SceneItem *)NULL); BF_GLOBALS._player.setVisage(303); } @@ -2468,12 +2468,12 @@ void Scene590::postInit(SceneObjectList *OwnerList) { _skip.postInit(); _skip.setVisage(693); _skip.setPosition(Common::Point(271, 117)); - _skip.setDetails(590, 26, -1, 27, 1, NULL); + _skip.setDetails(590, 26, -1, 27, 1, (SceneItem *)NULL); _laura.postInit(); _laura.setVisage(692); _laura.setPosition(Common::Point(248, 115)); - _laura.setDetails(590, 24, -1, 25, 1, NULL); + _laura.setDetails(590, 24, -1, 25, 1, (SceneItem *)NULL); } } diff --git a/engines/tsage/blue_force/blueforce_scenes6.cpp b/engines/tsage/blue_force/blueforce_scenes6.cpp index 5fb1b562e0..e5e7c71bef 100644 --- a/engines/tsage/blue_force/blueforce_scenes6.cpp +++ b/engines/tsage/blue_force/blueforce_scenes6.cpp @@ -410,7 +410,7 @@ bool Scene690::Object2::startAction(CursorType action, Event &event) { scene->_object6.postInit(); scene->_object6.hide(); scene->_object6.fixPriority(1); - scene->_object6.setDetails(690, 21, 17, 23, 1, NULL); + scene->_object6.setDetails(690, 21, 17, 23, 1, (SceneItem *)NULL); BF_GLOBALS._player.disableControl(); scene->_sceneMode = 6902; @@ -447,30 +447,30 @@ void Scene690::postInit(SceneObjectList *OwnerList) { _object1.setStrip2(2); _object1.fixPriority(188); _object1.setPosition(Common::Point(50, 166)); - _object1.setDetails(690, 4, 17, 26, 1, NULL); + _object1.setDetails(690, 4, 17, 26, 1, (SceneItem *)NULL); _object3.postInit(); _object3.setVisage(690); _object3.fixPriority(100); _object3.setPosition(Common::Point(238, 125)); - _object3.setDetails(690, 7, 17, 28, 1, NULL); + _object3.setDetails(690, 7, 17, 28, 1, (SceneItem *)NULL); _object2.postInit(); _object2.setVisage(694); _object2.setStrip2(3); _object2.fixPriority(125); _object2.setPosition(Common::Point(100, 134)); - _object2.setDetails(690, 12, -1, 11, 1, NULL); + _object2.setDetails(690, 12, -1, 11, 1, (SceneItem *)NULL); BF_GLOBALS._player.postInit(); BF_GLOBALS._player.disableControl(); BF_GLOBALS._player._moveDiff.x = 8; _object4.postInit(); - _object4.setDetails(690, 13, -1, -1, 1, NULL); + _object4.setDetails(690, 13, -1, -1, 1, (SceneItem *)NULL); _object5.postInit(); - _object5.setDetails(690, 14, -1, -1, 1, NULL); + _object5.setDetails(690, 14, -1, -1, 1, (SceneItem *)NULL); _sceneMode = 6903; setAction(&_sequenceManager, this, 6903, &BF_GLOBALS._player, &_object3, &_object4, &_object5, NULL); diff --git a/engines/tsage/blue_force/blueforce_scenes7.cpp b/engines/tsage/blue_force/blueforce_scenes7.cpp index 7b84e3ccdd..bb29ad1f34 100644 --- a/engines/tsage/blue_force/blueforce_scenes7.cpp +++ b/engines/tsage/blue_force/blueforce_scenes7.cpp @@ -172,10 +172,10 @@ void Scene710::postInit(SceneObjectList *OwnerList) { _stick.animate(ANIM_MODE_2, NULL); _stick.setPosition(Common::Point(650, 160)); _stick._moveDiff.x = 16; - _stick.setDetails(710, 4, -1, -1, 1, NULL); - _laura.setDetails(710, 2, -1, -1, 1, NULL); - _kid.setDetails(710, 6, -1, -1, 1, NULL); - _dog.setDetails(710, 0, -1, -1, 1, NULL); + _stick.setDetails(710, 4, -1, -1, 1, (SceneItem *)NULL); + _laura.setDetails(710, 2, -1, -1, 1, (SceneItem *)NULL); + _kid.setDetails(710, 6, -1, -1, 1, (SceneItem *)NULL); + _dog.setDetails(710, 0, -1, -1, 1, (SceneItem *)NULL); _item1.setDetails(Rect(555, 68, 583, 101), 710, 7, 23, -1, 1, NULL); _item2.setDetails(Rect(583, 46, 611, 78), 710, 7, 23, -1, 1, NULL); diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp index 32cd376891..ceee748374 100644 --- a/engines/tsage/blue_force/blueforce_scenes8.cpp +++ b/engines/tsage/blue_force/blueforce_scenes8.cpp @@ -1672,12 +1672,12 @@ void Scene830::postInit(SceneObjectList *OwnerList) { _rentalBoat.setStrip(1); _rentalBoat.setPosition(Common::Point(271, 146)); _rentalBoat.fixPriority(90); - _rentalBoat.setDetails(830, 0, 1, 2, 1, NULL); + _rentalBoat.setDetails(830, 0, 1, 2, 1, (SceneItem *)NULL); } _door.postInit(); _door.setVisage(830); - _door.setDetails(830, 3, 4, -1, 1, NULL); + _door.setDetails(830, 3, 4, -1, 1, (SceneItem *)NULL); _door.setStrip((BF_GLOBALS._dayNumber == 2) ? 4 : 3); _door.setPosition(Common::Point(182, 97)); @@ -1702,7 +1702,7 @@ void Scene830::postInit(SceneObjectList *OwnerList) { _object5.setStrip(2); _object5.setFrame(2); _object5.setPosition(Common::Point(126, 133)); - _object5.setDetails(830, 7, 8, -1, 1, NULL); + _object5.setDetails(830, 7, 8, -1, 1, (SceneItem *)NULL); } break; case 5: @@ -1718,7 +1718,7 @@ void Scene830::postInit(SceneObjectList *OwnerList) { _lyle.setStrip(4); _lyle.setPosition(Common::Point(180, 154)); _lyle._moveDiff = Common::Point(2, 0); - _lyle.setDetails(830, 28, -1, 29, 1, NULL); + _lyle.setDetails(830, 28, -1, 29, 1, (SceneItem *)NULL); _field18AC = 1; } @@ -1950,7 +1950,7 @@ void Scene840::BoatKeysInset::postInit(SceneObjectList *OwnerList) { _rentalKeys.setFrame(3); _rentalKeys.setPosition(Common::Point(120, 132)); _rentalKeys.fixPriority(255); - _rentalKeys.setDetails(840, 52, 8, -1, 2, NULL); + _rentalKeys.setDetails(840, 52, 8, -1, 2, (SceneItem *)NULL); } if (BF_INVENTORY.getObjectScene(INV_WAVE_KEYS) != 1) { @@ -1960,7 +1960,7 @@ void Scene840::BoatKeysInset::postInit(SceneObjectList *OwnerList) { _waveKeys.setFrame(2); _waveKeys.setPosition(Common::Point(201, 91)); _waveKeys.fixPriority(255); - _waveKeys.setDetails(840, 53, 8, -1, 2, NULL); + _waveKeys.setDetails(840, 53, 8, -1, 2, (SceneItem *)NULL); } _v1B4 = _v1B6 = 0; @@ -2035,7 +2035,7 @@ bool Scene840::BoatKeysInset::startAction(CursorType action, Event &event) { _rentalKeys.setFrame(3); _rentalKeys.setPosition(Common::Point(120, 132)); _rentalKeys.fixPriority(255); - _rentalKeys.setDetails(840, 52, 8, -1, 2, NULL); + _rentalKeys.setDetails(840, 52, 8, -1, 2, (SceneItem *)NULL); } if (BF_INVENTORY.getObjectScene(INV_WAVE_KEYS) == 1) { @@ -2046,7 +2046,7 @@ bool Scene840::BoatKeysInset::startAction(CursorType action, Event &event) { _waveKeys.setFrame(2); _waveKeys.setPosition(Common::Point(201, 91)); _waveKeys.fixPriority(255); - _waveKeys.setDetails(840, 53, 8, -1, 2, NULL); + _waveKeys.setDetails(840, 53, 8, -1, 2, (SceneItem *)NULL); } BF_INVENTORY.setObjectScene(INV_WAVE_KEYS, 0); @@ -2259,7 +2259,7 @@ void Scene840::postInit(SceneObjectList *OwnerList) { _doors.setVisage(840); _doors.setStrip(3); _doors.setPosition(Common::Point(157, 81)); - _doors.setDetails(840, 0, 1, 2, 1, NULL); + _doors.setDetails(840, 0, 1, 2, 1, (SceneItem *)NULL); _carter.postInit(); _carter.setVisage(843); @@ -2279,7 +2279,7 @@ void Scene840::postInit(SceneObjectList *OwnerList) { _item10.setDetails(Rect(199, 56, 236, 80), 840, 24, 14, 12, 1, NULL); _item11.setDetails(Rect(256, 94, 319, 118), 840, 25, 15, 13, 1, NULL); _item18.setDetails(6, 840, 38, 39, 40, 1); - _carter.setDetails(840, 3, 4, 5, 1, NULL); + _carter.setDetails(840, 3, 4, 5, 1, (SceneItem *)NULL); _item8.setDetails(Rect(259, 4, 319, 87), 840, 22, 15, 13, 1, NULL); _item15.setDetails(2, 840, 32, 33, 34, 1); _coins.setDetails(3, 840, -1, 6, 7, 1); @@ -2295,7 +2295,7 @@ void Scene840::postInit(SceneObjectList *OwnerList) { _boatKeys.setFrame(1); _boatKeys.setPosition(Common::Point(250, 83)); _boatKeys.fixPriority(120); - _boatKeys.setDetails(840, -1, 8, 9, 2, NULL); + _boatKeys.setDetails(840, -1, 8, 9, 2, (SceneItem *)NULL); _field1AC0 = 1; } @@ -2387,7 +2387,7 @@ void Scene840::signal() { case 4: _sceneMode = 8403; _boatKeys.postInit(); - _boatKeys.setDetails(840, -1, 8, 9, 2, NULL); + _boatKeys.setDetails(840, -1, 8, 9, 2, (SceneItem *)NULL); setAction(&_sequenceManager1, this, 8403, &_carter, &_boatKeys, NULL); break; case 5: @@ -2679,7 +2679,7 @@ void Scene860::postInit(SceneObjectList *OwnerList) { _object2.setVisage(880); _object2.setPosition(Common::Point(196, 81)); BF_GLOBALS._sceneItems.push_back(&_object2); - _object2.setDetails(860, 0, 1, -1, 1, NULL); + _object2.setDetails(860, 0, 1, -1, 1, (SceneItem *)NULL); _object2.fixPriority(20); _neRect = Rect(0, 0, 0, 0); @@ -2876,7 +2876,7 @@ void Scene870::CrateInset::initContents() { _jar.setPosition(Common::Point(scene->_crateInset._position.x + 5, scene->_crateInset._position.y - 26)); _jar.fixPriority(251); - _jar.setDetails(870, 39, 40, 41, 1, NULL); + _jar.setDetails(870, 39, 40, 41, 1, (SceneItem *)NULL); BF_GLOBALS._sceneItems.remove(&_jar); BF_GLOBALS._sceneItems.push_front(&_jar); } @@ -2890,7 +2890,7 @@ void Scene870::CrateInset::initContents() { _rags.setPosition(Common::Point(scene->_crateInset._position.x - 18, scene->_crateInset._position.y - 18)); _rags.fixPriority(251); - _rags.setDetails(870, 42, 43, 44, 1, NULL); + _rags.setDetails(870, 42, 43, 44, 1, (SceneItem *)NULL); BF_GLOBALS._sceneItems.remove(&_rags); BF_GLOBALS._sceneItems.push_front(&_rags); } @@ -3063,7 +3063,7 @@ void Scene870::postInit(SceneObjectList *OwnerList) { _lyle.setObjectWrapper(new SceneObjectWrapper()); _lyle.animate(ANIM_MODE_1, NULL); _lyle._moveDiff = Common::Point(2, 1); - _lyle.setDetails(870, 27, 28, 29, 1, NULL); + _lyle.setDetails(870, 27, 28, 29, 1, (SceneItem *)NULL); } _yacht.postInit(); @@ -3071,7 +3071,7 @@ void Scene870::postInit(SceneObjectList *OwnerList) { _yacht.setStrip(4); _yacht.setFrame(4); _yacht.setPosition(Common::Point(232, 19)); - _yacht.setDetails(870, 30, 31, 32, 1, NULL); + _yacht.setDetails(870, 30, 31, 32, 1, (SceneItem *)NULL); if ((BF_INVENTORY.getObjectScene(INV_RAGS) == 0) && (BF_INVENTORY.getObjectScene(INV_FLARE) == 0) && (BF_INVENTORY.getObjectScene(INV_HANDCUFFS) == 355)) { @@ -3081,9 +3081,9 @@ void Scene870::postInit(SceneObjectList *OwnerList) { _green.setPosition(Common::Point(127, 109)); if (BF_GLOBALS._bookmark == bFinishedWGreen) { - _green.setDetails(870, 51, 54, 53, 1, NULL); + _green.setDetails(870, 51, 54, 53, 1, (SceneItem *)NULL); } else { - _green.setDetails(870, 51, 52, 53, 1, NULL); + _green.setDetails(870, 51, 52, 53, 1, (SceneItem *)NULL); } } } @@ -3358,11 +3358,11 @@ void Scene880::postInit(SceneObjectList *OwnerList) { _object2.postInit(); _object2.setVisage(880); _object2.setPosition(Common::Point(209, 76)); - _object2.setDetails(880, 4, 5, 6, 1, NULL); + _object2.setDetails(880, 4, 5, 6, 1, (SceneItem *)NULL); _object4.postInit(); _object4.setVisage(875); - _object4.setDetails(880, 7, -1, 9, 1, NULL); + _object4.setDetails(880, 7, -1, 9, 1, (SceneItem *)NULL); _object5.postInit(); _object5.setVisage(874); diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp index ea54bf6b1d..f5705eb471 100644 --- a/engines/tsage/blue_force/blueforce_scenes9.cpp +++ b/engines/tsage/blue_force/blueforce_scenes9.cpp @@ -442,7 +442,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) { _body.fixPriority(120); _body.setVisage(901); _body.setPosition(Common::Point(159,128)); - _body.setDetails(900, 15, 16, 17, ANIM_MODE_1, NULL); + _body.setDetails(900, 15, 16, 17, ANIM_MODE_1, (SceneItem *)NULL); } if (BF_GLOBALS._sceneManager._previousScene == 910) { _sceneBounds.moveTo(639, 0); @@ -465,7 +465,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) { _dog.setVisage(902); _dog.setPosition(Common::Point(845, 135)); _dog.fixPriority(122); - _dog.setDetails(900, 8, -1, 9, 1, NULL); + _dog.setDetails(900, 8, -1, 9, 1, (SceneItem *)NULL); if (_dog._flag == 0) { _dog.animate(ANIM_MODE_1, NULL); @@ -524,7 +524,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) { _lyle.postInit(); _lyle._moveDiff.y = 7; _lyle._flags |= OBJFLAG_CHECK_REGION; - _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, NULL); + _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL); _lyleHatSpeaker._xp = 210; _jakeJacketSpeaker._xp = 75; setAction(&_sequenceManager1, this, 9013, &BF_GLOBALS._player, &_lyle, NULL); @@ -537,7 +537,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) { _lyle.setPosition(Common::Point(780, 153)); _lyle._moveDiff.y = 7; _lyle._flags |= 0x1000; - _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, NULL); + _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL); _lyle.animate(ANIM_MODE_1, NULL); _lyle.setObjectWrapper(new SceneObjectWrapper()); } @@ -553,7 +553,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) { if (BF_GLOBALS.getFlag(fWithLyle)) { _lyle.postInit(); _lyle._flags |= 0x1000; - _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, NULL); + _lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL); setAction(&_sequenceManager1, this, 9014, &BF_GLOBALS._player, &_door, &_lyle, NULL); } else setAction(&_sequenceManager1, this, 9002, &BF_GLOBALS._player, &_door, NULL); @@ -2019,10 +2019,10 @@ void Scene910::postInit(SceneObjectList *OwnerList) { if (BF_GLOBALS._v4CEE2 == 0) _item16.setDetails(Rect(265, 18, 319, 102), 910, -1, -1, -1, 1, NULL); - _breakerBox.setDetails(910, 6, -1, -1, 1, NULL); + _breakerBox.setDetails(910, 6, -1, -1, 1, (SceneItem *)NULL); _item15.setDetails(Rect(0, 0, 320, 170), 910, 0, 1, 2, 1, NULL); - _yellowCord.setDetails(910, 52, 53, -1, 1, NULL); - _blackCord.setDetails(910, 54, 55, -1, 1, NULL); + _yellowCord.setDetails(910, 52, 53, -1, 1, (SceneItem *)NULL); + _blackCord.setDetails(910, 54, 55, -1, 1, (SceneItem *)NULL); _item2.setDetails(3, 910, 22, -1, 24, 1); _item4.setDetails(1, 910, 16, 17, 18, 1); _item8.setDetails(4, 910, 25, 26, 27, 1); @@ -2032,7 +2032,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) { _item9.setDetails(Rect(266, 39, 274, 70), 910, 43, 44, 45, 1, NULL); _item10.setDetails(Rect(276, 27, 288, 83), 910, 46, 47, 48, 1, NULL); _item11.setDetails(Rect(295, 42, 312, 87), 910, 49, 50, 51, 1, NULL); - _fakeWall.setDetails(910, 28, -1, 30, 1, NULL); + _fakeWall.setDetails(910, 28, -1, 30, 1, (SceneItem *)NULL); _item3.setDetails(7, 910, 59, 60, 61, 1); _item5.setDetails(2, 910, 19, 20, 21, 1); _backWall.setDetails(6, 910, 28, 29, 30, 1); @@ -2600,7 +2600,7 @@ void Scene910::signal() { BF_GLOBALS.setFlag(fBackupAt340); BF_GLOBALS._v4CEE2 = 4; _stuart.postInit(); - _nico.setDetails(910, 72, 73, 74, 3, NULL); + _nico.setDetails(910, 72, 73, 74, 3, (SceneItem *)NULL); _stuart.setDetails(910, 66, 67, 68, 5, &_nico); BF_GLOBALS._v4CEE8 = 0; _sceneMode = 9121; @@ -3358,14 +3358,14 @@ void Scene930::postInit(SceneObjectList *OwnerList) { _box.setVisage(930); _box.setStrip(1); _box.setPosition(Common::Point(223, 21)); - _box.setDetails(930, 66, 67, 68, 1, NULL); + _box.setDetails(930, 66, 67, 68, 1, (SceneItem *)NULL); } _boots.postInit(); _boots.setVisage(930); _boots.setStrip(2); _boots.setPosition(Common::Point(9, 161)); _boots.fixPriority(120); - _boots.setDetails(930, 62, 63, 64, 1, NULL); + _boots.setDetails(930, 62, 63, 64, 1, (SceneItem *)NULL); BF_GLOBALS._player.postInit(); BF_GLOBALS._player.setVisage(368); -- cgit v1.2.3