Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
iamgoofball 2018-10-17 15:16:47 -07:00
parent 5325083b6f
commit 462ece38c7
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aocharmovie.cpp
View File

@ -3,8 +3,6 @@
#include "misc_functions.h" #include "misc_functions.h"
#include "file_functions.h" #include "file_functions.h"
#include "aoapplication.h" #include "aoapplication.h"
#include "debug_functions.h"
#include <string>
AOCharMovie::AOCharMovie(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent) AOCharMovie::AOCharMovie(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent)
{ {

10
text_file_functions.cpp
View File

@ -342,7 +342,6 @@ QString AOApplication::get_sfx(QString p_identifier)
QString AOApplication::get_sfx_suffix(QString sound_to_check) 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 mp3_check = get_sounds_path() + sound_to_check + ".mp3";
QString opus_check = get_sounds_path() + sound_to_check + ".opus"; QString opus_check = get_sounds_path() + sound_to_check + ".opus";
if(file_exists(opus_check)) if(file_exists(opus_check))
@ -353,25 +352,16 @@ QString AOApplication::get_sfx_suffix(QString sound_to_check)
{ {
return sound_to_check + ".mp3"; return sound_to_check + ".mp3";
} }
if(file_exists(wav_check))
{
return sound_to_check + ".wav";
}
return sound_to_check + ".wav"; return sound_to_check + ".wav";
} }
QString AOApplication::get_image_suffix(QString path_to_check) QString AOApplication::get_image_suffix(QString path_to_check)
{ {
QString apng_check = path_to_check + ".apng"; QString apng_check = path_to_check + ".apng";
QString gif_check = path_to_check + ".gif";
if(file_exists(apng_check)) if(file_exists(apng_check))
{ {
return path_to_check + ".apng"; return path_to_check + ".apng";
} }
if(file_exists(gif_check))
{
return path_to_check + ".gif";
}
return path_to_check + ".gif"; return path_to_check + ".gif";
} }