aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aocharmovie.cpp2
-rw-r--r--text_file_functions.cpp10
2 files changed, 0 insertions, 12 deletions
diff --git a/aocharmovie.cpp b/aocharmovie.cpp
index 786cab20..661a6491 100644
--- a/aocharmovie.cpp
+++ b/aocharmovie.cpp
@@ -3,8 +3,6 @@
#include "misc_functions.h"
#include "file_functions.h"
#include "aoapplication.h"
-#include "debug_functions.h"
-#include <string>
AOCharMovie::AOCharMovie(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent)
{
diff --git a/text_file_functions.cpp b/text_file_functions.cpp
index a6ad4f76..c37857c4 100644
--- a/text_file_functions.cpp
+++ b/text_file_functions.cpp
@@ -342,7 +342,6 @@ QString AOApplication::get_sfx(QString p_identifier)
QString AOApplication::get_sfx_suffix(QString sound_to_check)
{
- QString wav_check = get_sounds_path() + sound_to_check + ".wav";
QString mp3_check = get_sounds_path() + sound_to_check + ".mp3";
QString opus_check = get_sounds_path() + sound_to_check + ".opus";
if(file_exists(opus_check))
@@ -353,25 +352,16 @@ QString AOApplication::get_sfx_suffix(QString sound_to_check)
{
return sound_to_check + ".mp3";
}
- if(file_exists(wav_check))
- {
- return sound_to_check + ".wav";
- }
return sound_to_check + ".wav";
}
QString AOApplication::get_image_suffix(QString path_to_check)
{
QString apng_check = path_to_check + ".apng";
- QString gif_check = path_to_check + ".gif";
if(file_exists(apng_check))
{
return path_to_check + ".apng";
}
- if(file_exists(gif_check))
- {
- return path_to_check + ".gif";
- }
return path_to_check + ".gif";
}