r4153 - in trunk/data: maps qcsrc/common qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Aug 23 07:51:07 EDT 2008


Author: div0
Date: 2008-08-23 07:51:04 -0400 (Sat, 23 Aug 2008)
New Revision: 4153

Removed:
   trunk/data/maps/aggressor.cfg
   trunk/data/maps/aneurysm.cfg
   trunk/data/maps/basement.cfg
   trunk/data/maps/basementctf.cfg
   trunk/data/maps/bleach.cfg
   trunk/data/maps/bloodprison.cfg
   trunk/data/maps/bloodprisonctf.cfg
   trunk/data/maps/bluesky.cfg
   trunk/data/maps/ctf_basementctf_exit.cfg
   trunk/data/maps/darkzone.cfg
   trunk/data/maps/dieselpower.cfg
   trunk/data/maps/dismal.cfg
   trunk/data/maps/downer.cfg
   trunk/data/maps/evilspace.cfg
   trunk/data/maps/farewell.cfg
   trunk/data/maps/final_rage.cfg
   trunk/data/maps/ons-reborn.cfg
   trunk/data/maps/reslimed.cfg
   trunk/data/maps/ruiner.cfg
   trunk/data/maps/ruiner_exit.cfg
   trunk/data/maps/rune_aneurysm_exit.cfg
   trunk/data/maps/runningman.cfg
   trunk/data/maps/runningman_1on1remix.cfg
   trunk/data/maps/runningmanctf.cfg
   trunk/data/maps/silvercity.cfg
   trunk/data/maps/skyway.cfg
   trunk/data/maps/slimepit.cfg
   trunk/data/maps/soylent.cfg
   trunk/data/maps/starship.cfg
   trunk/data/maps/stormkeep.cfg
   trunk/data/maps/strength.cfg
   trunk/data/maps/toxic.cfg
   trunk/data/maps/warfare.cfg
Modified:
   trunk/data/maps/aggressor.mapinfo
   trunk/data/maps/aneurysm.mapinfo
   trunk/data/maps/basement.mapinfo
   trunk/data/maps/basementctf.mapinfo
   trunk/data/maps/bleach.mapinfo
   trunk/data/maps/bloodprison.mapinfo
   trunk/data/maps/bloodprisonctf.mapinfo
   trunk/data/maps/bluesky.mapinfo
   trunk/data/maps/darkzone.mapinfo
   trunk/data/maps/dieselpower.mapinfo
   trunk/data/maps/dismal.mapinfo
   trunk/data/maps/downer.mapinfo
   trunk/data/maps/evilspace.mapinfo
   trunk/data/maps/farewell.mapinfo
   trunk/data/maps/final_rage.mapinfo
   trunk/data/maps/ons-reborn.mapinfo
   trunk/data/maps/reslimed.mapinfo
   trunk/data/maps/ruiner.mapinfo
   trunk/data/maps/runningman.mapinfo
   trunk/data/maps/runningman_1on1remix.mapinfo
   trunk/data/maps/runningmanctf.mapinfo
   trunk/data/maps/silvercity.mapinfo
   trunk/data/maps/skyway.mapinfo
   trunk/data/maps/slimepit.mapinfo
   trunk/data/maps/soylent.mapinfo
   trunk/data/maps/starship.mapinfo
   trunk/data/maps/stormkeep.mapinfo
   trunk/data/maps/strength.mapinfo
   trunk/data/maps/toxic.mapinfo
   trunk/data/maps/warfare.mapinfo
   trunk/data/qcsrc/common/mapinfo.qc
   trunk/data/qcsrc/common/mapinfo.qh
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/g_world.qc
Log:
MapInfo:
- Depcreate mapname.cfg files. From now on, these are only for the user to customize stuff like the CD track, but NOT for the mapper.
- Add a "cdtrack" command to mapinfo files.
- Add a "clientsettemp_for_type" command to mapinfo files (sets a cvar on the client for just this one round).
- Change all existing maps to this.

Compatibility issue: playing on old servers will be without background music. I think we can live with that.


Deleted: trunk/data/maps/aggressor.cfg
===================================================================
--- trunk/data/maps/aggressor.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/aggressor.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "4"

Modified: trunk/data/maps/aggressor.mapinfo
===================================================================
--- trunk/data/maps/aggressor.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/aggressor.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -11,3 +11,4 @@
 type lms 9 20
 type arena 10 20
 type kh 1000 20 3
