From c7af33814efa9951208e42fbc5bd7d91ce2e8c7d Mon Sep 17 00:00:00 2001
From: danielh05 <35849198+danielh05@users.noreply.github.com>
Date: Thu, 25 Jun 2020 02:38:23 +0200
Subject: [PATCH 1/2] Make tree only Cylboard when "BETTERCAMERA" is detected

---
 data/behavior_data.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/data/behavior_data.c b/data/behavior_data.c
index e036469d..7b2fdf94 100644
--- a/data/behavior_data.c
+++ b/data/behavior_data.c
@@ -12,6 +12,9 @@
 #include "game/debug.h"
 #include "menu/file_select.h"
 #include "engine/surface_load.h"
+#ifdef BETTERCAMERA
+#include "game/bettercamera.h"
+#endif
 
 #include "actors/common0.h"
 #include "actors/common1.h"
@@ -3183,7 +3186,11 @@ const BehaviorScript bhvFloorTrapInCastle[] = {
 
 const BehaviorScript bhvTree[] = {
     BEGIN(OBJ_LIST_POLELIKE),
+	#ifdef BETTERCAMERA
     CYLBOARD(),
+	#else
+	BILLBOARD(),
+	#endif
     OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
     SET_INT(oInteractType, INTERACT_POLE),
     SET_HITBOX(/*Radius*/ 80, /*Height*/ 500),

From bf09d0ca9390312a9d5da4290247b1e42b868f2f Mon Sep 17 00:00:00 2001
From: danielh05 <35849198+danielh05@users.noreply.github.com>
Date: Thu, 25 Jun 2020 13:34:53 +0200
Subject: [PATCH 2/2] fix spacing and remove include

---
 data/behavior_data.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/data/behavior_data.c b/data/behavior_data.c
index 7b2fdf94..d27cf09f 100644
--- a/data/behavior_data.c
+++ b/data/behavior_data.c
@@ -12,9 +12,6 @@
 #include "game/debug.h"
 #include "menu/file_select.h"
 #include "engine/surface_load.h"
-#ifdef BETTERCAMERA
-#include "game/bettercamera.h"
-#endif
 
 #include "actors/common0.h"
 #include "actors/common1.h"
@@ -3186,11 +3183,11 @@ const BehaviorScript bhvFloorTrapInCastle[] = {
 
 const BehaviorScript bhvTree[] = {
     BEGIN(OBJ_LIST_POLELIKE),
-	#ifdef BETTERCAMERA
+    #ifdef BETTERCAMERA
     CYLBOARD(),
-	#else
-	BILLBOARD(),
-	#endif
+    #else
+    BILLBOARD(),
+    #endif
     OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
     SET_INT(oInteractType, INTERACT_POLE),
     SET_HITBOX(/*Radius*/ 80, /*Height*/ 500),