From c2edd1664a83cfd3f79e0d6393bbd2e2337bbc13 Mon Sep 17 00:00:00 2001
From: blub0 <blub0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 10 Jul 2008 16:58:18 +0000
Subject: [PATCH] moved the CVAR_* vars from menu/msys.qh to
 common/constants.qh added "..." to registercvar in csqc, added CVAR_SAVE to
 sbar_columns

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3810 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/client/Main.qc          |  2 +-
 data/qcsrc/client/csqc_builtins.qc |  2 +-
 data/qcsrc/client/sbar.qc          |  2 +-
 data/qcsrc/common/constants.qh     | 10 ++++++++++
 data/qcsrc/menu/msys.qh            |  7 -------
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index 1c84797d7..b8001b5ad 100644
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -35,7 +35,7 @@ void CSQC_Init(void)
 	registercmd("sbar_columns_help");
 
 	registercvar("sbar_usecsqc", "1");
-	registercvar("sbar_columns", "ping name | caps returns frags deaths");
+	registercvar("sbar_columns", "ping name | caps returns frags deaths", CVAR_SAVE);
 
 	gametype = 0;
 
diff --git a/data/qcsrc/client/csqc_builtins.qc b/data/qcsrc/client/csqc_builtins.qc
index 880f13a17..572ec3ca6 100644
--- a/data/qcsrc/client/csqc_builtins.qc
+++ b/data/qcsrc/client/csqc_builtins.qc
@@ -56,7 +56,7 @@ float(string s)								stof = #81;
 
 
 void (vector v1, vector min, vector max, vector v2, float nomonsters, entity forent)	tracebox = #90;
-float (string name, string value)					registercvar = #93;
+float (string name, string value, ...)					registercvar = #93;
 
 entity (entity start, .entity fld, entity match)			findentity = #98;
 entity (entity start, .float fld, float match)				findfloat = #98;
diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 372381f2d..98e2e75fc 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -377,7 +377,7 @@ float Sbar_IsFieldMasked(float field, float mask)
 	return false;
 }
 
-// shamelessly stolen from menu QC :P
+// shamelessly stolen from menu QC :P <- as if I would steal YOUR code pfft ;)
 float textLengthUpToWidth(string theText, float maxWidth, float handleColors)
 {
 	// STOP.
diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh
index 3377064ab..65da3fab9 100644
--- a/data/qcsrc/common/constants.qh
+++ b/data/qcsrc/common/constants.qh
@@ -149,6 +149,16 @@ const float K_MOUSE14		=	527;
 const float K_MOUSE15		=	528;
 const float K_MOUSE16		=	529;
 
+///////////////////////////
+// cvar constants
+
+float CVAR_SAVE 	= 1;
+float CVAR_NOTIFY 	= 2;
+float CVAR_READONLY	= 4;
+
+///////////////////////////
+// csqc communication stuff
+
 const float ENTCS_MSG_END = 0;
 const float ENTCS_MSG_ONS_GPS = 1;
 const float ENTCS_MSG_ONS_REMOVE = 2;
diff --git a/data/qcsrc/menu/msys.qh b/data/qcsrc/menu/msys.qh
index 13d06b8ad..0814d1c0c 100644
--- a/data/qcsrc/menu/msys.qh
+++ b/data/qcsrc/menu/msys.qh
@@ -83,13 +83,6 @@ float DRAWFLAG_MODULATE 	= 2;
 float DRAWFLAG_2XMODULATE   = 3;
 
 
-///////////////////////////
-// cvar constants
-
-float CVAR_SAVE 	= 1;
-float CVAR_NOTIFY 	= 2;
-float CVAR_READONLY	= 4;
-
 ///////////////////////////
 // server list constants
 
-- 
2.39.2