+cdtrack 4

Deleted: trunk/data/maps/aneurysm.cfg
===================================================================
--- trunk/data/maps/aneurysm.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/aneurysm.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "6"

Modified: trunk/data/maps/aneurysm.mapinfo
===================================================================
--- trunk/data/maps/aneurysm.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/aneurysm.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -11,3 +11,4 @@
 type arena 10 20
 type kh 1000 30 2
 type tdm 50 20 2
+cdtrack 6

Deleted: trunk/data/maps/basement.cfg
===================================================================
--- trunk/data/maps/basement.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/basement.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "4"

Modified: trunk/data/maps/basement.mapinfo
===================================================================
--- trunk/data/maps/basement.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/basement.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -9,3 +9,4 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
+cdtrack 4

Deleted: trunk/data/maps/basementctf.cfg
===================================================================
--- trunk/data/maps/basementctf.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/basementctf.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "4"

Modified: trunk/data/maps/basementctf.mapinfo
===================================================================
--- trunk/data/maps/basementctf.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/basementctf.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -5,3 +5,4 @@
 _spawnpoints 15
 has weapons
 type ctf 300 20
+cdtrack 4

Deleted: trunk/data/maps/bleach.cfg
===================================================================
--- trunk/data/maps/bleach.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/bleach.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "8"

Modified: trunk/data/maps/bleach.mapinfo
===================================================================
--- trunk/data/maps/bleach.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/bleach.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -10,3 +10,4 @@
 type rune 200 20
 type lms 9 20
 type kh 1000 20 3
+cdtrack 8

Deleted: trunk/data/maps/bloodprison.cfg
===================================================================
--- trunk/data/maps/bloodprison.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/bloodprison.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "2"
\ No newline at end of file

Modified: trunk/data/maps/bloodprison.mapinfo
===================================================================
--- trunk/data/maps/bloodprison.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/bloodprison.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -7,3 +7,4 @@
 type dm 30 20
 type tdm 50 20 2
 type lms 9 20
+cdtrack 2

Deleted: trunk/data/maps/bloodprisonctf.cfg
===================================================================
--- trunk/data/maps/bloodprisonctf.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/bloodprisonctf.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "7"

Modified: trunk/data/maps/bloodprisonctf.mapinfo
===================================================================
--- trunk/data/maps/bloodprisonctf.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/bloodprisonctf.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -5,3 +5,4 @@
 _spawnpoints 28
 has weapons
 type ctf 300 20
+cdtrack 7

Deleted: trunk/data/maps/bluesky.cfg
===================================================================
--- trunk/data/maps/bluesky.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/bluesky.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "3"
\ No newline at end of file

Modified: trunk/data/maps/bluesky.mapinfo
===================================================================
--- trunk/data/maps/bluesky.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/bluesky.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -7,3 +7,4 @@
 type dm 30 20
 type tdm 50 20 2
 type lms 9 20
+cdtrack 3

Deleted: trunk/data/maps/ctf_basementctf_exit.cfg
===================================================================
--- trunk/data/maps/ctf_basementctf_exit.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/ctf_basementctf_exit.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1,4 +0,0 @@
-// reset laser damage
-//set g_balance_laser_primary_force $BACKUP_g_balance_laser_primary_force
-// reset fog?
-//fog 0

Deleted: trunk/data/maps/darkzone.cfg
===================================================================
--- trunk/data/maps/darkzone.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/darkzone.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "8"

Modified: trunk/data/maps/darkzone.mapinfo
===================================================================
--- trunk/data/maps/darkzone.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/darkzone.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -9,3 +9,4 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
+cdtrack 8

Deleted: trunk/data/maps/dieselpower.cfg
===================================================================
--- trunk/data/maps/dieselpower.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/dieselpower.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "8"

Modified: trunk/data/maps/dieselpower.mapinfo
===================================================================
--- trunk/data/maps/dieselpower.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/dieselpower.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -10,3 +10,4 @@
 type rune 200 20
 type lms 9 20
 type kh 1000 20 3
+cdtrack 8

Deleted: trunk/data/maps/dismal.cfg
===================================================================
--- trunk/data/maps/dismal.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/dismal.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "7"

Modified: trunk/data/maps/dismal.mapinfo
===================================================================
--- trunk/data/maps/dismal.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/dismal.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -10,3 +10,4 @@
 type ctf 300 20
 type rune 200 20
 type lms 9 20
