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

Merge pull request #118 from in1tiate/pngfix

Browse Source 
Check root of character folder for PNG emote without prefix
This commit is contained in:
stonedDiscord 2020-03-06 16:41:43 +01:00 committed by GitHub
commit 8c93cce0be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,6 +4,7 @@
*.dll *.dll
*.so *.so
*.pro.autosave *.pro.autosave
*.pro.user
base_override.h base_override.h
.DS_Store .DS_Store

3
src/aocharmovie.cpp
View File

@ -21,6 +21,7 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix)
apng = false; apng = false;
QString original_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".gif"); QString original_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".gif");
QString alt_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".png"); QString alt_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".png");
QString alt_path_still = ao_app->get_character_path(p_char, p_emote + ".png");
QString apng_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".apng"); QString apng_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".apng");
QString placeholder_path = ao_app->get_theme_path("placeholder.gif"); QString placeholder_path = ao_app->get_theme_path("placeholder.gif");
QString placeholder_default_path = ao_app->get_default_theme_path("placeholder.gif"); QString placeholder_default_path = ao_app->get_default_theme_path("placeholder.gif");
@ -36,6 +37,8 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix)
gif_path = original_path; gif_path = original_path;
else if (file_exists(alt_path)) else if (file_exists(alt_path))
gif_path = alt_path; gif_path = alt_path;
else if (file_exists(alt_path_still))
gif_path = alt_path_still;
else if (file_exists(placeholder_path)) else if (file_exists(placeholder_path))
gif_path = placeholder_path; gif_path = placeholder_path;
else else