r2136 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Jan 22 08:01:25 EST 2007
Author: div0
Date: 2007-01-22 08:01:25 -0500 (Mon, 22 Jan 2007)
New Revision: 2136
Modified:
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/cl_player.qc
Log:
respawn settings
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2007-01-21 13:18:43 UTC (rev 2135)
+++ trunk/data/qcsrc/server/cl_client.qc 2007-01-22 13:01:25 UTC (rev 2136)
@@ -1309,6 +1309,25 @@
}
}
+void LeaveSpectatorMode()
+{
+ if(!cvar("teamplay") || cvar("g_campaign") || cvar("g_balance_teams")) {
+ self.classname = "player";
+ if(cvar("g_campaign") || cvar("g_balance_teams"))
+ JoinBestTeam(self, 0);
+ if(cvar("g_campaign"))
+ campaign_bots_may_start = 1;
+ PutClientInServer();
+ if(!(self.flags & FL_NOTARGET))
+ bprint (strcat("^4", self.netname, "^4 is playing now\n"));
+ centerprint(self,"");
+ return;
+ } else {
+ stuffcmd(self,"menu_showteamselect\n");
+ return;
+ }
+}
+
/*
=============
PlayerPreThink
@@ -1527,25 +1546,11 @@
if (self.flags & FL_JUMPRELEASED) {
if (self.button2 && self.version == cvar("gameversion")) {
- if(!cvar("teamplay") || cvar("g_campaign") || cvar("g_balance_teams")) {
- self.flags = self.flags & !FL_JUMPRELEASED;
- self.classname = "player";
- if(cvar("g_campaign") || cvar("g_balance_teams"))
- JoinBestTeam(self, 0);
- if(cvar("g_campaign"))
- campaign_bots_may_start = 1;
- PutClientInServer();
- if(self.flags & !FL_NOTARGET)
- bprint (strcat("^4", self.netname, "^4 is playing now\n"));
- centerprint(self,"");
- return;
- } else {
- self.flags = self.flags & !FL_JUMPRELEASED;
- stuffcmd(self,"menu_showteamselect\n");
- return;
- }
+ self.flags = self.flags - FL_JUMPRELEASED;
+ LeaveSpectatorMode();
+ return;
} else if(self.button0 && self.version == cvar("gameversion")) {
- self.flags = self.flags & !FL_JUMPRELEASED;
+ self.flags = self.flags - FL_JUMPRELEASED;
if(SpectateNext() == 1) {
self.classname = "spectator";
}
@@ -1559,26 +1564,11 @@
} else if(self.classname == "spectator") {
if (self.flags & FL_JUMPRELEASED) {
if (self.button2 && self.version == cvar("gameversion")) {
- if(!cvar("teamplay") || cvar("g_campaign") || cvar("g_balance_teams")) {
- self.flags = self.flags & !FL_JUMPRELEASED;
- self.classname = "player";
- if(!cvar("g_lms"))
- bprint (strcat("^4", self.netname, "^4 is playing now\n"));
-
- if(cvar("g_campaign") || cvar("g_balance_teams"))
- JoinBestTeam(self, 0);
- if(cvar("g_campaign"))
- campaign_bots_may_start = 1;
- PutClientInServer();
- centerprint(self,"");
- return;
- } else {
- self.flags = self.flags & !FL_JUMPRELEASED;
- stuffcmd(self,"menu_showteamselect\n");
- return;
- }
+ self.flags = self.flags - FL_JUMPRELEASED;
+ LeaveSpectatorMode();
+ return;
} else if(self.button0) {
- self.flags = self.flags & !FL_JUMPRELEASED;
+ self.flags = self.flags - FL_JUMPRELEASED;
if(SpectateNext() == 1) {
self.classname = "spectator";
} else {
@@ -1586,7 +1576,7 @@
PutClientInServer();
}
} else if (self.button3) {
- self.flags = self.flags & !FL_JUMPRELEASED;
+ self.flags = self.flags - FL_JUMPRELEASED;
self.classname = "observer";
PutClientInServer();
} else {
Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc 2007-01-21 13:18:43 UTC (rev 2135)
+++ trunk/data/qcsrc/server/cl_player.qc 2007-01-22 13:01:25 UTC (rev 2136)
@@ -312,11 +312,20 @@
// dying animation
self.deadflag = DEAD_DYING;
// when to allow respawn
- sdelay = cvar(strcat("g_", GetGametype(), "_respawn_delay"));
+ sdelay = 0;
+ waves = 0;
+ if(cvar("g_respawn_mapsettings"))
+ {
+ sdelay = cvar("g_respawn_mapsettings_delay");
+ waves = cvar("g_respawn_mapsettings_waves");
+ }
if(!sdelay)
+ sdelay = cvar(strcat("g_", GetGametype(), "_respawn_delay"));
+ if(!sdelay)
sdelay = cvar("g_respawn_delay");
- waves = cvar(strcat("g_", GetGametype(), "_respawn_waves"));
if(!waves)
+ waves = cvar(strcat("g_", GetGametype(), "_respawn_waves"));
+ if(!waves)
waves = cvar("g_respawn_waves");
if(waves)
self.death_time = ceil((time + sdelay) / waves) * waves;
More information about the nexuiz-commits
mailing list