[nexuiz-commits] r6284 - in branches/nexuiz-2.0: . data data/maps data/models/domination data/qcsrc/common data/qcsrc/menu/nexuiz data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Mar 25 14:31:05 EDT 2009
Author: div0
Date: 2009-03-25 14:31:05 -0400 (Wed, 25 Mar 2009)
New Revision: 6284
Added:
branches/nexuiz-2.0/data/maps/campaignNexuiz25.txt
branches/nexuiz-2.0/data/maps/walker_pathtest2.mapinfo
branches/nexuiz-2.0/data/models/domination/dom_axe_glow.tga
branches/nexuiz-2.0/data/models/domination/dom_bolt_glow.tga
Removed:
branches/nexuiz-2.0/data/maps/campaign.txt
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/effectinfo.txt
branches/nexuiz-2.0/data/maps/turret_test.mapinfo
branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc
branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc
branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qh
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c
branches/nexuiz-2.0/data/qcsrc/server/bots.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc
branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc
branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
Log:
r6277 | div0 | 2009-03-24 16:24:18 +0100 (Tue, 24 Mar 2009) | 2 lines
campaign rename
r6278 | div0 | 2009-03-24 18:26:57 +0100 (Tue, 24 Mar 2009) | 3 lines
- add a "forbidden" flag to mapinfo that's stronger than hidden, and set it for turret_test and walker_pathtest2
- move gun down by 2 more units when in shootfromcenter mode
r6279 | div0 | 2009-03-24 20:22:55 +0100 (Tue, 24 Mar 2009) | 2 lines
comment-only changes, updated locations that refer to effects
r6280 | m0rfar | 2009-03-24 21:29:17 +0100 (Tue, 24 Mar 2009) | 1 line
Add glowmaps to the OLD ctf flag skins. To simulate the old fullbright style.
r6281 | m0rfar | 2009-03-24 22:03:30 +0100 (Tue, 24 Mar 2009) | 1 line
invisibility was too strong imo. raised alpha to 0.15
r6282 | div0 | 2009-03-25 11:03:01 +0100 (Wed, 25 Mar 2009) | 2 lines
swap silvercity with strength (skill difference)
r6283 | div0 | 2009-03-25 19:22:11 +0100 (Wed, 25 Mar 2009) | 2 lines
nixnex: remove non-normal weapons
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/.patchsets 2009-03-25 18:31:05 UTC (rev 6284)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6039,6044-6275
+revisions_applied = 1-6039,6044-6283
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-03-25 18:31:05 UTC (rev 6284)
@@ -406,7 +406,7 @@
set g_minstagib_extralives 2 "how many extra lives you will get per powerup"
set g_minstagib_ammo_start 10 "starting ammo"
set g_minstagib_ammo_drop 5 "how much ammo you'll get for weapons or cells"
-set g_minstagib_invis_alpha 0.05
+set g_minstagib_invis_alpha 0.15
set g_minstagib_speed_jumpheight 1.8
set g_minstagib_speed_moverate 1.25
set g_vampire 0
@@ -952,8 +952,8 @@
// singleplayer campaign
set g_campaign 0
-seta g_campaign_name ""
-seta g_campaign_index 0
+seta g_campaign_name "Nexuiz25"
+set g_campaign_index 0
set g_campaign_skill 0
alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0"
Modified: branches/nexuiz-2.0/data/effectinfo.txt
===================================================================
--- branches/nexuiz-2.0/data/effectinfo.txt 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/effectinfo.txt 2009-03-25 18:31:05 UTC (rev 6284)
@@ -4,6 +4,7 @@
// used in qcsrc/server/bots.qc: te_wizspike(org)
// used in qcsrc/server/bots.qc: //te_wizspike(e.origin)
// used in qcsrc/server/bots.qc: //te_wizspike(e.nearestwaypoint.wpnearestpoint)
+// used in qcsrc/server/havocbot.qc: // te_wizspike(newgoal.origin)
effect TE_WIZSPIKE
countabsolute 1
type static
@@ -31,6 +32,7 @@
// used in qcsrc/server/bots.qc: te_knightspike(start)
// used in qcsrc/server/bots.qc: te_knightspike(org)
// used in qcsrc/server/bots.qc: te_knightspike(org)
+// used in qcsrc/server/w_seeker.qc: te_knightspike(org2)
effect TE_KNIGHTSPIKE
countabsolute 1
type decal
@@ -237,7 +239,7 @@
// used in qcsrc/server/bots.qc: //te_gunshot(org)
// used in qcsrc/server/bots.qc: te_gunshot(org)
// used in qcsrc/server/bots.qc: te_gunshot(org)
-// used in qcsrc/server/bots.qc: te_gunshot(org)
+// used in qcsrc/server/bots.qc: // te_gunshot(org)
// used in qcsrc/server/bots.qc: //te_gunshot(end)
effect TE_GUNSHOT
countabsolute 1
@@ -315,7 +317,7 @@
// mortar/hagar explosion (smaller than rocket)
// decal
-// used nowhere in code
+// used in qcsrc/server/cl_client.qc: te_explosion(org)
effect TE_EXPLOSION
countabsolute 1
type decal
@@ -596,6 +598,7 @@
// nex beam
// used in qcsrc/server/w_minstanex.qc: trailparticles(world, particleeffectnum("TE_TEI_G3"), w_shotorg, trace_endpos)
+// used in qcsrc/client/particles.qc: trailparticles(world, particleeffectnum("TE_TEI_G3"), shotorg, endpos)
effect TE_TEI_G3
countabsolute 1
type beam
@@ -740,9 +743,8 @@
// bloody impact effect indicating damage
-// used in qcsrc/server/cl_player.qc: pointparticles(particleeffectnum("blood"), hitloc, force, bound(0, damage, 200))
-// used in qcsrc/server/cl_player.qc: pointparticles(particleeffectnum("blood"), hitloc, force, bound(0, damage, 200))
-// used in qcsrc/server/g_violence.qc: pointparticles(particleeffectnum("blood"), self.origin + '0 0 1', '0 0 30', 10)
+// used in qcsrc/client/gibs.qc: pointparticles(particleeffectnum("blood"), self.origin + '0 0 1', '0 0 30', 10)
+// used in qcsrc/client/gibs.qc: pointparticles(particleeffectnum("blood"), org, vel, amount * 16)
effect blood
count 0.333
type blood
@@ -766,8 +768,8 @@
// player teleport effect
-// used in qcsrc/server/t_teleporters.qc: pointparticles(particleeffectnum("teleport"), player.origin, '0 0 0', 1)
-// used in qcsrc/server/t_teleporters.qc: pointparticles(particleeffectnum("teleport"), to + v_forward * 32, '0 0 0', 1)
+// used in qcsrc/server/t_teleporters.qc: pointparticles(particleeffectnum("teleport"), player.origin, '0 0 0', 1)
+// used in qcsrc/server/t_teleporters.qc: pointparticles(particleeffectnum("teleport"), to + v_forward * 32, '0 0 0', 1)
effect teleport
count 1000
type spark
@@ -820,7 +822,6 @@
// func_stardust effect, used in some maps to indicate teleporters
-// used in qcsrc/server/assault.qc: //self.effects = EF_STARDUST
// used in qcsrc/server/g_triggers.qc: self.effects = EF_STARDUST
// used in qcsrc/server/portals.qc: portal.effects = EF_STARDUST | EF_BLUE
effect EF_STARDUST
@@ -869,6 +870,8 @@
+// used in qcsrc/server/w_hlac.qc: pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
+// used in qcsrc/server/w_hlac.qc: pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
// used in qcsrc/server/w_laser.qc: pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
effect laser_muzzleflash
count 1
@@ -888,7 +891,8 @@
// decal
-// used in qcsrc/server/w_laser.qc: pointparticles(particleeffectnum("laser_impact"), org2, normal * 1000, 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("laser_impact"), org2, backoff * 1000, 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("laser_impact"), org2, backoff * 1000, 1)
effect laser_impact
countabsolute 1
type decal
@@ -933,6 +937,7 @@
+// used in qcsrc/server/w_campingrifle.qc: pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 2000, 1)
// used in qcsrc/server/w_shotgun.qc: pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_primary_ammo"))
// used in qcsrc/server/w_shotgun.qc: pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_secondary_ammo"))
effect shotgun_muzzleflash
@@ -967,7 +972,7 @@
// shotgun pellet impact
// decal
-// used in qcsrc/server/w_common.qc: pointparticles(particleeffectnum("shotgun_impact"), trace_endpos, trace_plane_normal * 1000, 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("shotgun_impact"), org2, backoff * 1000, 1)
effect shotgun_impact
countabsolute 1
type decal
@@ -1049,7 +1054,8 @@
// decal
// used in qcsrc/server/cl_client.qc: //pointparticles(particleeffectnum("machinegun_impact"), self.origin + self.view_ofs + '0 0 7', '0 0 0', 1)
-// used in qcsrc/server/w_common.qc: pointparticles(particleeffectnum("machinegun_impact"), trace_endpos, trace_plane_normal * 1000, 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("machinegun_impact"), org2, backoff * 1000, 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("machinegun_impact"), org2, backoff * 1000, 1)
effect machinegun_impact
countabsolute 1
type decal
@@ -1134,9 +1140,7 @@
// hagar trail
// smoke
-// used in qcsrc/server/w_hagar.qc: missile.modelflags = MF_GRENADE
-// used in qcsrc/server/w_hagar.qc: missile.modelflags = MF_GRENADE
-// used in qcsrc/server/w_porto.qc: gren.modelflags = MF_GRENADE
+// used nowhere in code
effect TR_GRENADE
trailspacing 6
type alphastatic
@@ -1181,9 +1185,7 @@
// mortar trail
// smoke
-// used in qcsrc/server/w_grenadelauncher.qc: gren.modelflags = MF_TRACER2
-// used in qcsrc/server/w_grenadelauncher.qc: gren.modelflags = MF_TRACER2
-// used in qcsrc/server/w_hook.qc: gren.modelflags = MF_TRACER2
+// used nowhere in code
effect TR_KNIGHTSPIKE // used for MF_TRACER2
notunderwater
trailspacing 5
@@ -1224,8 +1226,7 @@
// decal
-// used in qcsrc/server/w_grenadelauncher.qc: pointparticles(particleeffectnum("grenade_explode"), org2, '0 0 0', 1)
-// used in qcsrc/server/w_grenadelauncher.qc: pointparticles(particleeffectnum("grenade_explode"), org2, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("grenade_explode"), org2, '0 0 0', 1)
effect grenade_explode
countabsolute 1
type decal
@@ -1342,7 +1343,7 @@
// electro trail
// glowing vapor trail
-// used nowhere in code
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_NEXUIZPLASMA"), from, to)
effect TR_NEXUIZPLASMA
trailspacing 2
type static
@@ -1374,7 +1375,7 @@
// decal
-// used in qcsrc/server/w_electro.qc: pointparticles(particleeffectnum("electro_impact"), org2, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("electro_impact"), org2, '0 0 0', 1)
effect electro_impact
countabsolute 1
type decal
@@ -1421,7 +1422,7 @@
velocityjitter 320 320 320
// decal
-// used in qcsrc/server/w_electro.qc: pointparticles(particleeffectnum("electro_ballexplode"), org2, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("electro_ballexplode"), org2, '0 0 0', 1)
effect electro_ballexplode
countabsolute 1
type decal
@@ -1466,7 +1467,7 @@
// decal
-// used in qcsrc/server/w_electro.qc: pointparticles(particleeffectnum("electro_combo"), org2, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("electro_combo"), org2, '0 0 0', 1)
effect electro_combo
countabsolute 1
type decal
@@ -1552,7 +1553,7 @@
// crylink impact effect
// decal
-// used in qcsrc/server/w_crylink.qc: pointparticles(particleeffectnum("crylink_impact"), self.origin, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("crylink_impact"), org2, '0 0 0', 1)
effect crylink_impact
countabsolute 1
type decal
@@ -1601,7 +1602,7 @@
// used in qcsrc/server/w_minstanex.qc: pointparticles(particleeffectnum("nex_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
-// used in qcsrc/server/w_nex.qc: pointparticles(particleeffectnum("nex_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
+// used in qcsrc/client/particles.qc: pointparticles(particleeffectnum("nex_muzzleflash"), shotorg, normalize(endpos - shotorg) * 1000, 1)
effect nex_muzzleflash
count 10
type smoke
@@ -1638,7 +1639,7 @@
//size 6 6
//alpha 128 128 192
// nex beam: ring smoke
-// used in qcsrc/server/w_nex.qc: trailparticles(world, particleeffectnum("nex_beam"), w_shotorg, trace_endpos)
+// used in qcsrc/client/particles.qc: trailparticles(world, particleeffectnum("nex_beam"), shotorg, endpos)
effect nex_beam
trailspacing 32
color 0x1680A0 0x1680A0
@@ -1680,8 +1681,8 @@
// nex impact
// decal
-// used in qcsrc/server/w_minstanex.qc: pointparticles(particleeffectnum("nex_impact"), trace_endpos - w_shotdir * 6, '0 0 0', 1)
-// used in qcsrc/server/w_nex.qc: pointparticles(particleeffectnum("nex_impact"), trace_endpos - w_shotdir * 6, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1)
effect nex_impact
countabsolute 1
type decal
@@ -1738,6 +1739,7 @@
// used in qcsrc/server/w_hagar.qc: pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
// used in qcsrc/server/w_hagar.qc: pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
+// used in qcsrc/server/w_seeker.qc: pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
effect hagar_muzzleflash
count 4
type smoke
@@ -1796,8 +1798,9 @@
// decal
-// used in qcsrc/server/w_hagar.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1)
-// used in qcsrc/server/w_hagar.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1)
effect hagar_explode
countabsolute 1
type decal
@@ -1978,9 +1981,11 @@
// rocket explosion (bigger than mortar and hagar)
// decal
+// used in qcsrc/server/cl_impulse.qc: pointparticles(particleeffectnum("rocket_explode"), org, '0 0 0', 1)
// used in qcsrc/server/cl_player.qc: pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1)
// used in qcsrc/server/portals.qc: pointparticles(particleeffectnum("rocket_explode"), portal.origin + v_forward * 16, v_forward * 1024, 4)
-// used in qcsrc/server/w_rocketlauncher.qc: pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1)
+// used in qcsrc/server/steerlib.qc: pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1)
effect rocket_explode
countabsolute 1
type decal
@@ -2312,7 +2317,7 @@
// bigger crylink impact effect
// decal
-// used in qcsrc/server/w_crylink.qc: pointparticles(particleeffectnum("crylink_impactbig"), self.origin, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("crylink_impactbig"), org2, '0 0 0', 1)
effect crylink_impactbig
countabsolute 1
type decal
@@ -2361,7 +2366,7 @@
// Zero-violence effects
// impact effect indicating damage
-// used in qcsrc/server/cl_player.qc: pointparticles(particleeffectnum("damage_hit"), hitloc, force, bound(0, damage, 200))
+// used in qcsrc/client/gibs.qc: pointparticles(particleeffectnum("damage_hit"), org, vel, amount * 16)
effect damage_hit
tex 48 55
count 1
@@ -2404,9 +2409,9 @@
// effect for removing player model
// "teleport"
-// used in qcsrc/server/cl_player.qc: pointparticles(particleeffectnum("damage_dissolve"), self.origin, force, 1)
// large sparks
+// used in qcsrc/client/gibs.qc: pointparticles(particleeffectnum("damage_dissolve"), org, vel, amount)
effect damage_dissolve
tex 48 55
count 30
@@ -2448,6 +2453,7 @@
velocityjitter 512 512 512
// decal
+// used in qcsrc/server/g_triggers.qc: self.cnt = particleeffectnum("laser_deadly")
// used in qcsrc/server/g_triggers.qc: self.cnt = particleeffectnum("laser_deadly")
effect laser_deadly
countabsolute 1
@@ -2535,7 +2541,7 @@
velocitymultiplier 2
// decal
-// used in qcsrc/server/w_hook.qc: pointparticles(particleeffectnum("hookbomb_explode"), org2, '0 0 0', 1)
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("hookbomb_explode"), org2, '0 0 0', 1)
effect hookbomb_explode
count 50
type static
@@ -2586,6 +2592,7 @@
// smoke
+// used nowhere in code
effect EF_MGTURRETTRAIL
notunderwater
trailspacing 2
@@ -2610,6 +2617,7 @@
//fire_big
//fire
+// used nowhere in code
effect fire_big
//notunderwater
count 52
@@ -2639,6 +2647,7 @@
//red_flare
//smoke
+// used nowhere in code
effect red_flare
type alphastatic
count 21
@@ -2654,6 +2663,7 @@
//blue_flare
//smoke
+// used nowhere in code
effect blue_flare
type alphastatic
count 21
@@ -2669,6 +2679,7 @@
//smoke_ring
//smoke
+// used nowhere in code
effect smoke_ring
type smoke
count 90
@@ -2686,6 +2697,7 @@
//smoke_large
//smoke
+// used nowhere in code
effect smoke_large
type alphastatic
count 50
@@ -2702,6 +2714,7 @@
notunderwater
//sparks
+// used nowhere in code
effect sparks
count 30
type spark
@@ -2717,6 +2730,7 @@
airfriction 3
//sparks
+// used nowhere in code
effect electricity_sparks
count 70
type spark
@@ -2732,6 +2746,7 @@
airfriction 3
//steam, it needs direction
+// used nowhere in code
effect steam
effect steam
type smoke
@@ -2750,6 +2765,7 @@
notunderwater
// smoke emiter
+// used nowhere in code
effect smoking
count 20
type alphastatic
@@ -2766,6 +2782,7 @@
airfriction -1
//golden dust (create it once per second to cover large area in small yellow particles)
+// used nowhere in code
effect goldendust
count 50
type snow
@@ -2781,6 +2798,7 @@
//velocitymultiplier -20
//airfriction -0.1
+// used nowhere in code
effect healing_fx
count 50
type spark
@@ -2796,6 +2814,7 @@
//velocitymultiplier 20
airfriction -0.5
+// used nowhere in code
effect armorrepair_fx
count 50
type spark
@@ -2811,6 +2830,7 @@
//velocitymultiplier 20
airfriction -0.5
+// used nowhere in code
effect ammoregen_fx
count 50
type spark
@@ -2827,6 +2847,7 @@
airfriction -0.5
// red-yellow flame like fx
+// used nowhere in code
effect rage
count 5
type smoke
@@ -2841,6 +2862,7 @@
airfriction 2
// pieces of glass or ice falling on the floor
+// used nowhere in code
effect iceorglass
count 30
type alphastatic
@@ -2857,6 +2879,7 @@
airfriction 3
// cover small area in poison gas, spawn it once per second
+// used nowhere in code
effect poisonfield
count 30
type smoke
@@ -2872,6 +2895,7 @@
airfriction 1
// cover small area in icy mist, spawn it once per second
+// used nowhere in code
effect icefield
count 20
type smoke
@@ -2899,6 +2923,7 @@
// cover very small area in flames, spawn it 3 times per second (or more often to get better looking fire at cost of fps hit )
// flames that go up
+// used nowhere in code
effect firefield
count 200
type smoke
@@ -2936,6 +2961,7 @@
//flamethrower, spawn it as fast as you can 20 times per second or more, it needs direction
//fast fire
+// used nowhere in code
effect flamethrower
count 6
type smoke
@@ -3008,6 +3034,7 @@
// port-o-launch trail
// glowing vapor trail
+// used nowhere in code
effect TR_WIZSPIKE
trailspacing 2
type static
@@ -3038,6 +3065,7 @@
// TAG trail
// glowing vapor trail
+// used nowhere in code
effect TR_VORESPIKE
trailspacing 2
type static
@@ -3066,6 +3094,7 @@
originjitter 1 1 1
velocityjitter 50 50 50
+// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("flac_explode"), org2, '0 0 0', 1)
effect flac_explode
countabsolute 1
type decal
@@ -3153,6 +3182,8 @@
// bullet trail (somewhat like a tracer)
+// used in qcsrc/server/w_common.qc: zcurveparticles_from_tracetoss(particleeffectnum("tr_bullet"), self.origin, trace_endpos, self.velocity)
+// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("tr_bullet"), from, to)
effect tr_bullet
trailspacing 128
type spark
Deleted: branches/nexuiz-2.0/data/maps/campaign.txt
===================================================================
--- branches/nexuiz-2.0/data/maps/campaign.txt 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/maps/campaign.txt 2009-03-25 18:31:05 UTC (rev 6284)
@@ -1,34 +0,0 @@
-"//campaign:Nexuiz Campaign"
-"//game","mapname","bots","skill","frag","mutator-sets","description","long description"
-"dm","runningman_1on1remix",1,1,10,,"DM: Running Man (1on1)","Welcome to the Nexuiz Campaign!\n\nFirst of all, you're going to learn the controls of the game by playing an easy 1on1 deathmatch against a single unskilled bot.\n\nFirst one to kill the other 10 times wins."
-"dm","darkzone",2,2,15,,"DM: Q1DM6 Remake","On this remake of a beloved level from the original Quake(r) from id Software, you'll face two bots on a somewhat higher skill level.\n\n15 frags will make you a winner here."
-"dm","desertfactory",3,3,20,,"DM: Desert Factory","You're fighting three enemies in a deserted factory. Watch out for the hot pipes, as they can kill you.\n\nThe game ends once someone, hopefully you, will have 20 frags."
-"dm","soylent",1,4,20,,"DM: Soylent Space","This time, you will face a single bot on an interesting space arena that allows many movement tricks. Try to learn these tricks so you can find your enemy faster.\n\nYou win once you have 20 frags."
-"dm","skyway",3,3,15,"g_minstagib 1","SPECIAL: Skyway","MinstaGib means that everyone is equipped with a single weapon that both kills with one shot, and can be used for jumping like the Laser can.\n\nLearn using it to fight off the two enemies that somehow have arrived here too!\n\nThe frag limit is 15."
-"dm","starship",4,4,15,"g_nixnex 1","SPECIAL: Starship","In NixNex, your weapon is cycled randomly, and everyone always has the same weapon but limited ammo.\n\nFight four bots in a starship especially built for fighting inside."
-"tdm","toxic",3,2,20,,"TDM: Toxic","In Team Deathmatch, there are two teams fighting each other. The frags of each team are added up, and the first team reaching 20 frags wins.\n\nMake your team this winning team!"
-"tdm","aggressor",3,3,20,,"TDM: Aggressor","Now that you are getting the hang of team deathmatch, let's increase the skill of the bots.\n\nTry to keep them from fragging you!"
-"tdm","downer",5,4,30,,"TDM: Downer","A relatively small map, and more bots, may make this interesting.\n\nWill the adrenaline make you stronger or weaker?"
-"tdm","warfare",3,5,30,,"TDM: Warfare","Greetings to Orbb, who was on this map before you!\n\nFor some contrast, you're now facing only few bots on a larger map. You should know what to do now.\n\nOf course, always avoid hitting team mates, as that damage reflects back to you.\n\nThis is the final TDM match; if you win, you may be interested in joining the Nexuiz Ladder to compare your strength with the one of other players."
-"dm","silvercity",5,4,30,"g_minstagib 1; sv_gravity 200","SPECIAL: SilverCity","You now know MinstaGib... so let's combine it with low gravity!\n\nYou'll feel like you're floating in this huge outdoor arena."
-"kh","stormkeep",5,3,500,"g_keyhunt_teams 2","KH: Stormkeep","In Key Hunt, your goal is to collect the keys from the other teams. You must bring all keys together to get 100 points, and the game will end at 500."
-"kh","aneurysm",5,4,600,"g_keyhunt_teams 3","KH: Aneurysm","On this industrial arena, you are fighting two other teams. As before, you must bring all keys together, for 200 points this time. The total you have to reach is 600."
-"kh","bleach",8,5,1000,"g_keyhunt_teams 3","KH: Bleach","Three Teams Eight Bots.\n\nDo your best.\n\nOver."
-"kh","dieselpower",3,6,500,"g_keyhunt_teams 2","KH: Diesel Power","A large map, and just two bots per team, 4 total. You'll be running around the map all the time, so learn doing it fast.\n\nBy the way, Key Hunt can be played online on quite some servers. You should be ready for online KH play after this match."
-"dm","strength",4,6,20,"g_weaponarena most","SPECIAL: Strength","Most Weapons: in this mutator, you are given almost all weapons, and infinite ammo. Have fun with your bots..."
-"ctf","basementctf",1,4,100,,"CTF: Basement","Welcome to the Capture The Flag game mode. Here, you are supposed to take the enemy flag, and bring it back to yours.\n\nAlso, you have to prevent the enemy from doing the same, as you can only capture his flag when your flag is still at your base.\n\nLet's start out easy, with a single bot in the enemy team. 100 points win."
-"ctf","runningmanctf",3,5,100,,"CTF: Running Man","Now that you have played a simple CTF match, let's try one with team mates.\n\nDo not shoot your team mate, and let him protect you while you carry the flag back home."
-"ctf","bloodprisonctf",5,6,150,,"CTF: Blood Prison","Let's try the same with a total of 6 players."
-"ctf","accident",5,7,100,,"CTF: Accident","Enough of the CTF training arenas – you can now play on the real thing, namely, this industrial CTF level which you can find on many online servers too. Just remember that this map is called 'accident'."
-"lms","evilspace",3,7,15,"g_weaponarena laser","SPECIAL: [evilspace]","All you get is a Laser.\n\nWell, I think you know how to use it to push the bots off this map into the deadly void..."
-"dom","basement",1,5,70,,"DOM: Basement","Domination: take control points so they show the color of your team, and make the enemies not take yours. Points are awarded for holding a control point.\n\n70 points win."
-"dom","runningman",3,6,100,,"DOM: Running Man","This time it's a bigger map and you get a team mate to help you capture the control points.\n\n3 bots, and 100 points to win."
-"dom","slimepit",5,7,100,,"DOM: The Slime Pit","An old, rusty industrial arena on which you have to watch out for slime...\n\nNote: while trying to capture one control point after another, you should keep an eye on your already captured control points, and defend them from incoming enemies."
-"dom","ruiner",5,8,100,,"DOM: RUINER","You got through The Slime Pit, go wash off that goo and try one last round of Domination here.\n\nYou may want to enable reflections in the Effects menu, but don't get carried away by them, as there still are control points to worry about..."
-"ctf","eggandbacon",7,7,200,,"SPECIAL: Egg & Bacon","An arena especially for spamming around with all the weapons. Enjoy it, and when you had enough of it, bring the enemy flag home...\n\nYou will notice some odd weapons here that haven't appeared before, by the way. Learn using them."
-"race","racetrack",0,0,333,,"Race: Racetrack","Race is about running as fast as possible on the map, by jumping at the right times, and using your weapons to gain more speed.\n\nOn this map, you have to finish a lap in 33.3 seconds to proceed. The mortar which you will find behind you may be an useful tool for this."
-"dm","final_rage",3,8,20,"g_laserguided_missile 1; g_weaponarena rocketlauncher","SPECIAL: Final rage","Laser Guided Missiles... try playing with them, to let them blow up directly in the face of your enemies. Secondary fire button toggles the guiding.\n\nThe final is near..."
-"lms","reslimed",2,7,9,,"LMS: Slimepit Revisited","In Last Man Standing, everyone starts out with the same amount of lives, and you have to stay alive as long as possible. It is crucial to actually dodge rockets here. Also, there are traps on this map that you can activate to hurt your opponents - find then!\n\nEveryone gets 9 lives, and if you stay alive, you're in the next round."
-"lms","bluesky",3,8,9,,"LMS: Blue Sky","And the sky is the limit... enjoy the view and try to keep alive! Your 3 enemies will try to hit you using the Nex and other weapons suitable for long distances, so never stop moving!"
-"lms","farewell",4,10,9,,"LMS: Farewell","Once more, you have to be the Last Man Standing: show your enemies no mercy in this medieval arena, as they certainly will have none on you!\n\nThis is the last level before the final."
-"lms","bloodprison",5,12,9,,"LMS: Blood Prison","THE FINAL\n\nUse all you have learned so far and win the campaign if you can!"
Copied: branches/nexuiz-2.0/data/maps/campaignNexuiz25.txt (from rev 6283, trunk/data/maps/campaignNexuiz25.txt)
===================================================================
--- branches/nexuiz-2.0/data/maps/campaignNexuiz25.txt (rev 0)
+++ branches/nexuiz-2.0/data/maps/campaignNexuiz25.txt 2009-03-25 18:31:05 UTC (rev 6284)
@@ -0,0 +1,34 @@
+"//campaign:Nexuiz 2.5 Campaign"
+"//game","mapname","bots","skill","frag","mutator-sets","description","long description"
+"dm","runningman_1on1remix",1,1,10,,"DM: Running Man (1on1)","Welcome to the Nexuiz Campaign!\n\nFirst of all, you're going to learn the controls of the game by playing an easy 1on1 deathmatch against a single unskilled bot.\n\nFirst one to kill the other 10 times wins."
+"dm","darkzone",2,2,15,,"DM: Q1DM6 Remake","On this remake of a beloved level from the original Quake(r) from id Software, you'll face two bots on a somewhat higher skill level.\n\n15 frags will make you a winner here."
+"dm","desertfactory",3,3,20,,"DM: Desert Factory","You're fighting three enemies in a deserted factory. Watch out for the hot pipes, as they can kill you.\n\nThe game ends once someone, hopefully you, will have 20 frags."
+"dm","soylent",1,4,20,,"DM: Soylent Space","This time, you will face a single bot on an interesting space arena that allows many movement tricks. Try to learn these tricks so you can find your enemy faster.\n\nYou win once you have 20 frags."
+"dm","skyway",3,3,15,"g_minstagib 1","SPECIAL: Skyway","MinstaGib means that everyone is equipped with a single weapon that both kills with one shot, and can be used for jumping like the Laser can.\n\nLearn using it to fight off the two enemies that somehow have arrived here too!\n\nThe frag limit is 15."
+"dm","starship",4,4,15,"g_nixnex 1","SPECIAL: Starship","In NixNex, your weapon is cycled randomly, and everyone always has the same weapon but limited ammo.\n\nFight four bots in a starship especially built for fighting inside."
+"tdm","toxic",3,2,20,,"TDM: Toxic","In Team Deathmatch, there are two teams fighting each other. The frags of each team are added up, and the first team reaching 20 frags wins.\n\nMake your team this winning team!"
+"tdm","aggressor",3,3,20,,"TDM: Aggressor","Now that you are getting the hang of team deathmatch, let's increase the skill of the bots.\n\nTry to keep them from fragging you!"
+"tdm","downer",5,4,30,,"TDM: Downer","A relatively small map, and more bots, may make this interesting.\n\nWill the adrenaline make you stronger or weaker?"
+"tdm","warfare",3,5,30,,"TDM: Warfare","Greetings to Orbb, who was on this map before you!\n\nFor some contrast, you're now facing only few bots on a larger map. You should know what to do now.\n\nOf course, always avoid hitting team mates, as that damage reflects back to you.\n\nThis is the final TDM match; if you win, you may be interested in joining the Nexuiz Ladder to compare your strength with the one of other players."
+"dm","strength",4,5,20,"g_weaponarena most","SPECIAL: Strength","Most Weapons: in this mutator, you are given almost all weapons, and infinite ammo. Have fun with your bots..."
+"kh","stormkeep",5,3,500,"g_keyhunt_teams 2","KH: Stormkeep","In Key Hunt, your goal is to collect the keys from the other teams. You must bring all keys together to get 100 points, and the game will end at 500."
+"kh","aneurysm",5,4,600,"g_keyhunt_teams 3","KH: Aneurysm","On this industrial arena, you are fighting two other teams. As before, you must bring all keys together, for 200 points this time. The total you have to reach is 600."
+"kh","bleach",8,5,1000,"g_keyhunt_teams 3","KH: Bleach","Three Teams Eight Bots.\n\nDo your best.\n\nOver."
+"kh","dieselpower",3,6,500,"g_keyhunt_teams 2","KH: Diesel Power","A large map, and just two bots per team, 4 total. You'll be running around the map all the time, so learn doing it fast.\n\nBy the way, Key Hunt can be played online on quite some servers. You should be ready for online KH play after this match."
+"dm","silvercity",5,4,30,"g_minstagib 1; sv_gravity 200","SPECIAL: SilverCity","You now know MinstaGib... so let's combine it with low gravity!\n\nYou'll feel like you're floating in this huge outdoor arena."
+"ctf","basementctf",1,4,100,,"CTF: Basement","Welcome to the Capture The Flag game mode. Here, you are supposed to take the enemy flag, and bring it back to yours.\n\nAlso, you have to prevent the enemy from doing the same, as you can only capture his flag when your flag is still at your base.\n\nLet's start out easy, with a single bot in the enemy team. 100 points win."
+"ctf","runningmanctf",3,5,100,,"CTF: Running Man","Now that you have played a simple CTF match, let's try one with team mates.\n\nDo not shoot your team mate, and let him protect you while you carry the flag back home."
+"ctf","bloodprisonctf",5,6,150,,"CTF: Blood Prison","Let's try the same with a total of 6 players."
+"ctf","accident",5,7,100,,"CTF: Accident","Enough of the CTF training arenas – you can now play on the real thing, namely, this industrial CTF level which you can find on many online servers too. Just remember that this map is called 'accident'."
+"lms","evilspace",3,7,15,"g_weaponarena laser","SPECIAL: [evilspace]","All you get is a Laser.\n\nWell, I think you know how to use it to push the bots off this map into the deadly void..."
+"dom","basement",1,5,70,,"DOM: Basement","Domination: take control points so they show the color of your team, and make the enemies not take yours. Points are awarded for holding a control point.\n\n70 points win."
+"dom","runningman",3,6,100,,"DOM: Running Man","This time it's a bigger map and you get a team mate to help you capture the control points.\n\n3 bots, and 100 points to win."
+"dom","slimepit",5,7,100,,"DOM: The Slime Pit","An old, rusty industrial arena on which you have to watch out for slime...\n\nNote: while trying to capture one control point after another, you should keep an eye on your already captured control points, and defend them from incoming enemies."
+"dom","ruiner",5,8,100,,"DOM: RUINER","You got through The Slime Pit, go wash off that goo and try one last round of Domination here.\n\nYou may want to enable reflections in the Effects menu, but don't get carried away by them, as there still are control points to worry about..."
+"ctf","eggandbacon",7,7,200,,"SPECIAL: Egg & Bacon","An arena especially for spamming around with all the weapons. Enjoy it, and when you had enough of it, bring the enemy flag home...\n\nYou will notice some odd weapons here that haven't appeared before, by the way. Learn using them."
+"race","racetrack",0,0,333,,"Race: Racetrack","Race is about running as fast as possible on the map, by jumping at the right times, and using your weapons to gain more speed.\n\nOn this map, you have to finish a lap in 33.3 seconds to proceed. The mortar which you will find behind you may be an useful tool for this."
+"dm","final_rage",3,8,20,"g_laserguided_missile 1; g_weaponarena rocketlauncher","SPECIAL: Final rage","Laser Guided Missiles... try playing with them, to let them blow up directly in the face of your enemies. Secondary fire button toggles the guiding.\n\nThe final is near..."
+"lms","reslimed",2,7,9,,"LMS: Slimepit Revisited","In Last Man Standing, everyone starts out with the same amount of lives, and you have to stay alive as long as possible. It is crucial to actually dodge rockets here. Also, there are traps on this map that you can activate to hurt your opponents - find then!\n\nEveryone gets 9 lives, and if you stay alive, you're in the next round."
+"lms","bluesky",3,8,9,,"LMS: Blue Sky","And the sky is the limit... enjoy the view and try to keep alive! Your 3 enemies will try to hit you using the Nex and other weapons suitable for long distances, so never stop moving!"
+"lms","farewell",4,10,9,,"LMS: Farewell","Once more, you have to be the Last Man Standing: show your enemies no mercy in this medieval arena, as they certainly will have none on you!\n\nThis is the last level before the final."
+"lms","bloodprison",5,12,9,,"LMS: Blood Prison","THE FINAL\n\nUse all you have learned so far and win the campaign if you can!"
Modified: branches/nexuiz-2.0/data/maps/turret_test.mapinfo
===================================================================
--- branches/nexuiz-2.0/data/maps/turret_test.mapinfo 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/maps/turret_test.mapinfo 2009-03-25 18:31:05 UTC (rev 6284)
@@ -11,4 +11,4 @@
// optional: settemp_for_type (all|gametypename) cvarname value
// optional: clientsettemp_for_type (all|gametypename) cvarname value
// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
-hidden
+forbidden
Copied: branches/nexuiz-2.0/data/maps/walker_pathtest2.mapinfo (from rev 6283, trunk/data/maps/walker_pathtest2.mapinfo)
===================================================================
--- branches/nexuiz-2.0/data/maps/walker_pathtest2.mapinfo (rev 0)
+++ branches/nexuiz-2.0/data/maps/walker_pathtest2.mapinfo 2009-03-25 18:31:05 UTC (rev 6284)
@@ -0,0 +1,11 @@
+title <TITLE>
+description <DESCRIPTION>
+author <AUTHOR>
+cdtrack 2
+// uncomment this if you added weapon pickups: has weapons
+// optional: fog density red green blue alpha mindist maxdist
+// optional: settemp_for_type (all|gametypename) cvarname value
+// optional: clientsettemp_for_type (all|gametypename) cvarname value
+// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
+// optional: hidden
+forbidden
Copied: branches/nexuiz-2.0/data/models/domination/dom_axe_glow.tga (from rev 6283, trunk/data/models/domination/dom_axe_glow.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/models/domination/dom_bolt_glow.tga (from rev 6283, trunk/data/models/domination/dom_bolt_glow.tga)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc 2009-03-25 18:31:05 UTC (rev 6284)
@@ -126,9 +126,9 @@
{
MapInfo_Enumerate();
if(cvar("g_maplist_allow_hidden"))
- i = 0;
+ i = MAPINFO_FLAG_FORBIDDEN;
else
- i = MAPINFO_FLAG_HIDDEN;
+ i = MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN;
MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, i, 0);
n = tokenizebyseparator(cvar_string("g_maplist"), " ");
s2 = "";
Modified: branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc 2009-03-25 18:31:05 UTC (rev 6284)
@@ -657,6 +657,10 @@
{
MapInfo_Map_flags |= MAPINFO_FLAG_HIDDEN;
}
+ else if(t == "forbidden")
+ {
+ MapInfo_Map_flags |= MAPINFO_FLAG_FORBIDDEN;
+ }
else if(t == "type")
{
t = car(s); s = cdr(s);
Modified: branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qh 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qh 2009-03-25 18:31:05 UTC (rev 6284)
@@ -14,6 +14,7 @@
float MAPINFO_FEATURE_WEAPONS = 1; // not defined for minstagib-only maps
float MAPINFO_FLAG_HIDDEN = 1; // not in lsmaps/menu/vcall/etc., can just be changed to manually
+float MAPINFO_FLAG_FORBIDDEN = 2; // don't even allow the map by a cvar setting that allows hidden maps
float MapInfo_count;
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c 2009-03-25 18:31:05 UTC (rev 6284)
@@ -202,7 +202,7 @@
float gt, f;
gt = MapInfo_CurrentGametype();
f = MapInfo_CurrentFeatures();
- MapInfo_FilterGametype(gt, f, 0, MAPINFO_FLAG_HIDDEN, 0);
+ MapInfo_FilterGametype(gt, f, 0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN, 0);
me.nItems = MapInfo_count;
for(i = 0; i < MapInfo_count; ++i)
draw_PreloadPicture(strcat("/maps/", MapInfo_BSPName_ByID(i)));
@@ -235,7 +235,7 @@
{
float i;
string s;
- MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, MAPINFO_FLAG_HIDDEN, 0); // all
+ MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN, 0); // all
s = "";
for(i = 0; i < MapInfo_count; ++i)
s = strcat(s, " ", MapInfo_BSPName_ByID(i));
Modified: branches/nexuiz-2.0/data/qcsrc/server/bots.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2009-03-25 18:31:05 UTC (rev 6284)
@@ -1727,7 +1727,6 @@
{
local float dist, delta_t, blend;
local vector desiredang, diffang;
- local float delta_t;
//dprint("aim ", self.netname, ": old:", vtos(self.v_angle));
// make sure v_angle is sane first
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc 2009-03-25 18:31:05 UTC (rev 6284)
@@ -401,6 +401,8 @@
e = get_weaponinfo(j);
if(!e.weapons) // skip dummies
continue;
+ if not(e.spawnflags & WEPSPAWNFLAG_NORMAL)
+ continue;
RandomSelection_Add(world, j, 1, 0);
}
nixnex_nextweapon = RandomSelection_chosen_float;
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2009-03-25 18:31:05 UTC (rev 6284)
@@ -146,7 +146,7 @@
cvar_set("g_maplist_index", ftos(n - 1)); // jump to map 0 in GotoNextMap
MapInfo_Enumerate();
- MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN), 0);
+ MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN) | MAPINFO_FLAG_FORBIDDEN, 0);
if(!DoNextMapOverride())
GotoNextMap();
@@ -361,7 +361,7 @@
g_maplist_allow_hidden = cvar("g_maplist_allow_hidden");
MapInfo_Enumerate();
- MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN), 0);
+ MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN) | MAPINFO_FLAG_FORBIDDEN, 0);
}
void Map_MarkAsRecent(string m);
@@ -541,7 +541,7 @@
orig_slowmo = cvar("slowmo");
MapInfo_Enumerate();
- MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN), 1);
+ MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN) | MAPINFO_FLAG_FORBIDDEN, 1);
if(whichpack(strcat("maps/", mapname, ".cfg")) != "")
{
@@ -599,7 +599,7 @@
for(i = 0, j = 0; i < MapInfo_count; ++i)
{
if(MapInfo_Get_ByID(i))
- if not(MapInfo_Map_flags & MAPINFO_FLAG_HIDDEN)
+ if not(MapInfo_Map_flags & (MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN))
{
if(mod(i, 2))
col = "^2";
@@ -905,7 +905,7 @@
if(Map_Count == 0)
{
bprint( "Maplist is empty! Resetting it to default map list.\n" );
- cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN));
+ cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN));
if(cvar("g_maplist_shuffle"))
ShuffleMaplist();
localcmd("\nmenu_cmd sync\n");
@@ -1025,7 +1025,7 @@
if(allowReset)
{
bprint( "Maplist contains no single playable map! Resetting it to default map list.\n" );
- cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN));
+ cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN));
if(cvar("g_maplist_shuffle"))
ShuffleMaplist();
localcmd("\nmenu_cmd sync\n");
@@ -2059,7 +2059,7 @@
if(mapvote_count == 0)
{
bprint( "Maplist contains no single playable map! Resetting it to default map list.\n" );
- cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN));
+ cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN));
if(cvar("g_maplist_shuffle"))
ShuffleMaplist();
localcmd("\nmenu_cmd sync\n");
@@ -2387,7 +2387,7 @@
return;
MapInfo_Enumerate();
- if(MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN), 1))
+ if(MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN) | MAPINFO_FLAG_FORBIDDEN, 1))
mapvote_run = TRUE;
}
void MapVote_Think()
@@ -2526,7 +2526,7 @@
// Mapinfo
MapInfo_Shutdown();
MapInfo_Enumerate();
- MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN), 1);
+ MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN) | MAPINFO_FLAG_FORBIDDEN, 1);
}
void SV_Shutdown()
Modified: branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/qcsrc/server/gamecommand.qc 2009-03-25 18:31:05 UTC (rev 6284)
@@ -564,7 +564,7 @@
if(MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 1))
{
print("Done rebuiling mapinfos.\n");
- MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0), 0);
+ MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0) | MAPINFO_FLAG_FORBIDDEN, 0);
remove(self);
}
else
@@ -652,17 +652,17 @@
if(t)
{
MapInfo_SwitchGameType(t);
- MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, MAPINFO_FLAG_HIDDEN, 0);
+ MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN, 0);
if(MapInfo_count > 0)
{
bprint("Game type successfully switched to ", s, "\n");
- MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0), 0);
+ MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0) | MAPINFO_FLAG_FORBIDDEN, 0);
}
else
{
bprint("Cannot use this game type: no map for it found\n");
MapInfo_SwitchGameType(tsave);
- MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0), 0);
+ MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0) | MAPINFO_FLAG_FORBIDDEN, 0);
}
}
else
Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-03-25 18:22:11 UTC (rev 6283)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-03-25 18:31:05 UTC (rev 6284)
@@ -2033,7 +2033,7 @@
if(visual)
{
vecs_y = 0;
- vecs_z -= 2;
+ vecs_z -= 4;
}
else
{
@@ -2044,7 +2044,7 @@
else if (cvar("g_shootfromcenter"))
{
vecs_y = 0;
- vecs_z -= 2;
+ vecs_z -= 4;
}
return vecs;
}
More information about the nexuiz-commits
mailing list