+cdtrack 7

Deleted: trunk/data/maps/downer.cfg
===================================================================
--- trunk/data/maps/downer.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/downer.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "8"

Modified: trunk/data/maps/downer.mapinfo
===================================================================
--- trunk/data/maps/downer.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/downer.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -9,3 +9,4 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
+cdtrack 8

Deleted: trunk/data/maps/evilspace.cfg
===================================================================
--- trunk/data/maps/evilspace.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/evilspace.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "7"

Modified: trunk/data/maps/evilspace.mapinfo
===================================================================
--- trunk/data/maps/evilspace.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/evilspace.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -7,3 +7,4 @@
 type dm 30 20
 type lms 9 20
 type arena 10 20
+cdtrack 7

Deleted: trunk/data/maps/farewell.cfg
===================================================================
--- trunk/data/maps/farewell.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/farewell.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "5"

Modified: trunk/data/maps/farewell.mapinfo
===================================================================
--- trunk/data/maps/farewell.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/farewell.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -9,3 +9,4 @@
 type dm 30 20
 type lms 9 20
 type arena 10 20
+cdtrack 5

Deleted: trunk/data/maps/final_rage.cfg
===================================================================
--- trunk/data/maps/final_rage.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/final_rage.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "7"

Modified: trunk/data/maps/final_rage.mapinfo
===================================================================
--- trunk/data/maps/final_rage.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/final_rage.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -10,4 +10,4 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
-
+cdtrack 7

Deleted: trunk/data/maps/ons-reborn.cfg
===================================================================
--- trunk/data/maps/ons-reborn.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/ons-reborn.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop 8
\ No newline at end of file

Modified: trunk/data/maps/ons-reborn.mapinfo
===================================================================
--- trunk/data/maps/ons-reborn.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/ons-reborn.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -5,3 +5,4 @@
 _spawnpoints 54
 has weapons
 type ons 20
+cdtrack 8

Deleted: trunk/data/maps/reslimed.cfg
===================================================================
--- trunk/data/maps/reslimed.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/reslimed.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "4"

Modified: trunk/data/maps/reslimed.mapinfo
===================================================================
--- trunk/data/maps/reslimed.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/reslimed.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -9,3 +9,4 @@
 type dom 200 20
 type rune 200 20
 type lms 9 20
+cdtrack 4

Deleted: trunk/data/maps/ruiner.cfg
===================================================================
--- trunk/data/maps/ruiner.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/ruiner.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1,6 +0,0 @@
-set exit_cfg "maps/ruiner_exit.cfg"
-set BACKUP_r_shadow_glossexponent $r_shadow_glossexponent
-set r_shadow_glossexponent 96
-set BACKUP_r_shadow_glossintensity $r_shadow_glossintensity
-set r_shadow_glossintensity 2
-cd loop "thunder"

Modified: trunk/data/maps/ruiner.mapinfo
===================================================================
--- trunk/data/maps/ruiner.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/ruiner.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -9,3 +9,6 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
+cdtrack thunder
+clientsettemp_for_type all r_shadow_glossexponent 96
+clientsettemp_for_type all r_shadow_glossintensity 2

Deleted: trunk/data/maps/ruiner_exit.cfg
===================================================================
--- trunk/data/maps/ruiner_exit.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/ruiner_exit.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1,2 +0,0 @@
-set r_shadow_glossexponent $BACKUP_r_shadow_glossexponent
-set r_shadow_glossintensity $BACKUP_r_shadow_glossintensity
\ No newline at end of file

Deleted: trunk/data/maps/rune_aneurysm_exit.cfg
===================================================================
--- trunk/data/maps/rune_aneurysm_exit.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/rune_aneurysm_exit.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1,2 +0,0 @@
-// reset laser damage
-//set g_balance_laser_primary_force $BACKUP_g_balance_laser_primary_force

Deleted: trunk/data/maps/runningman.cfg
===================================================================
--- trunk/data/maps/runningman.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/runningman.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "2"
\ No newline at end of file

Modified: trunk/data/maps/runningman.mapinfo
===================================================================
--- trunk/data/maps/runningman.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/runningman.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -10,4 +10,4 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
-
+cdtrack 2

Deleted: trunk/data/maps/runningman_1on1remix.cfg
===================================================================
--- trunk/data/maps/runningman_1on1remix.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/runningman_1on1remix.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "2"
\ No newline at end of file

