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

aomovie only got stuck

Browse Source
This commit is contained in:
stonedDiscord 2017-03-18 14:18:20 +01:00
parent 146ef97311
commit e741d1314e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aomovie.cpp
View File

@ -27,7 +27,6 @@ void AOMovie::play(QString p_gif, QString p_char)
QString gif_path; QString gif_path;
QString custom_path = ao_app->get_character_path(p_char) + p_gif + ".gif"; QString custom_path = ao_app->get_character_path(p_char) + p_gif + ".gif";
QString alt_path = ao_app->get_character_path(p_char) + p_gif + ".png";
QString theme_path = ao_app->get_theme_path() + p_gif + ".gif"; QString theme_path = ao_app->get_theme_path() + p_gif + ".gif";
QString default_theme_path = ao_app->get_default_theme_path() + p_gif + ".gif"; QString default_theme_path = ao_app->get_default_theme_path() + p_gif + ".gif";
QString placeholder_path = ao_app->get_theme_path() + "placeholder.gif"; QString placeholder_path = ao_app->get_theme_path() + "placeholder.gif";
@ -35,8 +34,6 @@ void AOMovie::play(QString p_gif, QString p_char)
if (file_exists(custom_path)) if (file_exists(custom_path))
gif_path = custom_path; gif_path = custom_path;
else if (file_exists(alt_path))
gif_path = alt_path;
else if (file_exists(theme_path)) else if (file_exists(theme_path))
gif_path = theme_path; gif_path = theme_path;
else if (file_exists(default_theme_path)) else if (file_exists(default_theme_path))

9
path_functions.cpp
View File

@ -79,7 +79,14 @@ QString AOApplication::get_default_background_path()
QString AOApplication::get_evidence_path() QString AOApplication::get_evidence_path()
{ {
return get_base_path() + "evidence/"; QString default_path = "evidence/";
QString alt_path = "items/";
if (dir_exists(default_path))
return get_base_path() + default_path;
else if (dir_exists(alt_path))
return get_base_path() + alt_path;
else
return get_base_path() + default_path;
} }
QString Courtroom::get_background_path() QString Courtroom::get_background_path()