Compiled Linux version. The welcome screen doesn't display the icon images, and the buttons don't work. Data is found at *prefix*/Magic Set Editor/data and the images at *prefix*/Magic Set Editor/resource. On Ubuntu, *prefix* is /usr/local/share. Resource files are all the image files from resource. I haven't configured them, because I haven't made it past the welcome screen.

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

src/script/functions.cpp

@@ -392,8 +392,8 @@ bool equal(const ScriptValue& a, const ScriptValue& b) {
 		// HACK for ScriptObject<shared_ptr<X> >
 		// assumes different types are layed out the same, and that
 		// should be void*, but then we need getMember for void
-		const ScriptObject<int*>& av = reinterpret_cast<const ScriptObject<int*>&>(a);
-		const ScriptObject<int*>& bv = reinterpret_cast<const ScriptObject<int*>&>(b);
+		const ScriptObject<int*>& av = dynamic_cast<const ScriptObject<int*>&>(a);
+		const ScriptObject<int*>& bv = dynamic_cast<const ScriptObject<int*>&>(b);
 		return av.getValue() == bv.getValue();
 	}
 	return &a == &b;
@@ -565,7 +565,7 @@ ScriptValueP ScriptBuildin_combined_editor::dependencies(Context& ctx, const Dep
 			}
 		}
 	}
-	SCRIPT_RETURN(dependency_dummy);
+	return dependency_dummy;
 }
 
 

src/script/script.cpp

@@ -64,22 +64,22 @@ void Script::addInstruction(InstructionType t) {
 	//	// optimize: push x ; member_v -->  member x
 	//	instructions.back().instr = I_MEMBER;
 	//} else {
-	Instruction i = {t, 0};
+	Instruction i = {t, {0}};
 	instructions.push_back(i);
 	//}
 }
 void Script::addInstruction(InstructionType t, unsigned int d) {
-	Instruction i = {t, d};
+	Instruction i = {t, {d}};
 	instructions.push_back(i);
 }
 void Script::addInstruction(InstructionType t, const ScriptValueP& c) {
 	constants.push_back(c);
-	Instruction i = {t, (unsigned int)constants.size() - 1};
+	Instruction i = {t, {(unsigned int)constants.size() - 1}};
 	instructions.push_back(i);
 }
 void Script::addInstruction(InstructionType t, const String& s) {
 	constants.push_back(toScript(s));
-	Instruction i = {t, (unsigned int)constants.size() - 1};
+	Instruction i = {t, {(unsigned int)constants.size() - 1}};
 	instructions.push_back(i);
 }
 

src/script/scriptable.hpp

@@ -132,7 +132,6 @@ class Scriptable {
 	DECLARE_REFLECTION();
 };
 
-
 // we need some custom io, because the behaviour is different for each of Reader/Writer/GetMember
 
 template <typename T>

src/script/value.hpp

@@ -12,6 +12,7 @@
 #include <util/prec.hpp>
 #include <util/reflect.hpp>
 #include <util/error.hpp>
+#include <util/io/get_member.hpp>
 class Context;
 class Dependency;