Modified: trunk/data/maps/runningman_1on1remix.mapinfo
===================================================================
--- trunk/data/maps/runningman_1on1remix.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/runningman_1on1remix.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -11,4 +11,4 @@
 type lms 9 20
 type arena 10 20
 type kh 1000 20 3
-
+cdtrack 2

Deleted: trunk/data/maps/runningmanctf.cfg
===================================================================
--- trunk/data/maps/runningmanctf.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/runningmanctf.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "2"
\ No newline at end of file

Modified: trunk/data/maps/runningmanctf.mapinfo
===================================================================
--- trunk/data/maps/runningmanctf.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/runningmanctf.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -11,3 +11,4 @@
 type rune 200 20
 type lms 9 20
 type kh 1000 20 3
+cdtrack 2

Deleted: trunk/data/maps/silvercity.cfg
===================================================================
--- trunk/data/maps/silvercity.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/silvercity.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "10"

Modified: trunk/data/maps/silvercity.mapinfo
===================================================================
--- trunk/data/maps/silvercity.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/silvercity.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -10,3 +10,4 @@
 type rune 200 20
 type lms 9 20
 type kh 1000 20 3
+cdtrack 10

Deleted: trunk/data/maps/skyway.cfg
===================================================================
--- trunk/data/maps/skyway.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/skyway.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "9"

Modified: trunk/data/maps/skyway.mapinfo
===================================================================
--- trunk/data/maps/skyway.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/skyway.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -9,3 +9,4 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
+cdtrack 9

Deleted: trunk/data/maps/slimepit.cfg
===================================================================
--- trunk/data/maps/slimepit.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/slimepit.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "4"

Modified: trunk/data/maps/slimepit.mapinfo
===================================================================
--- trunk/data/maps/slimepit.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/slimepit.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -9,3 +9,4 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
+cdtrack 4

Deleted: trunk/data/maps/soylent.cfg
===================================================================
--- trunk/data/maps/soylent.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/soylent.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "6"

Modified: trunk/data/maps/soylent.mapinfo
===================================================================
--- trunk/data/maps/soylent.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/soylent.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -10,4 +10,4 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
-
+cdtrack 6

Deleted: trunk/data/maps/starship.cfg
===================================================================
--- trunk/data/maps/starship.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/starship.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "10"

Modified: trunk/data/maps/starship.mapinfo
===================================================================
--- trunk/data/maps/starship.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/starship.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -9,3 +9,4 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
+cdtrack 10

Deleted: trunk/data/maps/stormkeep.cfg
===================================================================
--- trunk/data/maps/stormkeep.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/stormkeep.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "6"

Modified: trunk/data/maps/stormkeep.mapinfo
===================================================================
--- trunk/data/maps/stormkeep.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/stormkeep.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -11,3 +11,4 @@
 type arena 10 20
 type kh 1000 20 3
 type tdm 50 20 2
+cdtrack 6

Deleted: trunk/data/maps/strength.cfg
===================================================================
--- trunk/data/maps/strength.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/strength.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "5"

Modified: trunk/data/maps/strength.mapinfo
===================================================================
--- trunk/data/maps/strength.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/strength.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -10,3 +10,4 @@
 type lms 9 20
 type arena 10 20
 type tdm 50 20 2
+cdtrack 5

Deleted: trunk/data/maps/toxic.cfg
===================================================================
--- trunk/data/maps/toxic.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/toxic.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "3"
\ No newline at end of file

Modified: trunk/data/maps/toxic.mapinfo
===================================================================
--- trunk/data/maps/toxic.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/toxic.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -10,3 +10,4 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
+cdtrack 3

Deleted: trunk/data/maps/warfare.cfg
===================================================================
--- trunk/data/maps/warfare.cfg	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/warfare.cfg	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1 +0,0 @@
-cd loop "6"

Modified: trunk/data/maps/warfare.mapinfo
===================================================================
--- trunk/data/maps/warfare.mapinfo	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/maps/warfare.mapinfo	2008-08-23 11:51:04 UTC (rev 4153)
@@ -10,4 +10,4 @@
 type tdm 50 20 2
 type lms 9 20
 type arena 10 20
-
+cdtrack 6

