Load all configs in default.cfg instead of defaultVT.cfg

diff --git a/data/default.cfg b/data/default.cfg
index e92bba5498844c4526a5399430f788c701ef07c9..c6d6a1b288f608248844834f3ec4c83e31761ab0 100644 (file)
--- a/data/default.cfg
+++ b/data/default.cfg
@@ -1 +1,7 @@
+// load the default settings\r
 exec defaultVT.cfg\r
+exec botsVT.cfg\r
+exec ctfscoringVT.cfg\r
+exec physicsVT.cfg\r
+exec balanceVT.cfg\r
+exec turretsVT.cfg
\ No newline at end of file

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index baa6477d1193e1b63de2ceb946b6f1d30a331766..e595ba89cd81234675e345cf19bbef7dfd3c019a 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -280,9 +280,7 @@ set sv_fragmessage_information_handicap 1 "Enable handicap display information,
 set sv_fragmessage_information_stats 0 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)"\r
 set sv_fragmessage_information_typefrag 1 "Enable typefrag display information, 0 = Never display; 1 = Always display"\r
 \r
-// use default physics\r
 set sv_friction_on_land 0\r
-exec physicsVT.cfg\r
 \r
 set sv_player_viewoffset "0 0 35" "view offset of the player model"\r
 set sv_player_mins "-16 -16 -24" "playermodel mins"\r
@@ -345,8 +343,6 @@ cl_movement_waterfriction $sv_waterfriction
 seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they are better than what you are carrying"\r
 alias autoswitch "set cl_autoswitch $1 ; cmd autoswitch $1"\r
 \r
-exec botsVT.cfg\r
-\r
 // waypoint editor enable\r
 set g_waypointeditor 0\r
 \r
@@ -528,8 +524,6 @@ set g_ctf_flag_pickup_effects 1
 set g_ctf_flag_capture_effects 1\r
 set g_ctf_captimerecord_always 0 "if enabled, assisted CTF records (with other players on the server) are recorded too"\r
 \r
-exec ctfscoringVT.cfg\r
-\r
 // domination\r
 seta g_domination                      0 "Domination: capture and hold control points to gain points"\r
 set g_domination_default_teams         2 "default number of teams for maps that aren't domination-specific"\r
@@ -592,11 +586,6 @@ set g_rpg_canleave 1 "when enabled, anyone can leave a predator's stomach in RPG
 set g_rpg_botattack 1 "bot behavior in RPG. 0 causes bots to never attack, 1 allows bots to swallow you harmlessly, 2 allows bots to attack normally"\r
 set g_rpg_turretattack 0 "if disabled, turrets don't attack anyone in RPG games. Otherwise, they attack everyone."\r
 \r
-// server game balance settings\r
-// powerup balance settings\r
-// weapon balance settings follow\r
-exec balanceVT.cfg\r
-\r
 set g_bloodloss 0   "amount of health below which blood loss occurs"\r
 \r
 set g_footsteps 1      "serverside footstep sounds"\r
@@ -1318,8 +1307,6 @@ set sv_clones 0   "number of clones a player may make (reset by the \"kill\" comma
 \r
 set cl_handicap 1      "the higher, the more damage you will receive (client setting)"\r
 \r
-exec turretsVT.cfg\r
-\r
 // must be at the bottom of this file:\r
 // alias for switching the teamselect menu\r
 alias menu_showteamselect "menu_cmd directmenu TeamSelect"\r