diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2021-06-09 19:41:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 19:41:09 -0500 |
| commit | 9e0a964af814fa941f04ebebbc28bdbb23977651 (patch) | |
| tree | 2ba4c962b08aed1fee29a8315776605347ee14bf /src/aolayer.cpp | |
| parent | 2adb32bb61a62bb085d5d62f4115ae21c6bb50cd (diff) | |
| parent | 2f50cd55281cfa963ea2d6fb566b1eee675c643f (diff) | |
Merge pull request #554 from AttorneyOnline/feature/mounting
Add support for mounting multiple base folders
Diffstat (limited to 'src/aolayer.cpp')
| -rw-r--r-- | src/aolayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/aolayer.cpp b/src/aolayer.cpp index 2c6c9117..3791d66b 100644 --- a/src/aolayer.cpp +++ b/src/aolayer.cpp @@ -138,7 +138,7 @@ void BackgroundLayer::load_image(QString p_filename) { play_once = false; cull_image = false; - QString design_path = ao_app->get_background_path("design.ini"); + VPath design_path = ao_app->get_background_path("design.ini"); transform_mode = ao_app->get_scaling(ao_app->read_design_ini("scaling", design_path)); stretch = ao_app->read_design_ini("stretch", design_path).startsWith("true"); @@ -197,7 +197,7 @@ void CharLayer::load_image(QString p_filename, QString p_charname, << current_emote << " from character: " << p_charname << " continuous: " << continuous; #endif - QStringList pathlist = { + QVector<VPath> pathlist { ao_app->get_character_path( p_charname, prefix + current_emote), // Default path ao_app->get_character_path( @@ -207,7 +207,7 @@ void CharLayer::load_image(QString p_filename, QString p_charname, ao_app->get_character_path( p_charname, current_emote), // Just use the non-prefixed image, animated or not - current_emote, // The path by itself after the above fail + VPath(current_emote), // The path by itself after the above fail ao_app->get_theme_path("placeholder"), // Theme placeholder path ao_app->get_theme_path( "placeholder", ao_app->default_theme)}; // Default theme placeholder path |