aboutsummaryrefslogtreecommitdiff
path: root/include/aoapplication.h
diff options
context:
space:
mode:
authorCrystalwarrior <Varsash@Gmail.com>2022-07-30 15:38:37 +0300
committerGitHub <noreply@github.com>2022-07-30 14:38:37 +0200
commitd9bdb7e6bca8c5168d1b280fce4ee60c894a9a7e (patch)
treef6826b6f6dd3dd00b5c42e227c8b6f407661fe5d /include/aoapplication.h
parentd8c89f056bcf7326519784633c374fdda5999736 (diff)
Fix get_effect_property ignoring the provided effect folder and using the char.ini instead. Makes it consistent with get_effect behavior (#828)
Diffstat (limited to 'include/aoapplication.h')
-rw-r--r--include/aoapplication.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index 3aa21a1f..53674005 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -422,12 +422,12 @@ public:
// a string
QStringList get_effects(QString p_char);
- // t
+ // Get the correct effect image
QString get_effect(QString effect, QString p_char, QString p_folder);
// Return p_property of fx_name. If p_property is "sound", return
// the value associated with fx_name, otherwise use fx_name + '_' + p_property.
- QString get_effect_property(QString fx_name, QString p_char, QString p_property);
+ QString get_effect_property(QString fx_name, QString p_char, QString p_folder, QString p_property);
// Returns the custom realisation used by the character.
QString get_custom_realization(QString p_char);