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

Use brace constructors instead of << append operator for path lists

Browse Source
This commit is contained in:
Crystalwarrior 2019-09-13 11:37:06 +03:00
parent 5c69d10cd5
commit 8027bbffad
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/aocharmovie.cpp
View File

@ -21,10 +21,12 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix)
{
QString emote_path;
QList<QString> pathlist;
pathlist << ao_app->get_image_suffix(ao_app->get_character_path(p_char, emote_prefix + p_emote)) <<//Default path
ao_app->get_character_path(p_char, p_emote + ".png") << //Non-animated path if emote_prefix fails
ao_app->get_image_suffix(ao_app->get_theme_path("placeholder")) << //Theme placeholder path
ao_app->get_image_suffix(ao_app->get_default_theme_path("placeholder")); //Default theme placeholder path
pathlist = {
ao_app->get_image_suffix(ao_app->get_character_path(p_char, emote_prefix + p_emote)), //Default path
ao_app->get_character_path(p_char, p_emote + ".png"), //Non-animated path if emote_prefix fails
ao_app->get_image_suffix(ao_app->get_theme_path("placeholder")), //Theme placeholder path
ao_app->get_image_suffix(ao_app->get_default_theme_path("placeholder")), //Default theme placeholder path
};
for (QString path : pathlist)
{

24
src/aomovie.cpp
View File

@ -35,17 +35,21 @@ void AOMovie::play(QString p_gif, QString p_char, QString p_custom_theme, int du
QString shout_path;
QList<QString> pathlist;
if (p_gif == "custom")
pathlist << ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_gif));
else
pathlist << ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_gif + "_bubble"));
pathlist << ao_app->get_image_suffix(ao_app->get_base_path() + "misc/" + p_custom_theme + "/" + p_gif + "_bubble") << //Misc path
ao_app->get_image_suffix(ao_app->get_custom_theme_path(p_custom_theme, p_gif)) << //Custom theme path
ao_app->get_image_suffix(ao_app->get_theme_path(p_gif)) << //Theme path
ao_app->get_image_suffix(ao_app->get_default_theme_path(p_gif)) << //Default theme path
ao_app->get_image_suffix(ao_app->get_theme_path("placeholder")) << //Placeholder path
ao_app->get_image_suffix( ao_app->get_default_theme_path("placeholder")); //Default placeholder path
pathlist = {
ao_app->get_image_suffix(ao_app->get_base_path() + "misc/" + p_custom_theme + "/" + p_gif + "_bubble"), //Misc path
ao_app->get_image_suffix(ao_app->get_custom_theme_path(p_custom_theme, p_gif)), //Custom theme path
ao_app->get_image_suffix(ao_app->get_theme_path(p_gif)), //Theme path
ao_app->get_image_suffix(ao_app->get_default_theme_path(p_gif)), //Default theme path
ao_app->get_image_suffix(ao_app->get_theme_path("placeholder")), //Placeholder path
ao_app->get_image_suffix( ao_app->get_default_theme_path("placeholder")), //Default placeholder path
};
//Add this at the beginning of the list - order matters.
if (p_gif == "custom")
pathlist.prepend(ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_gif)));
else
pathlist.prepend(ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_gif + "_bubble")));
for (QString path : pathlist)
{