Fix warnings and some bugs

thanks maniscat

autogen/lua_definitions/functions.lua

@@ -5073,7 +5073,7 @@ end
 
 --- @param id integer
 --- @return boolean
---- Checks if a lighting engine point light exists
+--- Checks if a lighting engine point light corresponding to `id` exists
 function le_light_exists(id)
     -- ...
 end
@@ -11549,14 +11549,12 @@ function get_secondary_camera_focus()
 end
 
 --- @param o Object
---- @return void*
 --- Sets the cutscene focus object
 function set_cutscene_focus(o)
     -- ...
 end
 
 --- @param o Object
---- @return void*
 --- Sets the secondary camera focus object
 function set_secondary_camera_focus(o)
     -- ...

data/dynos_bin_gfx.cpp

@@ -1245,7 +1245,8 @@ static std::string ResolveGfxCommand(lua_State *L, GfxData *aGfxData, const char
 
     // Count parameters
     // Find the position of each % to retrieve the correct expected type from the command paramInfo
-    u8 paramPos[paramInfo->count] = { 0 };
+    u8 paramPos[paramInfo->count];
+    memset(paramPos, 0, sizeof(u8) * paramInfo->count);
     u8 paramPosIndex = 0;
     u8 paramCount = 1;
     bool inBrackets = false;

data/dynos_mgr_models.cpp

@@ -91,7 +91,7 @@ static struct GraphNode* DynOS_Model_LoadCommonInternal(u32* aId, enum ModelPool
 
     // check maps, permanent pool is always checked
     struct GraphNode *node = NULL;
-    #define CHECK_POOL(pool) if (node = DynOS_Model_CheckMap(pool, aId, aAsset, aDeDuplicate)) { return node; }
+    #define CHECK_POOL(pool) if ((node = DynOS_Model_CheckMap(pool, aId, aAsset, aDeDuplicate)) != NULL) { return node; }
     CHECK_POOL(MODEL_POOL_PERMANENT);
     if (aModelPool == MODEL_POOL_SESSION) {
         CHECK_POOL(MODEL_POOL_SESSION);

docs/lua/functions-3.md

@@ -6873,7 +6873,7 @@ Gets the total number of lights currently loaded in the lighting engine
 ## [le_light_exists](#le_light_exists)
 
 ### Description
-Checks if a lighting engine point light exists
+Checks if a lighting engine point light corresponding to `id` exists
 
 ### Lua Example
 `local booleanValue = le_light_exists(id)`

docs/lua/functions-6.md

@@ -6201,7 +6201,7 @@ Gets the secondary camera focus object
 Sets the cutscene focus object
 
 ### Lua Example
-`local voidValue = set_cutscene_focus(o)`
+`set_cutscene_focus(o)`
 
 ### Parameters
 | Field | Type |
@@ -6209,10 +6209,10 @@ Sets the cutscene focus object
 | o | [Object](structs.md#Object) |
 
 ### Returns
-- `void *`
+- None
 
 ### C Prototype
-`void *set_cutscene_focus(struct Object *o);`
+`void set_cutscene_focus(struct Object *o);`
 
 [:arrow_up_small:](#)
 
@@ -6224,7 +6224,7 @@ Sets the cutscene focus object
 Sets the secondary camera focus object
 
 ### Lua Example
-`local voidValue = set_secondary_camera_focus(o)`
+`set_secondary_camera_focus(o)`
 
 ### Parameters
 | Field | Type |
@@ -6232,10 +6232,10 @@ Sets the secondary camera focus object
 | o | [Object](structs.md#Object) |
 
 ### Returns
-- `void *`
+- None
 
 ### C Prototype
-`void *set_secondary_camera_focus(struct Object *o);`
+`void set_secondary_camera_focus(struct Object *o);`
 
 [:arrow_up_small:](#)
 

src/game/behaviors/rolling_log.inc.c

@@ -38,7 +38,7 @@ void rolling_log_roll_log(void) {
     f32 sp24;
 
     f32 x = 0;
-    f32 y = 0;
+    UNUSED f32 y = 0;
     f32 z = 0;
 
     u8 playersTouched = 0;

src/game/camera.c

@@ -10011,7 +10011,7 @@ s32 intro_peach_move_camera_start_to_pipe(struct Camera *c, struct CutsceneSplin
                   struct CutsceneSplinePoint focusSpline[]) {
     if (!c) { return 0; }
     Vec3f offset;
-    s32 posReturn = 0;
+    UNUSED s32 posReturn = 0;
     s32 focusReturn = 0;
 
     /**

src/pc/djui/djui_interactable.c

@@ -422,7 +422,7 @@ void djui_interactable_update(void) {
     // update focused
     if (gInteractableFocus) {
         u16 mainButtons = PAD_BUTTON_A | PAD_BUTTON_B;
-        if ((mouseButtons & MOUSE_BUTTON_1) && !(sLastMouseButtons && MOUSE_BUTTON_1) && !djui_cursor_inside_base(gInteractableFocus)) {
+        if ((mouseButtons & MOUSE_BUTTON_1) && !(sLastMouseButtons & MOUSE_BUTTON_1) && !djui_cursor_inside_base(gInteractableFocus)) {
             // clicked outside of focus
             if (!gDjuiChatBoxFocus) {
                 djui_interactable_set_input_focus(NULL);

src/pc/djui/djui_panel_host_mods.c

@@ -179,7 +179,7 @@ static void djui_panel_on_categories_change(UNUSED struct DjuiBase* caller) {
     djui_paginated_calculate_height(sModPaginated);
 }
 
-static void* threaded_mod_refresh(void*) {
+static void* threaded_mod_refresh(UNUSED void* unused) {
     mods_refresh_local();
 
     if (gModRefreshThread.state == RUNNING) { join_thread(&gModRefreshThread); }

src/pc/djui/djui_panel_mod_menu.c

@@ -118,11 +118,9 @@ void djui_panel_mod_menu_mod_create(struct DjuiBase* caller) {
     {
         struct DjuiPaginated* paginated = djui_paginated_create(body, 8);
         struct DjuiBase* layoutBase = &paginated->layout->base;
-        s32 count = 0;
         for (int i = 0; i < gHookedModMenuElementsCount; i++) {
             if (gHookedModMenuElements[i].mod == mod) {
                 djui_panel_mod_menu_mod_create_element(layoutBase, i);
-                count++;
             }
         }
         djui_paginated_calculate_height(paginated);

src/pc/lua/smlua_utils.h

@@ -1,10 +1,10 @@
 #ifndef SMLUA_UTILS_H
 #define SMLUA_UTILS_H
 
+#include "src/pc/network/packets/packet.h"
+
 extern u8 gSmLuaConvertSuccess;
 typedef int LuaFunction;
-struct Packet;
-struct LSTNetworkType;
 
 typedef struct ByteString {
     const char *bytes;

src/pc/lua/utils/smlua_obj_utils.c

@@ -121,8 +121,8 @@ struct Object *get_current_object(void) { return gCurrentObject; }
 struct Object *get_dialog_object(void) { return gContinueDialogFunctionObject; }
 struct Object *get_cutscene_focus(void) { return gCutsceneFocus; }
 struct Object *get_secondary_camera_focus(void) { return gSecondCameraFocus; }
-void *set_cutscene_focus(struct Object *o) { gCutsceneFocus = o; }
-void *set_secondary_camera_focus(struct Object *o) { gSecondCameraFocus = o; }
+void set_cutscene_focus(struct Object *o) { gCutsceneFocus = o; }
+void set_secondary_camera_focus(struct Object *o) { gSecondCameraFocus = o; }
 
 //
 // Helpers to iterate through the object table

src/pc/lua/utils/smlua_obj_utils.h

@@ -43,9 +43,9 @@ struct Object *get_cutscene_focus(void);
 /* |description|Gets the secondary camera focus object|descriptionEnd| */
 struct Object *get_secondary_camera_focus(void);
 /* |description|Sets the cutscene focus object|descriptionEnd| */
-void *set_cutscene_focus(struct Object *o);
+void set_cutscene_focus(struct Object *o);
 /* |description|Sets the secondary camera focus object|descriptionEnd| */
-void *set_secondary_camera_focus(struct Object *o);
+void set_secondary_camera_focus(struct Object *o);
 
 //
 // Helpers to iterate through the object table

src/pc/mods/mod_cache.c

@@ -279,7 +279,6 @@ void mod_cache_load(void) {
         gfx_shutdown();
     }
 
-    u16 count = 0;
     while (true) {
         u8 dataHash[16] = { 0 };
         u64 lastLoaded = 0;
@@ -298,7 +297,6 @@ void mod_cache_load(void) {
         mod_cache_add_internal(dataHash, lastLoaded, (char*)path);
 
         free((void*)path);
-        count++;
     }
     LOG_INFO("Loading mod cache complete");
 

src/pc/mods/mod_fs.cpp

@@ -982,8 +982,8 @@ C_DEFINE lua_Integer mod_fs_file_read_integer(struct ModFsFile *file, enum ModFs
         case INT_TYPE_S16: return mod_fs_file_read_data<s16>(file, 0);
         case INT_TYPE_S32: return mod_fs_file_read_data<s32>(file, 0);
         case INT_TYPE_S64: return mod_fs_file_read_data<s64>(file, 0);
+        default:           return 0;
     }
-    return 0;
 }
 
 C_DEFINE lua_Number mod_fs_file_read_number(struct ModFsFile *file, enum ModFsFileFloatType floatType) {
@@ -1006,8 +1006,8 @@ C_DEFINE lua_Number mod_fs_file_read_number(struct ModFsFile *file, enum ModFsFi
     switch (floatType) {
         case FLOAT_TYPE_F32: return mod_fs_file_read_data<f32>(file, 0);
         case FLOAT_TYPE_F64: return mod_fs_file_read_data<f64>(file, 0);
+        default:             return 0;
     }
-    return 0;
 }
 
 C_DEFINE ByteString mod_fs_file_read_bytes(struct ModFsFile *file, u32 length) {
@@ -1185,8 +1185,8 @@ C_DEFINE bool mod_fs_file_write_integer(struct ModFsFile *file, lua_Integer valu
         case INT_TYPE_S16: return mod_fs_file_write_data<s16>(file, value);
         case INT_TYPE_S32: return mod_fs_file_write_data<s32>(file, value);
         case INT_TYPE_S64: return mod_fs_file_write_data<s64>(file, value);
+        default:           return false;
     }
-    return false;
 }
 
 C_DEFINE bool mod_fs_file_write_number(struct ModFsFile *file, lua_Number value, enum ModFsFileFloatType floatType) {
@@ -1214,8 +1214,8 @@ C_DEFINE bool mod_fs_file_write_number(struct ModFsFile *file, lua_Number value,
     switch (floatType) {
         case FLOAT_TYPE_F32: return mod_fs_file_write_data<f32>(file, value);
         case FLOAT_TYPE_F64: return mod_fs_file_write_data<f64>(file, value);
+        default:             return false;
     }
-    return false;
 }
 
 C_DEFINE bool mod_fs_file_write_bytes(struct ModFsFile *file, ByteString bytestring) {
@@ -1308,11 +1308,12 @@ C_DEFINE bool mod_fs_file_seek(struct ModFsFile *file, s32 offset, enum ModFsFil
         return false;
     }
 
-    s32 start = 0;
+    s32 start;
     switch (origin) {
         case FILE_SEEK_SET: start = 0; break;
         case FILE_SEEK_CUR: start = file->offset; break;
         case FILE_SEEK_END: start = file->size; break;
+        default:            start = 0; break;
     }
     file->offset = MIN(MAX(start + offset, 0), (s32) file->size);
     return true;

src/pc/network/sync_object.c

@@ -103,7 +103,6 @@ void sync_object_forget(u32 syncId) {
     so->forgetting = true;
 
     // add it to a list to free later
-    s32 forgetCount = 1;
     struct SyncObjectForgetEntry* newEntry = calloc(1, sizeof(struct SyncObjectForgetEntry));
     newEntry->so = so;
     newEntry->forgetTimer = FORGET_TIMEOUT;
@@ -113,7 +112,6 @@ void sync_object_forget(u32 syncId) {
         struct SyncObjectForgetEntry* entry = sForgetList;
         while (entry->next != NULL) {
             entry = entry->next;
-            forgetCount++;
         }
         entry->next = newEntry;
     }

src/pc/pc_main.c

@@ -415,6 +415,7 @@ void* main_game_init(UNUSED void* dummy) {
     mumble_init();
 
     gGameInited = true;
+    return NULL;
 }
 
 int main(int argc, char *argv[]) {