Skip to content

Commit

Permalink
TSAGE: Add explicit prefixes to NULL's used in various setDetails calls
Browse files Browse the repository at this point in the history
  • Loading branch information
@dreammaster
dreammaster committed Dec 27, 2011
1 parent 9fdba87 commit 539a42d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
14 changes: 7 additions & 7 deletions engines/tsage/blue_force/blueforce_scenes1.cpp
View file
Expand Up @@ -921,7 +921,7 @@ void Scene114::postInit(SceneObjectList *OwnerList) {
_lyle._moveDiff.x = 2;
_lyle._moveDiff.y = 1;
_lyle.hide();
_lyle.setDetails(114, 2, -1, -1, 1, NULL);
_lyle.setDetails(114, 2, -1, -1, 1, (SceneItem *)NULL);

_vechile.postInit();
if (BF_GLOBALS.getFlag(fWithLyle)) {
Expand Down Expand Up @@ -962,7 +962,7 @@ void Scene114::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player.enableControl();
}

_item1.setDetails(Rect(0, 0, 320, 200), 114, 3, -1, -1, 1, NULL);
_item1.setDetails(Rect(0, 0, 320, 200), 114, 3, -1, -1, 1, (SceneItem *)NULL);
}

void Scene114::signal() {
Expand Down Expand Up @@ -2830,7 +2830,7 @@ void Scene180::postInit(SceneObjectList *OwnerList) {
_vechile.setStrip(2);
_vechile.setPosition(Common::Point(262, 131));
_vechile.setZoom(65);
_vechile.setDetails(180, 33, 34, 35, 1, NULL);
_vechile.setDetails(180, 33, 34, 35, 1, (SceneItem *)NULL);

_object1.postInit();
_object1.setVisage(182);
Expand All @@ -2845,7 +2845,7 @@ void Scene180::postInit(SceneObjectList *OwnerList) {
BF_GLOBALS._player.disableControl();

_vechile.postInit();
_vechile.setDetails(180, 33, 34, 35, 1, NULL);
_vechile.setDetails(180, 33, 34, 35, 1, (SceneItem *)NULL);

_object1.postInit();

Expand Down Expand Up @@ -2997,7 +2997,7 @@ void Scene180::signal() {
BF_GLOBALS._player.disableControl();

_vechile.postInit();
_vechile.setDetails(180, 33, 34, 35, 1, NULL);
_vechile.setDetails(180, 33, 34, 35, 1, (SceneItem *)NULL);

_object1.postInit();
_sceneMode = 1801;
Expand Down Expand Up @@ -3249,7 +3249,7 @@ void Scene190::postInit(SceneObjectList *OwnerList) {
_flag.fixPriority(200);
_flag.setPosition(Common::Point(170, 31));
_flag.animate(ANIM_MODE_7, 0, NULL);
_flag.setDetails(190, 8, 26, 19, 1, NULL);
_flag.setDetails(190, 8, 26, 19, 1, (SceneItem *)NULL);

_fieldB52 = true;

Expand All @@ -3263,7 +3263,7 @@ void Scene190::postInit(SceneObjectList *OwnerList) {
_lyleCar.setVisage(444);
_lyleCar.setFrame(2);
_lyleCar.setPosition(Common::Point(54, 114));
_lyleCar.setDetails(190, -1, -1, -1, 1, NULL);
_lyleCar.setDetails(190, -1, -1, -1, 1, (SceneItem *)NULL);

switch (BF_GLOBALS._sceneManager._previousScene) {
case 300: {
Expand Down
30 changes: 15 additions & 15 deletions engines/tsage/blue_force/blueforce_scenes2.cpp
View file
Expand Up @@ -983,17 +983,17 @@ void Scene270::postInit(SceneObjectList *OwnerList) {
_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);
_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);
_object3.setDetails(270, 12, 13, 14, 1, (SceneItem *)NULL);
_laura.setDetails(270, 15, -1, -1, 1, (SceneItem *)NULL);
_skip.setDetails(270, 14, -1, -1, 1, (SceneItem *)NULL);
_lyle.setDetails(270, 34, 35, 36, 1, (SceneItem *)NULL);
_tv.setDetails(270, 3, 4, 5, 1, (SceneItem *)NULL);
_fireplace.setDetails(270, 6, 7, 8, 1, (SceneItem *)NULL);

if ((BF_GLOBALS._sceneManager._previousScene == 710) && (BF_GLOBALS._bookmark == bTalkedToGrannyAboutSkipsCard)) {
_grandma.setDetails(270, 15, 16, 17, 1, NULL);
_grandma.setDetails(270, 15, 16, 17, 1, (SceneItem *)NULL);
} else {
_grandma.setDetails(270, 40, 16, 17, 1, NULL);
_grandma.setDetails(270, 40, 16, 17, 1, (SceneItem *)NULL);
}

_afgan.setDetails(4, 270, 27, 28, 29, 1);
Expand Down Expand Up @@ -1420,13 +1420,13 @@ void Scene271::postInit(SceneObjectList *OwnerList) {
_object5.hide();

_item5.setDetails(Rect(0, 56, 56, 130), 270, 9, 10, 11, 1, NULL);
_object6.setDetails(270, 12, 13, 14, 1, NULL);
_object7.setDetails(270, 15, -1, -1, 1, NULL);
_object8.setDetails(270, 14, -1, -1, 1, NULL);
_object11.setDetails(270, -1, -1, -1, 1, NULL);
_tv.setDetails(270, 3, 4, 5, 1, NULL);
_object10.setDetails(270, 6, 7, 8, 1, NULL);
_object12.setDetails(270, 15, 16, 17, 1, NULL);
_object6.setDetails(270, 12, 13, 14, 1, (SceneItem *)NULL);
_object7.setDetails(270, 15, -1, -1, 1, (SceneItem *)NULL);
_object8.setDetails(270, 14, -1, -1, 1, (SceneItem *)NULL);
_object11.setDetails(270, -1, -1, -1, 1, (SceneItem *)NULL);
_tv.setDetails(270, 3, 4, 5, 1, (SceneItem *)NULL);
_object10.setDetails(270, 6, 7, 8, 1, (SceneItem *)NULL);
_object12.setDetails(270, 15, 16, 17, 1, (SceneItem *)NULL);
_item3.setDetails(4, 270, 27, 28, 29, 1);
_item1.setDetails(1, 270, 18, 19, 20, 1);
_item6.setDetails(Rect(278, 50, 318, 72), 270, 21, 22, 23, 1, NULL);
Expand Down

0 comments on commit 539a42d

Please sign in to comment.