From 4f3a9ad847037cc3b2ae5dee8bb289ddca58487d Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Sun, 11 Jun 2006 05:22:43 +0000 Subject: [PATCH] - added another waypoint on aneurysm - corrected some errors in campaign.txt - no footstep sounds after match end - always spawn as spectator in campaign, even if sv_spectate is 0 or gametype is LMS git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1556 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/maps/aneurysm.waypoints | 155 ++++++++++++++-------------- data/maps/campaign.txt | 4 +- data/qcsrc/server/gamec/cl_client.c | 2 +- data/qcsrc/server/gamec/sv_main.c | 3 +- 4 files changed, 84 insertions(+), 80 deletions(-) diff --git a/data/maps/aneurysm.waypoints b/data/maps/aneurysm.waypoints index 43d40008c..3e074299a 100644 --- a/data/maps/aneurysm.waypoints +++ b/data/maps/aneurysm.waypoints @@ -1,117 +1,120 @@ -'210.5 1603.5 80.0' -'210.5 1603.5 80.0' +'138.0 909.4 -200.0' +'138.0 909.4 -200.0' 0 -' 63.5 1651.9 80.0' -' 63.5 1651.9 80.0' +'-890.8 1628.8 80.0' +'-890.8 1628.8 80.0' 0 -'-331.1 1574.3 64.0' -'-331.1 1574.3 64.0' +'-923.7 419.5 32.0' +'-923.7 419.5 32.0' 0 -'-287.9 1411.5 64.0' -'-287.9 1411.5 64.0' +'-815.7 848.1 32.0' +'-815.7 848.1 32.0' 0 -'-33.2 1351.7 80.0' -'-33.2 1351.7 80.0' +'-931.0 759.3 32.0' +'-931.0 759.3 32.0' 0 -'-12.8 1296.0 80.0' -'-12.8 1296.0 80.0' +'-897.8 628.2 32.0' +'-897.8 628.2 32.0' 0 -'206.0 1264.0 80.0' -'206.0 1264.0 80.0' +'-948.1 249.9 32.0' +'-948.1 249.9 32.0' 0 -'214.2 1479.7 72.0' -'214.2 1479.7 72.0' +'-837.6 21.7 32.0' +'-837.6 21.7 32.0' 0 -' 22.9 1286.6 80.0' -' 22.9 1286.6 80.0' +'387.4 -68.5 -200.0' +'387.4 -68.5 -200.0' 0 -'-561.8 201.9 32.0' -'-561.8 201.9 32.0' +'785.2 417.7 -200.0' +'785.2 417.7 -200.0' 0 -'-928.8 1306.3 45.3' -'-928.8 1306.3 45.3' +'516.2 411.0 -120.0' +'516.2 411.0 -120.0' 0 -'662.4 1874.6 32.0' -'662.4 1874.6 32.0' +'345.0 41.7 32.0' +'345.0 41.7 32.0' 0 -'1254.3 1895.1 36.0' -'1254.3 1895.1 36.0' +'373.1 244.5 -48.0' +'373.1 244.5 -48.0' 0 -'1062.4 98.6 256.0' -'1062.4 98.6 256.0' +'360.9 627.8 -16.0' +'360.9 627.8 -16.0' 0 -'1082.4 516.9 112.0' -'1082.4 516.9 112.0' +'341.4 807.7 32.0' +'341.4 807.7 32.0' 0 -'1042.3 842.2 24.0' -'1042.3 842.2 24.0' +' -2.4 388.5 32.0' +' -2.4 388.5 32.0' 0 -'941.5 443.2 24.0' -'941.5 443.2 24.0' +'661.3 460.6 32.0' +'661.3 460.6 32.0' 0 -'823.7 103.3 27.1' -'823.7 103.3 27.1' +'623.3 1018.6 32.0' +'623.3 1018.6 32.0' 0 -'-139.3 695.4 32.0' -'-139.3 695.4 32.0' +'623.6 1460.2 32.0' +'623.6 1460.2 32.0' +0 +' 83.1 1420.7 80.0' +' 83.1 1420.7 80.0' 0 '205.2 1577.3 80.0' '205.2 1577.3 80.0' 0 -' 83.1 1420.7 80.0' -' 83.1 1420.7 80.0' +'-139.3 695.4 32.0' +'-139.3 695.4 32.0' 0 -'623.6 1460.2 32.0' -'623.6 1460.2 32.0' +'823.7 103.3 27.1' +'823.7 103.3 27.1' 0 -'623.3 1018.6 32.0' -'623.3 1018.6 32.0' +'941.5 443.2 24.0' +'941.5 443.2 24.0' 0 -'661.3 460.6 32.0' -'661.3 460.6 32.0' +'1042.3 842.2 24.0' +'1042.3 842.2 24.0' 0 -' -2.4 388.5 32.0' -' -2.4 388.5 32.0' +'1082.4 516.9 112.0' +'1082.4 516.9 112.0' 0 -'341.4 807.7 32.0' -'341.4 807.7 32.0' +'1062.4 98.6 256.0' +'1062.4 98.6 256.0' 0 -'360.9 627.8 -16.0' -'360.9 627.8 -16.0' +'1254.3 1895.1 36.0' +'1254.3 1895.1 36.0' 0 -'373.1 244.5 -48.0' -'373.1 244.5 -48.0' +'662.4 1874.6 32.0' +'662.4 1874.6 32.0' 0 -'345.0 41.7 32.0' -'345.0 41.7 32.0' +'-928.8 1306.3 45.3' +'-928.8 1306.3 45.3' 0 -'516.2 411.0 -120.0' -'516.2 411.0 -120.0' +'-561.8 201.9 32.0' +'-561.8 201.9 32.0' 0 -'785.2 417.7 -200.0' -'785.2 417.7 -200.0' +' 22.9 1286.6 80.0' +' 22.9 1286.6 80.0' 0 -'387.4 -68.5 -200.0' -'387.4 -68.5 -200.0' +'214.2 1479.7 72.0' +'214.2 1479.7 72.0' 0 -'-837.6 21.7 32.0' -'-837.6 21.7 32.0' +'206.0 1264.0 80.0' +'206.0 1264.0 80.0' 0 -'-948.1 249.9 32.0' -'-948.1 249.9 32.0' +'-12.8 1296.0 80.0' +'-12.8 1296.0 80.0' 0 -'-897.8 628.2 32.0' -'-897.8 628.2 32.0' +'-33.2 1351.7 80.0' +'-33.2 1351.7 80.0' 0 -'-931.0 759.3 32.0' -'-931.0 759.3 32.0' +'-287.9 1411.5 64.0' +'-287.9 1411.5 64.0' 0 -'-815.7 848.1 32.0' -'-815.7 848.1 32.0' +'-331.1 1574.3 64.0' +'-331.1 1574.3 64.0' 0 -'-923.7 419.5 32.0' -'-923.7 419.5 32.0' +' 63.5 1651.9 80.0' +' 63.5 1651.9 80.0' 0 -'-890.8 1628.8 80.0' -'-890.8 1628.8 80.0' +'210.5 1603.5 80.0' +'210.5 1603.5 80.0' 0 diff --git a/data/maps/campaign.txt b/data/maps/campaign.txt index 291236ae5..a4e80ccba 100644 --- a/data/maps/campaign.txt +++ b/data/maps/campaign.txt @@ -11,11 +11,11 @@ dm aggressor 3 5 15 "" ctf basementctf 3 5 60 "" "CTF on Basement" "2on2 Capture the flag. Point limit of 60." dm evilspace 3 5 10 "" "Evil Space" "Space map deathmatch, 3 bots. Fraglimit of 10." dm aneurysm 3 5 15 "" "Aneurysm" "3 bots with 15 fraglimit." -dm soylent 2 5 10 "" "Soylent Space" "3 bots and a fraglimit of 10." +dm soylent 3 5 10 "" "Soylent Space" "3 bots and a fraglimit of 10." dm runningman_1on1remix 1 7 10 "g_footsteps 1" "1on1 on Running Man" "Congratulations! You passed the second part of the Nexuiz campaign. Now to skill 7." dm darkzone 4 7 15 "" "Q1Dm6 remake" "There are 4 bots in this Quake1 deathmatch map remake, with a fraglimit of 15." dm stormkeep 5 7 15 "g_laserguided_missile 1; g_rocketarena 1" "LG missiles on StormKeep" "Laser guided missiles - toggle laser using altfire. 4 bots with a fraglimit of 15." dm farewell 3 7 20 "g_rocketarena 1" "Farewell" "Rocket Arena! 3 bots, 20 fraglimit" -dm warfare 3 7 15 "" "RL arena on Warefare" "3 bots, 15 fraglimit" +dm warfare 3 7 15 "" "Warefare" "3 bots, 15 fraglimit" lms bloodprison 3 10 9 "" "LMS on Blood Prison" "Last Man Standing: you have nine lives. +++ Make something out of it!" dm starship 3 10 15 "" "Starship" "4 bots with a 15 frag limit in this starship battle. Final level!" diff --git a/data/qcsrc/server/gamec/cl_client.c b/data/qcsrc/server/gamec/cl_client.c index cced51689..4b23cf8eb 100644 --- a/data/qcsrc/server/gamec/cl_client.c +++ b/data/qcsrc/server/gamec/cl_client.c @@ -659,7 +659,7 @@ void ClientConnect (void) //JoinBestTeam(self, FALSE); - if(cvar("sv_spectate") == 1 && !cvar("g_lms")) { + if((cvar("sv_spectate") == 1 && !cvar("g_lms")) || cvar("g_campaign")) { self.classname = "observer"; } else { self.classname = "player"; diff --git a/data/qcsrc/server/gamec/sv_main.c b/data/qcsrc/server/gamec/sv_main.c index 2e09f88b5..c9f15fac3 100644 --- a/data/qcsrc/server/gamec/sv_main.c +++ b/data/qcsrc/server/gamec/sv_main.c @@ -104,10 +104,11 @@ void CreatureFrame (void) } // play stupid sounds + if (cvar("g_footsteps")) + if (!gameover) if (self.flags & FL_ONGROUND) if (vlen(self.velocity) > sv_maxspeed * 0.6) if (!self.deadflag) - if (cvar("g_footsteps")) { if((time > self.nextstep) || (time < (self.nextstep - 10.0))) { -- 2.39.2