From fed86da53aa6f5cd646d9981bedaa9dc790c5d25 Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 29 Nov 2009 14:10:15 +0000 Subject: [PATCH] fix more broken cvars git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8338 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/balance.cfg | 2 +- data/balance25.cfg | 2 +- data/balanceHavoc.cfg | 2 +- data/balanceNexrun.cfg | 2 +- data/balanceSamual.cfg | 2 +- data/defaultNexuiz.cfg | 5 ++++- data/qcsrc/server/constants.qh | 4 ++-- data/qcsrc/server/g_world.qc | 4 +--- data/qcsrc/server/w_rocketlauncher.qc | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/data/balance.cfg b/data/balance.cfg index 2216ef757..031f93031 100644 --- a/data/balance.cfg +++ b/data/balance.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit the other balance*.cfg too. -set cvar_check_balance 84d3d5976dd5870e8fc739c8f2a6451a +set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654 // {{{ weapon replacement // NOTE: this only replaces weapons on the map diff --git a/data/balance25.cfg b/data/balance25.cfg index c09c489d2..5d7dc9fc3 100644 --- a/data/balance25.cfg +++ b/data/balance25.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit the other balance*.cfg too. -set cvar_check_balance 84d3d5976dd5870e8fc739c8f2a6451a +set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654 // {{{ weapon replacement // NOTE: this only replaces weapons on the map diff --git a/data/balanceHavoc.cfg b/data/balanceHavoc.cfg index 7a96c1fb2..433638911 100644 --- a/data/balanceHavoc.cfg +++ b/data/balanceHavoc.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit the other balance*.cfg too. -set cvar_check_balance 84d3d5976dd5870e8fc739c8f2a6451a +set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654 // {{{ weapon replacement // NOTE: this only replaces weapons on the map diff --git a/data/balanceNexrun.cfg b/data/balanceNexrun.cfg index 12d562c1a..3ce8816ea 100644 --- a/data/balanceNexrun.cfg +++ b/data/balanceNexrun.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit the other balance*.cfg too. -set cvar_check_balance 84d3d5976dd5870e8fc739c8f2a6451a +set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654 // {{{ weapon replacement // NOTE: this only replaces weapons on the map diff --git a/data/balanceSamual.cfg b/data/balanceSamual.cfg index cc156e319..787499aa6 100644 --- a/data/balanceSamual.cfg +++ b/data/balanceSamual.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit the other balance*.cfg too. -set cvar_check_balance 84d3d5976dd5870e8fc739c8f2a6451a +set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654 // {{{ weapon replacement // NOTE: this only replaces weapons on the map diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index f8698d0f1..3a252dcb8 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -26,7 +26,7 @@ if_dedicated alias if_client "" 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 69623911fa2fbe35f109b546de468762 +set cvar_check_default e5b0481ca565fa186011068d736c55a7 // Nexuiz version (formatted for machines) // used to determine if a client version is compatible @@ -484,6 +484,7 @@ seta g_maplist_index 0 "this is used internally for saving position in maplist c seta g_maplist_selectrandom 0 "if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle" seta g_maplist_shuffle 1 "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list" set g_maplist_check_waypoints 0 "when 1, maps are skipped if there currently are bots, but the map has no waypoints" +set samelevel 0 "when 1, always play the same level over and over again" set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap" set g_cloaked 0 "display all players mostly invisible" @@ -1030,6 +1031,8 @@ bind F3 spec // and in regular intervals, this weapon is cycled set g_nixnex 0 "No Items Nexuiz - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon, and so on" set g_nixnex_with_laser 0 "always carry the laser as an additional weapon in NixNex" +set g_nixnex_with_healtharmor 0 "when 1, health and armor still show up in NixNex" +set g_nixnex_with_powerups 0 "when 1, powerups still show up in NixNex" // score log set sv_logscores_console 0 "print scores to server console" diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh index 923230aa2..744345c3c 100644 --- a/data/qcsrc/server/constants.qh +++ b/data/qcsrc/server/constants.qh @@ -1,5 +1,5 @@ -string CVAR_CHECK_DEFAULT = "69623911fa2fbe35f109b546de468762"; -string CVAR_CHECK_BALANCE = "84d3d5976dd5870e8fc739c8f2a6451a"; +string CVAR_CHECK_DEFAULT = "e5b0481ca565fa186011068d736c55a7"; +string CVAR_CHECK_BALANCE = "78dd1eac1223c09227ae89b307fb4654"; float FALSE = 0; float TRUE = 1; diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index 5f76f795f..7211e6709 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -518,8 +518,6 @@ void spawnfunc_worldspawn (void) s = strcat(s, ":no_use_ammunition"); if(!cvar("g_pickup_items")) s = strcat(s, ":no_pickup_items"); - if(cvar("g_instagib")) - s = strcat(s, ":instagib"); if(cvar_string("g_weaponarena") != "0") s = strcat(s, ":", cvar_string("g_weaponarena"), " arena"); if(cvar("g_nixnex")) @@ -2077,7 +2075,7 @@ string MapVote_Suggest(string m) m = MapInfo_FixName(m); if(!m) return "The map you suggested is not available on this server."; - if(!cvar("g_maplist_votable_override_mostrecent")) + if(!cvar("g_maplist_votable_suggestions_override_mostrecent")) if(Map_IsRecent(m)) return "This server does not allow for recent maps to be played again. Please be patient for some rounds."; diff --git a/data/qcsrc/server/w_rocketlauncher.qc b/data/qcsrc/server/w_rocketlauncher.qc index 15832f6eb..d3cf3e1fa 100644 --- a/data/qcsrc/server/w_rocketlauncher.qc +++ b/data/qcsrc/server/w_rocketlauncher.qc @@ -305,7 +305,7 @@ void W_Rocket_Attack (void) missile.pushltime = time + cvar("g_balance_rocketlauncher_guidedelay"); missile.classname = "rocket"; missile.bot_dodge = TRUE; - missile.bot_dodgerating = cvar("g_balance_rocketlauncher_primary_damage") * 2; // * 2 because it can be detonated inflight which makes it even more dangerous + missile.bot_dodgerating = cvar("g_balance_rocketlauncher_damage") * 2; // * 2 because it can be detonated inflight which makes it even more dangerous missile.takedamage = DAMAGE_YES; missile.damageforcescale = cvar("g_balance_rocketlauncher_damageforcescale"); -- 2.39.2