fix build on linux

src/data/action/value.hpp

@@ -62,7 +62,7 @@ ValueAction* value_action(const MultipleChoiceValueP& value, const ScriptValueP&
 class MultipleChoiceValueAction : public ValueAction {
   public:
 	inline MultipleChoiceValueAction(const ValueP& value, const ScriptValueP& new_value, const String& changed_choice)
-		: ValueAction(value), new_value(new_value), changed_choice(changed_choice)
+		: ValueAction(value), changed_choice(changed_choice), new_value(new_value)
 	{}
 	
 	virtual void perform(bool to_undo);

src/data/field/choice.cpp

@@ -27,11 +27,10 @@ IMPLEMENT_FIELD_TYPE(Choice, "choice");
 IMPLEMENT_REFLECTION(ChoiceField) {
 	REFLECT_BASE(AnyField);
 	REFLECT_N("choices", choices->choices);
-	REFLECT_IF_READING {
-	}
 	REFLECT(choice_colors);
 	REFLECT(choice_colors_cardlist);
 }
+
 void ChoiceField::after_reading(Version ver) {
 	AnyField::after_reading(ver);
 	choices->initIds();

src/gfx/generated_image.hpp

@@ -355,8 +355,7 @@ class BuiltInImage : public GeneratedImage {
 /// Use a symbol as an image
 class SymbolToImage : public GeneratedImage {
   public:
-	SymbolToImage(const SymbolToImage& symbol, const SymbolVariationP& variation);
-	SymbolToImage(bool is_local, const LocalFileName& filename, const SymbolVariationP& variation = SymbolVariationP());
+	SymbolToImage(bool is_local, const LocalFileName& filename, const SymbolVariationP& variation);
 	~SymbolToImage();
 	virtual Image generate(const Options& opt) const;
 	virtual bool operator == (const GeneratedImage& that) const;

src/gui/set/console_panel.cpp

@@ -389,11 +389,11 @@ END_EVENT_TABLE()
 
 ConsolePanel::ConsolePanel(Window* parent, int id)
 	: SetWindowPanel(parent, id)
+	, messages(nullptr)
+	, entry(nullptr)
 	, is_active_window(false)
 	, blinker_state(0)
 	, blinker_timer(this)
-	, messages(nullptr)
-	, entry(nullptr)
 {
 	// init controls
 	splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);

src/script/to_value.hpp

@@ -131,7 +131,7 @@ inline ScriptDefault const* is_default(ScriptValueP const& x) {
 	return is_default(x.get());
 }
 inline ScriptValueP make_default(ScriptValueP const& x) {
-	return is_default(x) ? x : intrusive(new ScriptDefault(x));
+	return is_default(x) ? x : intrusive_ptr<ScriptValue>(new ScriptDefault(x));
 }
 inline ScriptValueP with_defaultness_of(ScriptValueP const& of, ScriptValueP const& x) {
 	return is_default(of) ? make_default(x) : x;

src/util/io/package.cpp

@@ -351,7 +351,7 @@ LocalFileName LocalFileName::fromReadString(String const& fn, String const& pref
 			return local_name;
 		} catch (Error) {
 			// ignore errors
-			return _("");
+			return LocalFileName();
 		}
 	} else {
 		return LocalFileName(fn);

src/util/reflect.hpp

@@ -110,7 +110,7 @@
 #define REFLECT_NAMELESS(var) reflector.handle(var)
 
 /// Declare that the variables of a base class should also be reflected
-#define REFLECT_BASE(Base)    Base::reflect_impl(reflector)
+#define REFLECT_BASE(Base)    Base::reflect(reflector)
 
 /// Reflect a group of declarations only when reading
 /** Usage: