Merge branch 'zeldaret:main' into d_a_pirate_flag

zeldaret · Oct 19, 2024 · 7029e32 · 7029e32
2 parents 6a6322b + ce59283
commit 7029e32
Show file tree

Hide file tree

Showing 14 changed files with 132 additions and 44 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,11 +1,11 @@
 {
   "[c]": {
     "files.encoding": "utf8",
-    "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
+    "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd",
   },
   "[cpp]": {
     "files.encoding": "utf8",
-    "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
+    "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd",
   },
   "editor.tabSize": 4,
   // "files.autoSave": "onFocusChange",
@@ -30,5 +30,10 @@
     ".ninja_*": true,
     "objdiff.json": true,
     ".cache/**": true,
+    "ctx.c": true,
   },
+  "clangd.arguments": [
+      "--function-arg-placeholders=0",
+      "-header-insertion=never",
+  ],
 }
diff --git a/include/JSystem/JStudio/JStudio_JStage/object-light.h b/include/JSystem/JStudio/JStudio_JStage/object-light.h
@@ -1,6 +1,6 @@
 #ifndef OBJECT_LIGHT_H
 #define OBJECT_LIGHT_H
 
-#include "JSystem/JStudio/JStudio_JStage/control.h"
+#include "JSystem/JStudio/JStudio_JStage/control.h" // IWYU pragma: export
 
 #endif /* OBJECT_LIGHT_H */
diff --git a/include/SSystem/SComponent/c_m3d_g_sph.h b/include/SSystem/SComponent/c_m3d_g_sph.h
@@ -41,7 +41,10 @@ class cM3dGSph {
     bool cross(const cM3dGCyl*, cXyz*) const;
     bool cross(const cM3dGSph*, cXyz*) const;
     bool cross(const cM3dGSph*, f32*) const;
-    bool cross(const cM3dGCyl* cyl, f32* out) const { return cM3d_Cross_CylSph(cyl, this, &cXyz(), out); }
+    bool cross(const cM3dGCyl* cyl, f32* out) const {
+        cXyz temp;
+        return cM3d_Cross_CylSph(cyl, this, &temp, out);
+    }
     void cross(const cM3dGTri*) const {}
     const cXyz& GetC() const { return mCenter; }
     cXyz& GetC() { return mCenter; }

diff --git a/src/JSystem/JStudio/JStudio_JStage/object-light.cpp b/src/JSystem/JStudio/JStudio_JStage/object-light.cpp
@@ -85,7 +85,7 @@ void TAdaptor_light::adaptor_do_update(const JStudio::TObject* object, u32 p2) {
     adaptor_getVariableValue_Vec(&posDir1.mPosition, sauVariableValue_3_POSITION_XYZ);
 
     switch (_118) {
-    case 1:
+    case 1: {
         f32 val10 = adaptor_getVariableValue(10)->getValue();
         f32 val11 = adaptor_getVariableValue(11)->getValue();
         f32 cosX = std::cosf(DEG_TO_RAD(val11));
@@ -96,6 +96,7 @@ void TAdaptor_light::adaptor_do_update(const JStudio::TObject* object, u32 p2) {
         posDir1.mDirection.z = cosX * std::cosf(DEG_TO_RAD(val10));
 
         break;
+    }
     case 2:
         Vec target;
         adaptor_getVariableValue_Vec(&target, sauVariableValue_3_TARGET_POSITION_XYZ);
@@ -145,6 +146,8 @@ void TAdaptor_light::adaptor_do_FACULTY(JStudio::data::TEOperationData op, const
         mObject->JSGSetLightType(lightType);
     break_outer_switch:
         break;
+    default:
+        break;
     }
 }
 

diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp
@@ -72,10 +72,10 @@ BOOL daKaji_c::_delete() {
 
 BOOL daKaji_c::_execute() {
     // Copy the ship's transform (plus an offset) to the helm.
-    cXyz* offset = &cXyz(0.0f, 740.0f, -858.0f);
-    offset->y += REG10_F(10);
-    offset->z += REG10_F(11);
-    cMtx_multVec(l_p_ship->mpModel->getBaseTRMtx(), offset, &current.pos);
+    cXyz offset(0.0f, 740.0f, -858.0f);
+    offset.y += REG10_F(10);
+    offset.z += REG10_F(11);
+    cMtx_multVec(l_p_ship->mpModel->getBaseTRMtx(), &offset, &current.pos);
 
     daObjPirateship::Act_c* ship = l_p_ship;
     shape_angle = ship->shape_angle;