From 2bdb1ab5513887912fa42696c5943782c2ba9c8f Mon Sep 17 00:00:00 2001
From: uwabami <uwabami@localhost>
Date: Thu, 14 May 2020 18:47:12 +0200
Subject: [PATCH] several fixes and improvements

---
 src/game/behaviors/bub.inc.c                     | 4 ++++
 src/game/behaviors/butterfly.inc.c               | 2 --
 src/game/behaviors/fire_spitter.inc.c            | 4 ++++
 src/game/behaviors/lll_floating_wood_piece.inc.c | 6 ++++++
 src/game/behaviors/lll_rotating_hex_flame.inc.c  | 4 ++++
 src/game/obj_behaviors.c                         | 4 ++++
 6 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/game/behaviors/bub.inc.c b/src/game/behaviors/bub.inc.c
index e8e63096..7bf71690 100644
--- a/src/game/behaviors/bub.inc.c
+++ b/src/game/behaviors/bub.inc.c
@@ -8,11 +8,15 @@
 void bub_spawner_act_0(void) {
     s32 i;
     s32 sp18 = o->oBirdChirpChirpUnkF4;
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < 1500.0f) {
+#endif
         for (i = 0; i < sp18; i++)
             spawn_object(o, MODEL_BUB, bhvBub);
         o->oAction = 1;
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 void bub_spawner_act_1(void) {
diff --git a/src/game/behaviors/butterfly.inc.c b/src/game/behaviors/butterfly.inc.c
index 8c0e7145..d435d8d8 100644
--- a/src/game/behaviors/butterfly.inc.c
+++ b/src/game/behaviors/butterfly.inc.c
@@ -108,7 +108,5 @@ void bhv_butterfly_loop(void) {
             break;
     }
 
-#ifndef NODRAWINGDISTANCE
     set_object_visibility(o, 3000);
-#endif
 }
diff --git a/src/game/behaviors/fire_spitter.inc.c b/src/game/behaviors/fire_spitter.inc.c
index d64bcf7e..a703b03d 100644
--- a/src/game/behaviors/fire_spitter.inc.c
+++ b/src/game/behaviors/fire_spitter.inc.c
@@ -1,10 +1,14 @@
 
 static void fire_spitter_act_idle(void) {
     approach_f32_ptr(&o->header.gfx.scale[0], 0.2f, 0.002f);
+#ifndef NODRAWINGDISTANCE
     if (o->oTimer > 150 && o->oDistanceToMario < 800.0f && !(o->oMoveFlags & 0x00000078)) {
+#endif
         o->oAction = FIRE_SPITTER_ACT_SPIT_FIRE;
         o->oFireSpitterScaleVel = 0.05f;
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 static void fire_spitter_act_spit_fire(void) {
diff --git a/src/game/behaviors/lll_floating_wood_piece.inc.c b/src/game/behaviors/lll_floating_wood_piece.inc.c
index a484471c..fad31f3f 100644
--- a/src/game/behaviors/lll_floating_wood_piece.inc.c
+++ b/src/game/behaviors/lll_floating_wood_piece.inc.c
@@ -14,18 +14,24 @@ void bhv_lll_floating_wood_bridge_loop(void) {
     s32 i;
     switch (o->oAction) {
         case 0:
+#ifndef NODRAWINGDISTANCE
             if (o->oDistanceToMario < 2500.0f) {
+#endif
                 for (i = 1; i < 4; i++) {
                     sp3C = spawn_object_relative(0, (i - 2) * 300, 0, 0, o, MODEL_LLL_WOOD_BRIDGE,
                                                  bhvLllWoodPiece);
                     sp3C->oLllWoodPieceUnkF4 = i * 4096;
                 }
                 o->oAction = 1;
+#ifndef NODRAWINGDISTANCE
             }
+#endif
             break;
         case 1:
+#ifndef NODRAWINGDISTANCE
             if (o->oDistanceToMario > 2600.0f)
                 o->oAction = 2;
+#endif
             break;
         case 2:
             o->oAction = 0;
diff --git a/src/game/behaviors/lll_rotating_hex_flame.inc.c b/src/game/behaviors/lll_rotating_hex_flame.inc.c
index efabfca8..fc707330 100644
--- a/src/game/behaviors/lll_rotating_hex_flame.inc.c
+++ b/src/game/behaviors/lll_rotating_hex_flame.inc.c
@@ -30,7 +30,9 @@ void fire_bar_spawn_flames(s16 a0) {
 }
 
 void fire_bar_act_0(void) {
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < 3000.0f)
+#endif
         o->oAction = 1;
 }
 
@@ -45,8 +47,10 @@ void fire_bar_act_1(void) {
 void fire_bar_act_2(void) {
     o->oAngleVelYaw = -0x100;
     o->oMoveAngleYaw += o->oAngleVelYaw;
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario > 3200.0f)
         o->oAction = 3;
+#endif
 }
 
 void fire_bar_act_3(void) {
diff --git a/src/game/obj_behaviors.c b/src/game/obj_behaviors.c
index 0e2c7c86..68cebe5d 100644
--- a/src/game/obj_behaviors.c
+++ b/src/game/obj_behaviors.c
@@ -527,11 +527,15 @@ void set_object_visibility(struct Object *obj, s32 dist) {
     f32 objY = obj->oPosY;
     f32 objZ = obj->oPosZ;
 
+#ifndef NODRAWINGDISTANCE
     if (is_point_within_radius_of_mario(objX, objY, objZ, dist) == TRUE) {
+#endif
         obj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
+#ifndef NODRAWINGDISTANCE
     } else {
         obj->header.gfx.node.flags |= GRAPH_RENDER_INVISIBLE;
     }
+#endif
 }
 
 /**