From 918de7bce04a80aa38551d54c02595b076ddc00d Mon Sep 17 00:00:00 2001 From: Abdelrahman Date: Sun, 6 Aug 2023 22:13:14 +0100 Subject: [PATCH] Fix cppcheck errors --- include/GameEngine.h | 3 ++- src/GameEngine.c | 35 ++++++++++++++++++----------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/include/GameEngine.h b/include/GameEngine.h index 92826dd..a2b1e1c 100644 --- a/include/GameEngine.h +++ b/include/GameEngine.h @@ -75,7 +75,8 @@ void clip_texture_render_rects_to_drawing_area(RenderRect *src, RenderRect *dest); RenderRect get_texture_asset_rect(AssetID id); -void render_texture_asset(AssetID id, RenderRect *src, RenderRect *dest); +void render_texture_asset(AssetID id, const RenderRect *src, + const RenderRect *dest); void modulate_texture_color(AssetID id, SDL_Color color); void modulate_texture_alpha(AssetID id, u8 alpha); TextSize get_text_size_from_font_asset(AssetID id, const char *text); diff --git a/src/GameEngine.c b/src/GameEngine.c index 973b1ac..9739271 100644 --- a/src/GameEngine.c +++ b/src/GameEngine.c @@ -316,7 +316,8 @@ RenderRect get_texture_asset_rect(AssetID id) { return rect; } -void render_texture_asset(AssetID id, RenderRect *src, RenderRect *dest) { +void render_texture_asset(AssetID id, const RenderRect *src, + const RenderRect *dest) { if (id < 0) { return; } @@ -460,7 +461,7 @@ void pause_audio_asset_on_track(AssetID id, u8 track) { return; } - Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); + const Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); if (!chunk || chunk != Mix_GetChunk(track)) { return; } @@ -473,7 +474,7 @@ void resume_audio_asset_on_track(AssetID id, u8 track) { return; } - Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); + const Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); if (!chunk || chunk != Mix_GetChunk(track)) { return; } @@ -486,7 +487,7 @@ void stop_audio_asset_on_track(AssetID id, u8 track) { return; } - Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); + const Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); if (!chunk || chunk != Mix_GetChunk(track)) { return; } @@ -500,7 +501,7 @@ void fade_out_audio_asset_on_track(AssetID id, u8 track, return; } - Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); + const Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); if (!chunk || chunk != Mix_GetChunk(track)) { return; } @@ -513,7 +514,7 @@ void pause_all_instances_of_audio_asset(AssetID id) { return; } - Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); + const Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); if (!chunk) { return; } @@ -532,7 +533,7 @@ void resume_all_instances_of_audio_asset(AssetID id) { return; } - Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); + const Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); if (!chunk) { return; } @@ -551,7 +552,7 @@ void stop_all_instances_of_audio_asset(AssetID id) { return; } - Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); + const Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); if (!chunk) { return; } @@ -570,7 +571,7 @@ void fade_out_all_instances_of_audio_asset(AssetID id, u32 fade_length_in_ms) { return; } - Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); + const Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); if (!chunk) { return; } @@ -589,7 +590,7 @@ i8 get_audio_asset_volume(AssetID id) { return -1; } - Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); + const Mix_Chunk *chunk = get_audio_chunk(GameEngine.asset_manager, id); if (!chunk) { return -1; } @@ -633,7 +634,7 @@ void pause_music_asset(AssetID id) { return; } - Mix_Music *music = get_music(GameEngine.asset_manager, id); + const Mix_Music *music = get_music(GameEngine.asset_manager, id); if (!music) { return; } @@ -646,7 +647,7 @@ void resume_music_asset(AssetID id) { return; } - Mix_Music *music = get_music(GameEngine.asset_manager, id); + const Mix_Music *music = get_music(GameEngine.asset_manager, id); if (!music) { return; } @@ -659,7 +660,7 @@ void stop_music_asset(AssetID id) { return; } - Mix_Music *music = get_music(GameEngine.asset_manager, id); + const Mix_Music *music = get_music(GameEngine.asset_manager, id); if (!music) { return; } @@ -672,7 +673,7 @@ void fade_out_music_asset(AssetID id, u32 fade_length_in_ms) { return; } - Mix_Music *music = get_music(GameEngine.asset_manager, id); + const Mix_Music *music = get_music(GameEngine.asset_manager, id); if (!music) { return; } @@ -698,7 +699,7 @@ void set_music_asset_volume(AssetID id, i8 volume) { return; } - Mix_Music *music = get_music(GameEngine.asset_manager, id); + const Mix_Music *music = get_music(GameEngine.asset_manager, id); if (!music) { return; } @@ -706,7 +707,7 @@ void set_music_asset_volume(AssetID id, i8 volume) { Mix_VolumeMusic(volume); } -bool is_music_object_playing(Mix_Music *music) { +bool is_music_object_playing(const Mix_Music *music) { if (!Mix_PlayingMusic()) { return false; } @@ -729,7 +730,7 @@ bool is_music_asset_playing(AssetID id) { return false; } - Mix_Music *music = get_music(GameEngine.asset_manager, id); + const Mix_Music *music = get_music(GameEngine.asset_manager, id); if (!music) { return false; }