CloneEvent fix

src/game_map.cpp

@@ -446,10 +446,13 @@ bool Game_Map::CloneMapEvent(int src_map_id, int src_event_id, int target_x, int
 		}), new_event);
 
 	auto game_event = Game_Event(GetMapId(), &*insert_it);
+	game_event.data()->easyrpg_clone_event_id = source_event->ID;
+	game_event.data()->easyrpg_clone_map_id = src_map_id;
+
 	events.insert(
 		std::upper_bound(events.begin(), events.end(), game_event, [](const auto& e, const auto& e2) {
 			return e.GetId() < e2.GetId();
-		}), Game_Event(GetMapId(), &*insert_it));
+		}), std::move(game_event));
 
 	UpdateUnderlyingEventReferences();
 

src/game_strings.cpp

@@ -219,7 +219,7 @@ std::string Game_Strings::FromFile(std::string_view filename, int encoding, bool
 	return file_content;
 }
 
-std::string_view Game_Strings::ToFile(Str_Params params, std::string filename, int encoding) {
+bool Game_Strings::ToFile(Str_Params params, std::string filename, int encoding) {
 	std::string str = ToString(Get(params.string_id));
 
 	if (params.extract) {
@@ -242,13 +242,13 @@ std::string_view Game_Strings::ToFile(Str_Params params, std::string filename, i
 	if (!txt_out) {
 		if (!FileFinder::Save().MakeDirectory(txt_dir, false)) {
 			Output::Warning("Maniac String Op ToFile failed. Cannot create directory {}", txt_dir);
-			return {};
+			return false;
 		}
 
 		txt_out = FileFinder::Save().OpenOutputStream(filename);
 		if (!txt_out) {
 			Output::Warning("Maniac String Op ToFile failed. Cannot write to {}", filename);
-			return {};
+			return false;
 		}
 	}
 
@@ -262,7 +262,7 @@ std::string_view Game_Strings::ToFile(Str_Params params, std::string filename, i
 
 	AsyncHandler::SaveFilesystem();
 
-	return str;
+	return true;
 }
 
 std::string_view Game_Strings::PopLine(Str_Params params, int offset, int string_out_id) {
@@ -320,8 +320,10 @@ std::string_view Game_Strings::ExMatch(Str_Params params, std::string expr, int
 	if (string_out_id > 0) {
 		params.string_id = string_out_id;
 		Set(params, str_result);
+
+		return Get(params.string_id);
 	}
-	return str_result;
+	return {};
 }
 
 const Game_Strings::Strings_t& Game_Strings::RangeOp(Str_Params params, int string_id_1, std::string string, int op, int args[], Game_Variables& variables) {

src/game_strings.h

@@ -88,7 +88,7 @@ class Game_Strings {
 	int InStr(Str_Params params, std::string search, int var_id, int begin, Game_Variables& variables) const;
 	int Split(Str_Params params, const std::string& delimiter, int string_out_id, int var_id, Game_Variables& variables);
 	static std::string FromFile(std::string_view filename, int encoding, bool& do_yield);
-	std::string_view ToFile(Str_Params params, std::string filename, int encoding);
+	bool ToFile(Str_Params params, std::string filename, int encoding);
 	std::string_view PopLine(Str_Params params, int offset, int string_out_id);
 	std::string_view ExMatch(Str_Params params, std::string expr, int var_id, int begin, int string_out_id, Game_Variables& variables);