diff options
| author | stonedDiscord <stoned@derpymail.org> | 2017-03-18 14:18:20 +0100 |
|---|---|---|
| committer | stonedDiscord <stoned@derpymail.org> | 2017-03-18 14:18:20 +0100 |
| commit | e741d1314ef3ef737251f6e9df179e9de834d6a7 (patch) | |
| tree | 36307fadb8c243ce9543d052338b2d5775b11629 | |
| parent | 146ef9731189b45a81c0d3062d2365b34d12f60c (diff) | |
aomovie only got stuck
| -rw-r--r-- | aomovie.cpp | 3 | ||||
| -rw-r--r-- | path_functions.cpp | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/aomovie.cpp b/aomovie.cpp index 2e7194ae..9e1b64ee 100644 --- a/aomovie.cpp +++ b/aomovie.cpp @@ -27,7 +27,6 @@ void AOMovie::play(QString p_gif, QString p_char) QString gif_path; 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 default_theme_path = ao_app->get_default_theme_path() + p_gif + ".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)) gif_path = custom_path; - else if (file_exists(alt_path)) - gif_path = alt_path; else if (file_exists(theme_path)) gif_path = theme_path; else if (file_exists(default_theme_path)) diff --git a/path_functions.cpp b/path_functions.cpp index 47fab063..58c70381 100644 --- a/path_functions.cpp +++ b/path_functions.cpp @@ -79,7 +79,14 @@ QString AOApplication::get_default_background_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() |