X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fwaypoints.qc;h=384f1e7ce1c87ddebc1d048a8838d69181f051a6;hb=3cfa3eaf6856fe76f7fd8c945fbfab2e9e28014c;hp=fa82d926b63e92776cfd293dbebccf15ba20ad04;hpb=0f1ffe9c0565f1f1a0d6f58240760f227aa3ee99;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc
index fa82d926b..384f1e7ce 100644
--- a/qcsrc/server/bot/default/waypoints.qc
+++ b/qcsrc/server/bot/default/waypoints.qc
@@ -1028,10 +1028,33 @@ void waypoint_saveall()
 		return;
 	}
 
-	// add 3 comments to not break compatibility with older Xonotic versions
+	float sym = autocvar_g_waypointeditor_symmetrical;
+	string sym_str = ftos(sym);
+	if (sym == -1 || (sym == 1 && autocvar_g_waypointeditor_symmetrical_order >= 2))
+	{
+		if (sym == 1)
+		{
+			sym_str = cons(sym_str, "-");
+			sym_str = cons(sym_str, "-");
+		}
+		else
+		{
+			sym_str = cons(sym_str, ftos(autocvar_g_waypointeditor_symmetrical_origin.x));
+			sym_str = cons(sym_str, ftos(autocvar_g_waypointeditor_symmetrical_origin.y));
+		}
+		if (autocvar_g_waypointeditor_symmetrical_order >= 2)
+			sym_str = cons(sym_str, ftos(autocvar_g_waypointeditor_symmetrical_order));
+	}
+	else if (autocvar_g_waypointeditor_symmetrical == -2)
+	{
+		sym_str = cons(sym_str, ftos(autocvar_g_waypointeditor_symmetrical_axis.x));
+		sym_str = cons(sym_str, ftos(autocvar_g_waypointeditor_symmetrical_axis.y));
+	}
+
+	// a group of 3 comments doesn't break compatibility with older Xonotic versions
 	// (they are read as a waypoint with origin '0 0 0' and flag 0 though)
 	fputs(file, strcat("//", "WAYPOINT_VERSION ", ftos_decimals(WAYPOINT_VERSION, 2), "\n"));
-	fputs(file, strcat("//", "\n"));
+	fputs(file, strcat("//", "WAYPOINT_SYMMETRY ", sym_str, "\n"));
 	fputs(file, strcat("//", "\n"));
 
 	int c = 0;
@@ -1085,6 +1108,8 @@ float waypoint_loadall()
 
 	bool parse_comments = true;
 	float ver = 0;
+	float sym = 0;
+	float sym_param1 = 0, sym_param2 = 0, sym_param3 = 0;
 
 	while ((s = fgets(file)))
 	{
@@ -1094,6 +1119,14 @@ float waypoint_loadall()
 			{
 				if(substring(s, 2, 17) == "WAYPOINT_VERSION ")
 					ver = stof(substring(s, 19, -1));
+				else if(substring(s, 2, 18) == "WAYPOINT_SYMMETRY ")
+				{
+					int tokens = tokenizebyseparator(substring(s, 20, -1), " ");
+					if (tokens) { sym = stof(argv(0)); }
+					if (tokens > 1) { sym_param1 = stof(argv(1)); }
+					if (tokens > 2) { sym_param2 = stof(argv(2)); }
+					if (tokens > 3) { sym_param3 = stof(argv(3)); }
+				}
 				continue;
 			}
 			else
@@ -1124,6 +1157,35 @@ float waypoint_loadall()
 	fclose(file);
 	LOG_TRACE("loaded ", ftos(cwp), " waypoints and ", ftos(cwb), " wayboxes from maps/", mapname, ".waypoints");
 
+	if (autocvar_g_waypointeditor && autocvar_g_waypointeditor_symmetrical_allowload)
+	{
+		cvar_set("g_waypointeditor_symmetrical", ftos(sym));
+		if (sym == 1 && sym_param3 < 2)
+			cvar_set("g_waypointeditor_symmetrical_order", "0"); // make sure this is reset if not loaded
+		if (sym == -1 || (sym == 1 && sym_param3 >= 2))
+		{
+			string params;
+			if (sym == 1)
+				params = cons("-", "-");
+			else
+			{
+				params = cons(ftos(sym_param1), ftos(sym_param2));
+				cvar_set("g_waypointeditor_symmetrical_origin", params);
+			}
+			cvar_set("g_waypointeditor_symmetrical_order", ftos(sym_param3));
+			LOG_INFO("Waypoint editor: loaded symmetry ", ftos(sym), " with origin ", params, " and order ", ftos(sym_param3));
+		}
+		else if (sym == -2)
+		{
+			string params = strcat(ftos(sym_param1), " ", ftos(sym_param2));
+			cvar_set("g_waypointeditor_symmetrical_axis", params);
+			LOG_INFO("Waypoint editor: loaded symmetry ", ftos(sym), " with axis ", params);
+		}
+		else
+			LOG_INFO("Waypoint editor: loaded symmetry ", ftos(sym));
+		LOG_INFO(strcat("g_waypointeditor_symmetrical", " has been set to ", cvar_string("g_waypointeditor_symmetrical")));
+	}
+
 	return cwp + cwb;
 }