From 4610374570e869648d30bea0c3bce57b31fbeeb8 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Mon, 11 Apr 2022 21:43:55 -0700
Subject: [PATCH] Clang/mac fixes

---
 data/dynos_bin_col.cpp                        |  2 +-
 data/dynos_bin_movtexqc.cpp                   |  3 ---
 data/dynos_mgr_lvl.cpp                        |  2 +-
 developer/clang.sh                            | 16 ++++++++++++++
 src/pc/controller/controller_keyboard_debug.c | 22 +------------------
 5 files changed, 19 insertions(+), 26 deletions(-)
 create mode 100755 developer/clang.sh

diff --git a/data/dynos_bin_col.cpp b/data/dynos_bin_col.cpp
index cef3daa2..0aa948af 100644
--- a/data/dynos_bin_col.cpp
+++ b/data/dynos_bin_col.cpp
@@ -602,7 +602,7 @@ DataNode<Collision>* DynOS_Col_Parse(GfxData* aGfxData, DataNode<Collision>* aNo
     aNode->mLoadIndex = aGfxData->mLoadIndex++;
 
     if (aGfxData->mErrorCount > 0) {
-        Print("Failed to parse collision: '%s'", aNode->mName);
+        Print("Failed to parse collision: '%s'", aNode->mName.begin());
     }
 
     return aNode;
diff --git a/data/dynos_bin_movtexqc.cpp b/data/dynos_bin_movtexqc.cpp
index 534b283e..cb60268f 100644
--- a/data/dynos_bin_movtexqc.cpp
+++ b/data/dynos_bin_movtexqc.cpp
@@ -16,9 +16,6 @@ extern "C" {
 static Movtex* ParseMovtexQCSymbolArg(GfxData* aGfxData, DataNode<MovtexQC>* aNode, u64 aTokenIndex) {
     const String& _Arg = aNode->mTokens[aTokenIndex];
 
-    // Other constants
-    movtexqc_constant(NULL);
-
     // Movtexs
     for (auto& _Node : aGfxData->mMovtexs) {
         if (_Arg == _Node->mName) {
diff --git a/data/dynos_mgr_lvl.cpp b/data/dynos_mgr_lvl.cpp
index 28b0c7b7..d55706fb 100644
--- a/data/dynos_mgr_lvl.cpp
+++ b/data/dynos_mgr_lvl.cpp
@@ -49,7 +49,7 @@ void DynOS_Lvl_Activate(s32 modIndex, const SysPath &aPackFolder, const char *aL
     auto& newScriptNode = newScripts[newScripts.Count() - 1];
     const void* originalScript = DynOS_Builtin_ScriptPtr_GetFromName(newScriptNode->mName.begin());
     if (originalScript == NULL) {
-        Print("Could not find level to override: '%s'", newScriptNode->mName);
+        Print("Could not find level to override: '%s'", newScriptNode->mName.begin());
         return;
     }
 
diff --git a/developer/clang.sh b/developer/clang.sh
new file mode 100755
index 00000000..e15e5ecd
--- /dev/null
+++ b/developer/clang.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+if [ $# -eq 0 ]; then
+    make DEBUG=1 DEVELOPMENT=1 STRICT=1 COMPILER=clang -j
+else
+    make DEBUG=1 DEVELOPMENT=1 COMPILER=clang -j
+fi
+
+# find file
+FILE=./build/us_pc/sm64.us.f3dex2e.exe
+if [ ! -f "$FILE" ]; then
+    FILE=./build/us_pc/sm64.us.f3dex2e
+fi
+
+$FILE &
diff --git a/src/pc/controller/controller_keyboard_debug.c b/src/pc/controller/controller_keyboard_debug.c
index 7dda1efa..10093b50 100644
--- a/src/pc/controller/controller_keyboard_debug.c
+++ b/src/pc/controller/controller_keyboard_debug.c
@@ -49,28 +49,8 @@ static void debug_warp_level2() {
     dynos_warp_to_level(gCurrLevelNum, gCurrAreaIndex^3, 1);
 }
 
-#include "src/game/camera.h"
 static void debug_warp_level3() {
-    //dynos_warp_to_level(gCurrLevelNum, gCurrAreaIndex^3, 1);
-    u8 cameraModes[] = {
-        CAMERA_MODE_NONE,
-        CAMERA_MODE_RADIAL,
-        CAMERA_MODE_OUTWARD_RADIAL,
-        CAMERA_MODE_BEHIND_MARIO,
-        CAMERA_MODE_CLOSE,
-        CAMERA_MODE_WATER_SURFACE,
-        CAMERA_MODE_SLIDE_HOOT,
-        CAMERA_MODE_INSIDE_CANNON,
-        CAMERA_MODE_BOSS_FIGHT,
-        CAMERA_MODE_FIXED,
-        CAMERA_MODE_8_DIRECTIONS,
-        CAMERA_MODE_FREE_ROAM,
-        CAMERA_MODE_SPIRAL_STAIRS,
-    };
-    static int index = 0;
-    index = (index + 1)%15;
-    printf(">>> %u\n", index);
-    set_camera_mode(gCamera, cameraModes[index], 0);
+    dynos_warp_to_level(LEVEL_CASTLE_GROUNDS, 1, 1);
 }
 
 static void debug_grand_star(void) {