diff --git a/CMakeLists.txt b/CMakeLists.txt index a124180..df236b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ endif() # include_directories( "${CMAKE_HOME_DIRECTORY}/subprojects" - "${CMAKE_HOME_DIRECTORY}/subprojects/SDL/include" + "${CMAKE_HOME_DIRECTORY}/include/SDL" "${CMAKE_HOME_DIRECTORY}/dependencies/SDL2_image" "${CMAKE_HOME_DIRECTORY}/dependencies/SDL2_image/include" "${CMAKE_HOME_DIRECTORY}/dependencies/SDL2_ttf/include" @@ -212,7 +212,7 @@ add_executable( src/packages/stdinc/IZ_stdlib.h src/packages/config/IZ_config_guid.c src/packages/config/IZ_config_guid.h -) + src/packages/game/output/audio/IZ_audio.c src/packages/game/output/audio/IZ_audio.h) target_link_libraries( game diff --git a/assets/internal/default/weapon-hitman/1-unload-var0.mp3 b/assets/internal/default/weapon-hitman/1-unload-var0.mp3 deleted file mode 100644 index 7faadce..0000000 Binary files a/assets/internal/default/weapon-hitman/1-unload-var0.mp3 and /dev/null differ diff --git a/assets/internal/default/weapon-hitman/1-unload-var0.wav b/assets/internal/default/weapon-hitman/1-unload-var0.wav new file mode 100644 index 0000000..561b5c7 Binary files /dev/null and b/assets/internal/default/weapon-hitman/1-unload-var0.wav differ diff --git a/assets/internal/default/weapon-hitman/1-unload-var1.mp3 b/assets/internal/default/weapon-hitman/1-unload-var1.mp3 deleted file mode 100644 index be1fbde..0000000 Binary files a/assets/internal/default/weapon-hitman/1-unload-var1.mp3 and /dev/null differ diff --git a/assets/internal/default/weapon-hitman/1-unload-var1.wav b/assets/internal/default/weapon-hitman/1-unload-var1.wav new file mode 100644 index 0000000..81a60db Binary files /dev/null and b/assets/internal/default/weapon-hitman/1-unload-var1.wav differ diff --git a/assets/internal/default/weapon-hitman/1-unload-var2.mp3 b/assets/internal/default/weapon-hitman/1-unload-var2.mp3 deleted file mode 100644 index a3f8818..0000000 Binary files a/assets/internal/default/weapon-hitman/1-unload-var2.mp3 and /dev/null differ diff --git a/assets/internal/default/weapon-hitman/1-unload-var2.wav b/assets/internal/default/weapon-hitman/1-unload-var2.wav new file mode 100644 index 0000000..d30f62d Binary files /dev/null and b/assets/internal/default/weapon-hitman/1-unload-var2.wav differ diff --git a/assets/internal/default/weapon-servant/1-unload-var0.wav b/assets/internal/default/weapon-servant/1-unload-var0.wav new file mode 100644 index 0000000..c16f8e9 Binary files /dev/null and b/assets/internal/default/weapon-servant/1-unload-var0.wav differ diff --git a/assets/internal/default/weapon-servant/1-unload-var1.wav b/assets/internal/default/weapon-servant/1-unload-var1.wav new file mode 100644 index 0000000..21a00cc Binary files /dev/null and b/assets/internal/default/weapon-servant/1-unload-var1.wav differ diff --git a/include/SDL b/include/SDL new file mode 120000 index 0000000..464f7bd --- /dev/null +++ b/include/SDL @@ -0,0 +1 @@ +../subprojects/SDL/include \ No newline at end of file diff --git a/src/packages/game/IZ_app.c b/src/packages/game/IZ_app.c index 6186f76..2e63ac0 100644 --- a/src/packages/game/IZ_app.c +++ b/src/packages/game/IZ_app.c @@ -17,9 +17,10 @@ IZ_InputState* IZ_AppGetInputState(struct IZ_App* app) { } typedef enum { - IZ_APP_INITIALIZE_RESULT_NETWORKING_ERROR = -5, + IZ_APP_INITIALIZE_RESULT_NETWORKING_ERROR = -6, IZ_APP_INITIALIZE_RESULT_POOL_ERROR, IZ_APP_INITIALIZE_RESULT_INPUT_ERROR, + IZ_APP_INITIALIZE_RESULT_AUDIO_ERROR, IZ_APP_INITIALIZE_RESULT_VIDEO_ERROR, IZ_APP_INITIALIZE_RESULT_SDL_ERROR, IZ_APP_INITIALIZE_RESULT_OK, diff --git a/src/packages/game/output/audio/IZ_audio.c b/src/packages/game/output/audio/IZ_audio.c new file mode 100644 index 0000000..407fa41 --- /dev/null +++ b/src/packages/game/output/audio/IZ_audio.c @@ -0,0 +1,13 @@ +#include "IZ_audio.h" + +IZ_AudioInitializeResult IZ_AudioInitialize(IZ_AudioState* state, void* user_data, const char* config_path, u8 argc, const char* argv[]) { + return IZ_AUDIO_INITIALIZE_RESULT_OK; +} + +IZ_AudioSaveConfigResult IZ_AudioSaveConfig(IZ_AudioState* state, const char* config_path) { + return IZ_AUDIO_SAVE_CONFIG_RESULT_OK; +} + +void IZ_AudioTeardown(IZ_AudioState* state) { + +} diff --git a/src/packages/game/output/audio/IZ_audio.h b/src/packages/game/output/audio/IZ_audio.h new file mode 100644 index 0000000..723b1a3 --- /dev/null +++ b/src/packages/game/output/audio/IZ_audio.h @@ -0,0 +1,24 @@ +#ifndef IZ_AUDIO_H +#define IZ_AUDIO_H + +#include "../../../common/IZ_common.h" + +typedef enum { + IZ_AUDIO_INITIALIZE_RESULT_OK = 0 +} IZ_AudioInitializeResult; + +typedef enum { + IZ_AUDIO_SAVE_CONFIG_RESULT_OK = 0, +} IZ_AudioSaveConfigResult; + +typedef struct { + +} IZ_AudioState; + +IZ_AudioInitializeResult IZ_AudioInitialize(IZ_AudioState*, void*, const char*, u8, const char*[]); + +IZ_AudioSaveConfigResult IZ_AudioSaveConfig(IZ_AudioState*, const char*); + +void IZ_AudioTeardown(IZ_AudioState*); + +#endif