X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcommand%2Fgeneric.qc;h=2438c0173623c892ddfad2c75f54a0aadf237fa8;hb=7f6f6ddf5a60125f13cbc906c5e29faf61310d80;hp=08b0b69ddffcedd8b52840e40aa601d739d990cb;hpb=5792233348864c255d2a73e2d443d3c6b6b7205b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index 08b0b69dd..2438c0173 100644
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -28,7 +28,7 @@ void Curl_URI_Get_Callback(float id, float status, string data)
 	do_cvar = curl_uri_get_cvar[i];
 	if(status != 0)
 	{
-		printf(_("error: status is %d\n"), status);
+		dprintf("error: status is %d\n", status);
 		if(do_cvar)
 			strunzone(do_cvar);
 		return;
@@ -153,7 +153,7 @@ void GenericCommand_qc_curl(float request, float argc)
 			{
 				curl_uri_get_exec[curl_uri_get_pos] = do_exec;
 				curl_uri_get_cvar[curl_uri_get_pos] = do_cvar;
-				curl_uri_get_pos = mod(curl_uri_get_pos + 1, URI_GET_CURL_END - URI_GET_CURL + 1);
+				curl_uri_get_pos = (curl_uri_get_pos + 1) % (URI_GET_CURL_END - URI_GET_CURL + 1);
 			}
 			else
 				print(_("error creating curl handle\n"));
@@ -239,12 +239,12 @@ void GenericCommand_dumpnotifs(float request)
 
 			if(filename == "")
 			{
-				filename = "notifications.cfg";
+				filename = "notifications_dump.cfg";
 				alsoprint = FALSE;
 			}
 			else if(filename == "-")
 			{
-				filename = "notifications.cfg";
+				filename = "notifications_dump.cfg";
 				alsoprint = TRUE;
 			}
 			fh = fopen(filename, FILE_WRITE);
@@ -269,7 +269,113 @@ void GenericCommand_dumpnotifs(float request)
 		case CMD_REQUEST_USAGE:
 		{
 			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " dumpnotifs [filename]"));
-			print("  Where 'filename' is the file to write (default is notifications.cfg),\n");
+			print("  Where 'filename' is the file to write (default is notifications_dump.cfg),\n");
+			print("  if supplied with '-' output to console as well as default,\n");
+			print("  if left blank, it will only write to default.\n");
+			return;
+		}
+	}
+}
+
+void GenericCommand_dumpweapons(float request) // WEAPONTODO: make this work with other progs than just server
+{
+	switch(request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+			#ifdef SVQC
+			wep_config_file = -1;
+			wep_config_alsoprint = -1;
+			string filename = argv(1);
+			
+			if(filename == "")
+			{
+				filename = "weapons_dump.cfg";
+				wep_config_alsoprint = FALSE;
+			}
+			else if(filename == "-")
+			{
+				filename = "weapons_dump.cfg";
+				wep_config_alsoprint = TRUE;
+			}
+			wep_config_file = fopen(filename, FILE_WRITE);
+			
+			if(wep_config_file >= 0)
+			{
+				Dump_Weapon_Settings();
+				print(sprintf("Dumping weapons... File located in ^2data/data/%s^7.\n", filename));
+				fclose(wep_config_file);
+				wep_config_file = -1;
+				wep_config_alsoprint = -1;
+			}
+			else
+			{
+				print(sprintf("^1Error: ^7Could not open file '%s'!\n", filename));
+			}
+			#else
+			print(_("Weapons dump command only works with sv_cmd.\n"));
+			#endif
+			return;
+		}
+			
+		default:
+		case CMD_REQUEST_USAGE:
+		{
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " dumpweapons [filename]"));
+			print("  Where 'filename' is the file to write (default is weapons_dump.cfg),\n");
+			print("  if supplied with '-' output to console as well as default,\n");
+			print("  if left blank, it will only write to default.\n");
+			return;
+		}
+	}
+}
+
+void GenericCommand_dumpturrets(float request)
+{
+	switch(request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+			#ifdef SVQC
+			tur_config_file = -1;
+			tur_config_alsoprint = -1;
+			string filename = argv(1);
+			
+			if(filename == "")
+			{
+				filename = "turrets_dump.cfg";
+				tur_config_alsoprint = FALSE;
+			}
+			else if(filename == "-")
+			{
+				filename = "turrets_dump.cfg";
+				tur_config_alsoprint = TRUE;
+			}
+			tur_config_file = fopen(filename, FILE_WRITE);
+			
+			if(tur_config_file >= 0)
+			{
+				Dump_Turret_Settings();
+				print(sprintf("Dumping turrets... File located in ^2data/data/%s^7.\n", filename));
+				fclose(tur_config_file);
+				tur_config_file = -1;
+				tur_config_alsoprint = -1;
+			}
+			else
+			{
+				print(sprintf("^1Error: ^7Could not open file '%s'!\n", filename));
+			}
+			#else
+			print(_("Turrets dump command only works with sv_cmd.\n"));
+			#endif
+			return;
+		}
+			
+		default:
+		case CMD_REQUEST_USAGE:
+		{
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " dumpturrets [filename]"));
+			print("  Where 'filename' is the file to write (default is turrets_dump.cfg),\n");
 			print("  if supplied with '-' output to console as well as default,\n");
 			print("  if left blank, it will only write to default.\n");
 			return;
@@ -585,6 +691,8 @@ void GenericCommand_(float request)
 	GENERIC_COMMAND("addtolist", GenericCommand_addtolist(request, arguments), "Add a string to a cvar") \
 	GENERIC_COMMAND("dumpcommands", GenericCommand_dumpcommands(request), "Dump all commands on the program to *_cmd_dump.txt") \
 	GENERIC_COMMAND("dumpnotifs", GenericCommand_dumpnotifs(request), "Dump all notifications into notifications_dump.txt") \
+	GENERIC_COMMAND("dumpturrets", GenericCommand_dumpturrets(request), "Dump all turrets into turrets_dump.txt") \
+	GENERIC_COMMAND("dumpweapons", GenericCommand_dumpweapons(request), "Dump all weapons into weapons_dump.txt") \
 	GENERIC_COMMAND("maplist", GenericCommand_maplist(request, arguments), "Automatic control of maplist") \
 	GENERIC_COMMAND("nextframe", GenericCommand_nextframe(request, arguments, command), "Execute the given command next frame of this VM") \
 	GENERIC_COMMAND("qc_curl", GenericCommand_qc_curl(request, arguments), "Queries a URL") \