Merge pull request #276 from Crystalwarrior/bugfix/sprite-freedom

Allow non-png static image lookups
This commit is contained in:
oldmud0 2020-08-25 16:36:56 -05:00 committed by GitHub
commit 090e82421d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -35,8 +35,8 @@ void AOCharMovie::load_image(QString p_char, QString p_emote,
ao_app->get_image_suffix(ao_app->get_character_path( ao_app->get_image_suffix(ao_app->get_character_path(
p_char, emote_prefix + "/" + p_char, emote_prefix + "/" +
p_emote)), // Path check if it's categorized into a folder p_emote)), // Path check if it's categorized into a folder
ao_app->get_character_path( ao_app->get_image_suffix(ao_app->get_character_path(
p_char, p_emote + ".png"), // Non-animated path if emote_prefix fails p_char, p_emote)), // Just use the non-prefixed image, animated or not
ao_app->get_image_suffix( ao_app->get_image_suffix(
ao_app->get_theme_path("placeholder")), // Theme placeholder path ao_app->get_theme_path("placeholder")), // Theme placeholder path
ao_app->get_image_suffix(ao_app->get_default_theme_path( ao_app->get_image_suffix(ao_app->get_default_theme_path(