Modified: trunk/data/qcsrc/common/mapinfo.qc
===================================================================
--- trunk/data/qcsrc/common/mapinfo.qc	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/qcsrc/common/mapinfo.qc	2008-08-23 11:51:04 UTC (rev 4153)
@@ -474,6 +474,7 @@
 	MapInfo_Map_author = "<AUTHOR>";
 	MapInfo_Map_supportedGametypes = 0;
 	MapInfo_Map_supportedFeatures = 0;
+	MapInfo_Map_clientstuff = "";
 }
 
 void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType)
@@ -537,6 +538,23 @@
 	else                  return 0;
 }
 
+float cvar_value_issafe(string s)
+{
+	if(strstrofs(s, "\"", 0) >= 0)
+		return 0;
+	if(strstrofs(s, "\\", 0) >= 0)
+		return 0;
+	if(strstrofs(s, ";", 0) >= 0)
+		return 0;
+	if(strstrofs(s, "$", 0) >= 0)
+		return 0;
+	if(strstrofs(s, "\r", 0) >= 0)
+		return 0;
+	if(strstrofs(s, "\n", 0) >= 0)
+		return 0;
+	return 1;
+}
+
 // load info about a map by name into the MapInfo_Map_* globals
 float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametypeToSet)
 {
@@ -643,18 +661,10 @@
 				if(f & pGametypeToSet)
 				{
 					t = car(s); s = cdr(s);
-					if(strstrofs(t, "\"", 0) >= 0)
+					if not(cvar_value_issafe(t))
 						print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
-					else if(strstrofs(t, "\\", 0) >= 0)
+					else if not (cvar_value_issafe(s))
 						print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
-					else if(strstrofs(t, ";", 0) >= 0)
-						print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
-					else if(strstrofs(s, "\"", 0) >= 0)
-						print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
-					else if(strstrofs(s, "\\", 0) >= 0)
-						print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
-					else if(strstrofs(s, ";", 0) >= 0)
-						print("Map ", pFilename, " contains a potentially harmful setting, ignored\n");
 					else
 					{
 						dprint("Applying temporary setting ", t, " := ", s, "\n");
@@ -667,6 +677,44 @@
 				dprint("Map ", pFilename, " has a setting for unknown game type ", t, ", ignored\n");
 			}
 		}
+		else if(t == "clientsettemp_for_type")
+		{
+			t = car(s); s = cdr(s);
+			if((f = MapInfo_Type_FromString(t)))
+			{
+				if(f & pGametypeToSet)
+				{
+					t = car(s); s = cdr(s);
+					if not(cvar_value_issafe(t))
+						print("Map ", pFilename, " contains a potentially harmful client setting, ignored\n");
+					else if not (cvar_value_issafe(s))
+						print("Map ", pFilename, " contains a potentially harmful client setting, ignored\n");
+					else
+					{
+						dprint("Applying temporary client setting ", t, " := ", s, "\n");
+						MapInfo_Map_clientstuff = strcat(
+							MapInfo_Map_clientstuff, "cl_cmd settemp \"", t, "\" \"", s, "\"\n"
+						);
+					}
+				}
+			}
+			else
+			{
+				dprint("Map ", pFilename, " has a client setting for unknown game type ", t, ", ignored\n");
+			}
+		}
+		else if(t == "cdtrack")
+		{
+			if(pGametypeToSet)
+			{
+				if not(cvar_value_issafe(t))
+					print("Map ", pFilename, " contains a potentially harmful cdtrack, ignored\n");
+				else
+					MapInfo_Map_clientstuff = strcat(
+						MapInfo_Map_clientstuff, "cd loop \"", s, "\"\n"
+					);
+			}
+		}
 		else
 			dprint("Map ", pFilename, " provides unknown info item ", t, ", ignored\n");
 	}
@@ -851,7 +899,6 @@
 	}
 	cvar_settemp_restore();
 	MapInfo_Get_ByName(s, 1, MapInfo_CurrentGametype());
-	MapInfo_ClearTemps();
 }
 
 void MapInfo_ClearTemps()
@@ -860,6 +907,7 @@
 	MapInfo_Map_title = string_null;
 	MapInfo_Map_description = string_null;
 	MapInfo_Map_author = string_null;
+	MapInfo_Map_clientstuff = string_null;
 	MapInfo_Map_supportedGametypes = 0;
 	MapInfo_Map_supportedFeatures = 0;
 }

