fix: heavylog arg types

Author: cerwym

linux.mk

@@ -72,6 +72,7 @@ src/config_objects.c \
 src/config_players.c \
 src/config_powerhands.c \
 src/config_rules.c \
+src/config_sounds.c \
 src/config_settings.c \
 src/config_slabsets.c \
 src/config_strings.c \
@@ -182,6 +183,7 @@ src/lua_api_player.c \
 src/lua_api_room.c \
 src/lua_api_things.c \
 src/lua_api_slabs.c \
+src/lua_api_sound.c \
 src/lua_base.c \
 src/lua_cfg_funcs.c \
 src/lua_params.c \
@@ -249,6 +251,7 @@ src/roomspace_detection.c \
 src/scrcapt.c \
 src/slab_data.c \
 src/sounds.c \
+src/sound_manager.cpp \
 src/spdigger_stack.c \
 src/spritesheet.cpp \
 src/tasks_list.c \

src/creature_control.c

@@ -313,7 +313,7 @@ void play_creature_sound(struct Thing *thing, long snd_idx, long priority, long
         sample_idx = crsound->index + i;  // Regular positive indices
     }
 
-    SYNCDBG(18,"Playing sample %ld (sound type %ld, index %ld) for creature %d",
+    SYNCDBG(18,"Playing sample %d (sound type %ld, index %d) for creature %d",
             sample_idx, snd_idx, crsound->index, thing->model);
 
     if ( use_flags ) {

src/lua_api_sound.c

@@ -17,13 +17,13 @@
  */
 /******************************************************************************/
 #include "pre_inc.h"
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
 #include "lua_api_sound.h"
 #include "sound_manager.h"
 #include "bflib_sound.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "post_inc.h"
 
 /******************************************************************************/
 /**
@@ -172,9 +172,8 @@ int lua_PlayMusic(lua_State* L) {
         int track = luaL_checkinteger(L, 1);
         success = sound_manager_play_music(track);
     } else {
-        // File path
-        const char* filepath = luaL_checkstring(L, 1);
-        // TODO: Implement play_music_file() wrapper
+        // File path - TODO: Implement play_music_file() wrapper
+        // const char* filepath = luaL_checkstring(L, 1);
         // success = sound_manager_play_music_file(filepath);
         success = false;
     }
@@ -238,8 +237,4 @@ void register_lua_sound_api(lua_State* L) {
     lua_pushinteger(L, 1);
     lua_setglobal(L, "SOUND_PRIORITY_LOW");
 }
-
-#ifdef __cplusplus
-}
-#endif
 /******************************************************************************/

src/sound_manager.cpp

@@ -452,43 +452,43 @@ TbBool sound_manager_init(void) {
     return KeeperFX::SoundManager::getInstance().initialize();
 }
 
-SoundEmitterID sound_manager_minimal_play_effect(SoundSmplTblID sample_id, long priority, SoundVolume volume) {
+SoundEmitterID sound_manager_play_effect(SoundSmplTblID sample_id, long priority, SoundVolume volume) {
     return KeeperFX::SoundManager::getInstance().playEffect(sample_id, priority, volume);
 }
 
-void sound_manager_minimal_play_creature_sound(struct Thing* thing, long sound_type, long priority) {
+void sound_manager_play_creature_sound(struct Thing* thing, long sound_type, long priority) {
     KeeperFX::SoundManager::getInstance().playCreatureSound(thing, sound_type, priority);
 }
 
-void sound_manager_minimal_stop_effect(SoundEmitterID emitter_id) {
+void sound_manager_stop_effect(SoundEmitterID emitter_id) {
     KeeperFX::SoundManager::getInstance().stopEffect(emitter_id);
 }
 
-TbBool sound_manager_minimal_play_music(int track_number) {
+TbBool sound_manager_play_music(int track_number) {
     return KeeperFX::SoundManager::getInstance().playMusic(track_number);
 }
 
-void sound_manager_minimal_stop_music(void) {
+void sound_manager_stop_music(void) {
     KeeperFX::SoundManager::getInstance().stopMusic();
 }
 
-SoundSmplTblID sound_manager_minimal_load_custom_sound(const char* name, const char* filepath) {
+SoundSmplTblID sound_manager_load_custom_sound(const char* name, const char* filepath) {
     return KeeperFX::SoundManager::getInstance().loadCustomSound(name, filepath);
 }
 
-SoundSmplTblID sound_manager_minimal_get_custom_sound_id(const char* name) {
+SoundSmplTblID sound_manager_get_custom_sound_id(const char* name) {
     return KeeperFX::SoundManager::getInstance().getCustomSoundId(name);
 }
 
-TbBool sound_manager_minimal_set_creature_sound(const char* creature_model, const char* sound_type, const char* custom_sound_name) {
+TbBool sound_manager_set_creature_sound(const char* creature_model, const char* sound_type, const char* custom_sound_name) {
     return KeeperFX::SoundManager::getInstance().setCreatureSound(creature_model, sound_type, custom_sound_name);
 }
 
-TbBool sound_manager_minimal_is_custom_sound_loaded(const char* name) {
+TbBool sound_manager_is_custom_sound_loaded(const char* name) {
     return KeeperFX::SoundManager::getInstance().isCustomSoundLoaded(name);
 }
 
-void sound_manager_minimal_print_stats(void) {
+void sound_manager_print_stats(void) {
     KeeperFX::SoundManager::getInstance().printStats();
 }