mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Fixed some bugs to make GCC work. I needed to change SimpleValueAction to take the function as a variable as opposed to a template parameter - GCC won't accept pointers from a base class in templates.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@231 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -60,13 +60,13 @@ SCRIPT_FUNCTION(contains) {
|
||||
SCRIPT_RULE_1(format, String, format) {
|
||||
String fmt = _("%") + replace_all(format, _("%"), _(""));
|
||||
// determine type expected by format string
|
||||
if (format.find_first_of(_("DdIiOoXx")) != String.npos) {
|
||||
if (format.find_first_of(_("DdIiOoXx")) != String::npos) {
|
||||
SCRIPT_PARAM(int, input);
|
||||
SCRIPT_RETURN(String::Format(fmt, input));
|
||||
} else if (format.find_first_of(_("EeFfGg")) != String.npos) {
|
||||
} else if (format.find_first_of(_("EeFfGg")) != String::npos) {
|
||||
SCRIPT_PARAM(double, input);
|
||||
SCRIPT_RETURN(String::Format(fmt, input));
|
||||
} else if (format.find_first_of(_("Ss")) != String.npos) {
|
||||
} else if (format.find_first_of(_("Ss")) != String::npos) {
|
||||
SCRIPT_PARAM(String, input);
|
||||
SCRIPT_RETURN(format_string(fmt, input));
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user