From 8d6af1d37a842095a2014e245cc88fc5e0e58690 Mon Sep 17 00:00:00 2001 From: twanvl Date: Sun, 18 May 2008 17:53:44 +0000 Subject: [PATCH] Fixed some bugs from last commit (typo in SCRIPT_PARAM_DEFAULT_C definition) git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@858 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/script/functions/util.hpp | 2 +- src/script/script.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/script/functions/util.hpp b/src/script/functions/util.hpp index 295802cb..4abddb30 100644 --- a/src/script/functions/util.hpp +++ b/src/script/functions/util.hpp @@ -137,7 +137,7 @@ inline Type from_script(const ScriptValueP& v, Variable var) { ScriptValueP name##_ = ctx.getVariableOpt(str); \ Type name = name##_ ? from_script(name##_, str) : def #define SCRIPT_PARAM_DEFAULT_C(Type, name, def) \ - SCRIPT_PARAM_DEFAULT_N(Type, SCRIPT_VAR_ ## name, name, name) + SCRIPT_PARAM_DEFAULT_N(Type, SCRIPT_VAR_ ## name, name, def) // ----------------------------------------------------------------------------- : Rules diff --git a/src/script/script.cpp b/src/script/script.cpp index 39426111..7601baf2 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -55,6 +55,7 @@ void init_script_variables() { Var(in); Var(match); Var(replace); + VarN(in_context,_("in context")); Var(order); Var(filter); Var(choice);