Tweaked the way to use getScript() like functions;

Made condition and default_expand parameters of expand_keywords optional.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1080 0fc631ac-6414-0410-93d0-97cfa31319b6

src/script/image.hpp

@@ -54,9 +54,9 @@ class ScriptableImage {
 	inline bool local() const { return value && value->local(); }
 	
 	/// Get access to the script, be careful
-	inline Script& getScript() { return script.getScript(); }
+	inline Script& getMutableScript() { return script.getMutableScript(); }
 	/// Get access to the script, always returns a valid script
-	ScriptP getScriptP();
+	ScriptP getValidScriptP();
 	
   protected:
 	OptionalScript  script;		///< The script, not really optional