From: Samual Lenks <samual@xonotic.org>
Date: Sat, 23 Feb 2013 22:30:23 +0000 (-0500)
Subject: Strip out versioning (not necessary)
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~152
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ca89b2ab9faf0fc84a6136883a50cbb45f52a665;p=xonotic%2Fxonotic-data.pk3dir.git

Strip out versioning (not necessary)
---

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index d207a0f2d..f9ac2ad56 100644
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -57,12 +57,6 @@ void Dump_Notifications(float fh, float alsoprint)
 	NOTIF_WRITE("// **                                          ** //\n");
 	NOTIF_WRITE("// ********************************************** //\n");
 
-	NOTIF_WRITE("\n// Version number to identify mismatches between code and config file...\n");
-	NOTIF_WRITE("// Increment NOTIF_VERSION in common/notifications.qh with any\n");
-	NOTIF_WRITE("// new notifications or other changes to notif cvars/this config.\n");
-	
-	NOTIF_WRITE(sprintf("set notification_version %d\n", NOTIF_VERSION));
-
 	// These notifications will also append their string as a comment...
 	// This is not necessary, and does not matter if they vary between config versions,
 	// it is just a semi-helpful tool for those who want to manually change their user settings.
diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 8f39a6cff..3ae73940b 100644
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -11,12 +11,6 @@
 
 #define NO_MSG -12345 
 
-// Current version number of the configuration file for notifications...
-// This is used to check matches between the config file and the code,
-// and should be incremented with any new notifications or any other changes
-// to notification cvars, notification list, or notificiation config.
-#define NOTIF_VERSION 4
-
 #define EIGHT_VARS_TO_VARARGS_VARLIST \
 	VARITEM(1, 0, s1) \
 	VARITEM(2, 0, XPD(s1, s2)) \
@@ -530,7 +524,6 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration,
 
 #define NOTIF_ADD_AUTOCVAR(name,default) var float autocvar_notification_##name = default;
 
-var float autocvar_notification_version = NOTIF_VERSION;
 var float autocvar_notification_show_sprees = TRUE;
 var float autocvar_notification_show_sprees_info = 3; // 0 = off, 1 = target only, 2 = attacker only, 3 = target and attacker
 var float autocvar_notification_show_sprees_info_newline = FALSE;
@@ -540,13 +533,11 @@ var float autocvar_notification_errors_are_fatal = TRUE;
 #ifdef SVQC
 .float FRAG_VERBOSE;
 void Notification_GetCvars(void);
-var float autocvar_notification_version_mismatch_server_error = TRUE;
 #else
 var float autocvar_notification_allow_chatboxprint = TRUE;
 var float autocvar_notification_show_sprees_center = TRUE;
 var float autocvar_notification_show_sprees_center_specialonly = TRUE;
 var float autocvar_notification_frag_verbose = TRUE;
-var float autocvar_notification_version_mismatch_client_error = FALSE;
 #endif
 
 
@@ -1057,7 +1048,9 @@ string Process_Notif_Args(float is_hudargs, string args, string notiftype, strin
 void RegisterNotifications_First()
 {
 	notif_global_error = FALSE;
-	if(autocvar_notification_version != NOTIF_VERSION)
+	
+	// maybe do another implementation of this with checksums? for now, we don't need versioning
+	/*if(autocvar_notification_version != NOTIF_VERSION)
 	{
 		#ifdef CSQC
 		if(autocvar_notification_version_mismatch_client_error)
@@ -1068,7 +1061,7 @@ void RegisterNotifications_First()
 
 		print(sprintf("^1NOTIFICATION VERSION MISMATCH: ^7program = %s, config = %d, code = %d.\n",
 			"foobar", autocvar_notification_version, NOTIF_VERSION));
-	}
+	}*/
 }
 
 void RegisterNotifications_Done()