Modified: trunk/data/qcsrc/common/mapinfo.qh
===================================================================
--- trunk/data/qcsrc/common/mapinfo.qh	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/qcsrc/common/mapinfo.qh	2008-08-23 11:51:04 UTC (rev 4153)
@@ -20,6 +20,7 @@
 string MapInfo_Map_title;
 string MapInfo_Map_description;
 string MapInfo_Map_author;
+string MapInfo_Map_clientstuff;
 float MapInfo_Map_supportedGametypes;
 float MapInfo_Map_supportedFeatures;
 

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-08-23 11:51:04 UTC (rev 4153)
@@ -1102,10 +1102,8 @@
 
 	self.welcomemessage_time = 0;
 
+	stuffcmd(self, strcat(clientstuff, "\n"));
 	stuffcmd(self, strcat("exec maps/", mapname, ".cfg\n"));
-	// TODO: is this being used for anything else than cd tracks?
-	// Remember: SVC_CDTRACK exists. Maybe it should be used.
-	//
 	stuffcmd(self, "cl_particles_reloadeffects\n");
 
 	FixClientCvars(self);

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/qcsrc/server/defs.qh	2008-08-23 11:51:04 UTC (rev 4153)
@@ -487,3 +487,5 @@
 float independent_players;
 #define IS_INDEPENDENT_PLAYER(e) ((e).solid == SOLID_TRIGGER)
 #define MAKE_INDEPENDENT_PLAYER(e) ((e).solid = SOLID_TRIGGER)
+
+string clientstuff;

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-08-23 09:48:04 UTC (rev 4152)
+++ trunk/data/qcsrc/server/g_world.qc	2008-08-23 11:51:04 UTC (rev 4153)
@@ -166,7 +166,7 @@
 float world_already_spawned;
 void spawnfunc_worldspawn (void)
 {
-	float fd, l;
+	float fd, l, complain;
 	string s;
 
 	dprint_load(); // load dprint status from cvar
@@ -189,6 +189,8 @@
 
 #ifdef MAPINFO
 	MapInfo_LoadMapSettings(mapname);
+	clientstuff = strzone(MapInfo_Map_clientstuff);
+	MapInfo_ClearTemps();
 #endif
 
 	if(sv_cheats)
@@ -334,6 +336,7 @@
 		cvar_set("timelimit", "0");
 	}
 
+	complain = (whichpack(strcat("maps/", mapname, ".cfg")) != "");
 	fd = fopen(strcat("maps/", mapname, ".cfg"), FILE_READ);
 	if(fd != -1)
 	{
@@ -342,17 +345,46 @@
 			l = tokenize(s);
 			if(l < 2)
 				continue;
-			if(argv(0) != "fog")
-				continue;
-			s = "";
-			while(l >= 2)
+			if(argv(0) == "cd")
 			{
-				--l;
-				s = strcat(argv(l), " ", s);
+				if(complain)
+				{
+					bprint("Found ^1DEPRECATED^7 cd loop command in .cfg file; put this line in mapinfo instead:\n");
+					bprint("  cdtrack ", argv(2), "\n");
+				}
 			}
-			s = substring(s, 0, strlen(s) - 1);
-			print("Found ^1DEPRECATED^7 fog command in .cfg file: ", s, "\n");
-			world.fog = strzone(s);
+			else if(argv(0) == "fog")
+			{
+				s = "";
+				while(l >= 2)
+				{
+					--l;
+					s = strcat(argv(l), " ", s);
+				}
+				s = substring(s, 0, strlen(s) - 1);
+				if(complain)
+				{
+					bprint("Found ^1DEPRECATED^7 fog command in .cfg file; put this line in worldspawn in the .map/.bsp/.ent file instead:\n");
+					bprint("  \"fog\" \"", s, "\"\n");
+				}
+				world.fog = strzone(s);
+			}
+			else if(argv(0) == "set")
+			{
+				if(complain)
+				{
+					bprint("Found ^1DEPRECATED^7 set command in .cfg file; put this line in mapinfo instead:\n");
+					bprint("  clientsettemp_for_type all ", argv(1), " ", argv(2), "\n");
+				}
+			}
+			else if(argv(0) != "//")
+			{
+				if(complain)
+				{
+					bprint("Found ^1DEPRECATED^7 set command in .cfg file; put this line in mapinfo instead:\n");
+					bprint("  clientsettemp_for_type all ", argv(0), " ", argv(1), "\n");
+				}
+			}
 		}
 		fclose(fd);
 	}




More information about the nexuiz-commits mailing list