diff options
| author | iamgoofball <iamgoofball@gmail.com> | 2018-10-17 09:44:15 -0700 |
|---|---|---|
| committer | iamgoofball <iamgoofball@gmail.com> | 2018-10-17 09:44:15 -0700 |
| commit | 5325083b6f564cf8521ff2602fbbf653849b17ce (patch) | |
| tree | 6679b85b61c86ca1742bdcf7a2bf4bc5be2da59b | |
| parent | ad27e0043313824787737889512e539bd3ff32b9 (diff) | |
fixes (TM)
| -rw-r--r-- | aomovie.cpp | 4 | ||||
| -rw-r--r-- | courtroom.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/aomovie.cpp b/aomovie.cpp index 90c37010..cc33ff7b 100644 --- a/aomovie.cpp +++ b/aomovie.cpp @@ -28,9 +28,9 @@ void AOMovie::play(QString p_gif, QString p_char, QString p_custom_theme) QString custom_path; if (p_gif == "custom") - custom_path = ao_app->get_character_path(p_char) + p_gif + ".gif"; + custom_path = ao_app->get_image_suffix(ao_app->get_character_path(p_char) + p_gif); else - custom_path = ao_app->get_character_path(p_char) + p_gif + "_bubble.gif"; + custom_path = ao_app->get_image_suffix(ao_app->get_character_path(p_char) + p_gif + "_bubble"); QString custom_theme_path = ao_app->get_base_path() + "themes/" + p_custom_theme + "/" + p_gif + ".gif"; QString theme_path = ao_app->get_theme_path() + p_gif + ".gif"; diff --git a/courtroom.cpp b/courtroom.cpp index fdb5e8c9..bdcb7ddd 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -703,7 +703,7 @@ void Courtroom::enter_courtroom(int p_cid) QString char_path = ao_app->get_character_path(current_char); if (ao_app->custom_objection_enabled && - file_exists(char_path + "custom.gif") && + (file_exists(char_path + "custom.gif") || file_exists(char_path + "custom.apng")) && file_exists(char_path + "custom.wav")) ui_custom_objection->show(); else |