Merge pull request #543 from AttorneyOnline/fix/effects-pathing

oldmud0 · web-flow · commit f08a293a2f05 · 2021-04-26T18:31:24.000-05:00
Fix effects in misc folders not being detected by get_effects
diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
@@ -848,7 +848,7 @@ QStringList AOApplication::get_effects(QString p_char)
 {
   QString p_misc = read_char_ini(p_char, "effects", "Options");
   QString p_path = get_asset("effects/effects.ini", current_theme, get_subtheme(), default_theme, "");
-  QString p_misc_path = get_asset("effects/effects.ini", current_theme, get_subtheme(), default_theme, p_misc);
+  QString p_misc_path = get_asset("effects.ini", current_theme, get_subtheme(), default_theme, p_misc);
   QStringList effects;
 
   QStringList lines = read_file(p_path).split("\n");

Original file line number	Diff line number	Diff line change
`@@ -848,7 +848,7 @@ QStringList AOApplication::get_effects(QString p_char)`
`848`	`848`	`{`
`849`	`849`	`QString p_misc = read_char_ini(p_char, "effects", "Options");`
`850`	`850`	`QString p_path = get_asset("effects/effects.ini", current_theme, get_subtheme(), default_theme, "");`
`851`		`- QString p_misc_path = get_asset("effects/effects.ini", current_theme, get_subtheme(), default_theme, p_misc);`
	`851`	`+ QString p_misc_path = get_asset("effects.ini", current_theme, get_subtheme(), default_theme, p_misc);`
`852`	`852`	`QStringList effects;`
`853`	`853`
`854`	`854`	`QStringList lines = read_file(p_path).split("\n");`