[nexuiz-commits] r8422 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Dec 19 11:46:47 EST 2009
Author: div0
Date: 2009-12-19 11:46:47 -0500 (Sat, 19 Dec 2009)
New Revision: 8422
Modified:
trunk/data/balance.cfg
trunk/data/balance25.cfg
trunk/data/balanceHavoc.cfg
trunk/data/balanceNexrun.cfg
trunk/data/balanceSamual.cfg
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/server/constants.qh
trunk/data/qcsrc/server/g_world.qc
trunk/data/update-cvarcount.sh
Log:
-cvar_check
Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg 2009-12-19 16:41:58 UTC (rev 8421)
+++ trunk/data/balance.cfg 2009-12-19 16:46:47 UTC (rev 8422)
@@ -1,10 +1,3 @@
-// NOTE: whenever you add a cvar to this file, run update-cvarcount.sh to
-// update this checksum!
-//
-// And... don't forget to edit the other balance*.cfg too.
-
-set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654
-
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg 2009-12-19 16:41:58 UTC (rev 8421)
+++ trunk/data/balance25.cfg 2009-12-19 16:46:47 UTC (rev 8422)
@@ -1,10 +1,3 @@
-// NOTE: whenever you add a cvar to this file, run update-cvarcount.sh to
-// update this checksum!
-//
-// And... don't forget to edit the other balance*.cfg too.
-
-set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654
-
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg 2009-12-19 16:41:58 UTC (rev 8421)
+++ trunk/data/balanceHavoc.cfg 2009-12-19 16:46:47 UTC (rev 8422)
@@ -1,10 +1,3 @@
-// NOTE: whenever you add a cvar to this file, run update-cvarcount.sh to
-// update this checksum!
-//
-// And... don't forget to edit the other balance*.cfg too.
-
-set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654
-
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
Modified: trunk/data/balanceNexrun.cfg
===================================================================
--- trunk/data/balanceNexrun.cfg 2009-12-19 16:41:58 UTC (rev 8421)
+++ trunk/data/balanceNexrun.cfg 2009-12-19 16:46:47 UTC (rev 8422)
@@ -1,10 +1,3 @@
-// NOTE: whenever you add a cvar to this file, run update-cvarcount.sh to
-// update this checksum!
-//
-// And... don't forget to edit the other balance*.cfg too.
-
-set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654
-
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg 2009-12-19 16:41:58 UTC (rev 8421)
+++ trunk/data/balanceSamual.cfg 2009-12-19 16:46:47 UTC (rev 8422)
@@ -1,10 +1,3 @@
-// NOTE: whenever you add a cvar to this file, run update-cvarcount.sh to
-// update this checksum!
-//
-// And... don't forget to edit the other balance*.cfg too.
-
-set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654
-
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-12-19 16:41:58 UTC (rev 8421)
+++ trunk/data/defaultNexuiz.cfg 2009-12-19 16:46:47 UTC (rev 8422)
@@ -25,9 +25,6 @@
seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
-// default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default eff74125dcce791892223923df9dbf93
-
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
// this doesn't have to be bumped with every release
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2009-12-19 16:41:58 UTC (rev 8421)
+++ trunk/data/qcsrc/server/constants.qh 2009-12-19 16:46:47 UTC (rev 8422)
@@ -1,6 +1,3 @@
-string CVAR_CHECK_DEFAULT = "eff74125dcce791892223923df9dbf93";
-string CVAR_CHECK_BALANCE = "78dd1eac1223c09227ae89b307fb4654";
-
float FALSE = 0;
float TRUE = 1;
Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc 2009-12-19 16:41:58 UTC (rev 8421)
+++ trunk/data/qcsrc/server/g_world.qc 2009-12-19 16:46:47 UTC (rev 8422)
@@ -397,15 +397,6 @@
check_unacceptable_compiler_bugs();
- if(cvar_string("cvar_check_default") != "bypass")
- {
- if(cvar_string("cvar_check_default") != CVAR_CHECK_DEFAULT)
- error("Config file mismatch! Please update defaultNexuiz.cfg to match the QuakeC code, and restart the engine!");
-
- if(cvar_string("cvar_check_balance") != CVAR_CHECK_BALANCE)
- error("Config file mismatch! Please update balance*.cfg to match the QuakeC code, and restart the engine!");
- }
-
compressShortVector_init();
local entity head;
Modified: trunk/data/update-cvarcount.sh
===================================================================
--- trunk/data/update-cvarcount.sh 2009-12-19 16:41:58 UTC (rev 8421)
+++ trunk/data/update-cvarcount.sh 2009-12-19 16:46:47 UTC (rev 8422)
@@ -2,7 +2,6 @@
balance_cfgs="balanceHavoc.cfg balance25.cfg balanceSamual.cfg balanceNexrun.cfg"
-countd=`awk '/^seta? g_/ { print $2; }' defaultNexuiz.cfg | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
countw=`awk '/^seta? g_/ { print $2; }' balance.cfg | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
for b in $balance_cfgs; do
countb=`awk '/^seta? g_/ { print $2; }' "$b" | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
@@ -11,25 +10,3 @@
exit 1
fi
done
-
-sed -i -e "s/^set cvar_check_default .*/set cvar_check_default $countd/" defaultNexuiz.cfg
-sed -i -e "s/^set cvar_check_balance .*/set cvar_check_balance $countw/" balance.cfg
-for b in $balance_cfgs; do
- sed -i -e "s/^set cvar_check_balance .*/set cvar_check_balance $countw/" "$b"
-done
-
-sed -e "
- s/^string CVAR_CHECK_DEFAULT = .*/string CVAR_CHECK_DEFAULT = \"$countd\";/;
- s/^string CVAR_CHECK_BALANCE = .*/string CVAR_CHECK_BALANCE = \"$countw\";/;
-" qcsrc/server/constants.qh > qcsrc/server/constants.qh.new
-
-if ! diff qcsrc/server/constants.qh qcsrc/server/constants.qh.new; then
- mv qcsrc/server/constants.qh.new qcsrc/server/constants.qh
- if [ -z "$DO_NOT_RUN_MAKE" ]; then
- make
- else
- echo "New checksums: $countd, $countw; please recompile!"
- fi
-else
- rm -f qcsrc/server/constants.qh.new
-fi
More information about the nexuiz-commits
mailing list