r109 - trunk/progsqc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Mar 14 15:40:20 EDT 2008
Author: vermeulen
Date: 2008-03-14 15:40:18 -0400 (Fri, 14 Mar 2008)
New Revision: 109
Modified:
trunk/progsqc/player.qc
trunk/progsqc/server.qc
Log:
Class selection dialog, along with teams
Modified: trunk/progsqc/player.qc
===================================================================
--- trunk/progsqc/player.qc 2008-03-13 13:13:23 UTC (rev 108)
+++ trunk/progsqc/player.qc 2008-03-14 19:40:18 UTC (rev 109)
@@ -394,7 +394,7 @@
self.flags = FL_CLIENT;
- self.team = cvar("g_startteam");
+ //self.team = cvar("g_startteam");
//self.classnum = cvar("g_startclass");
spot = SelectSpawnPoint ();
@@ -405,13 +405,6 @@
self.v_angle = self.angles_x * '-1 0 0' + self.angles_y * '0 1 0';
self.nextthink = 0;
- stuffcmd(self, strcat("exec maps/", mapname, ".cfg\n"));
-
- if (cvar("g_teams_forcecolors") && (cvar("g_teams")))
- {
- SetTeamColors(self);
- }
-
if (!self.spawned)
{
self.health = 1;
@@ -422,6 +415,11 @@
{
player_spawn(self.classnum);
}
+
+ if (cvar("g_teams_forcecolors") && (cvar("g_teams")))
+ {
+ SetTeamColors(self);
+ }
};
/*
@@ -466,6 +464,7 @@
void() ClientConnect
{
bprint (self.netname);
+ stuffcmd(self, strcat("exec maps/", mapname, ".cfg\n"));
bprint (" entered the game\n");
};
Modified: trunk/progsqc/server.qc
===================================================================
--- trunk/progsqc/server.qc 2008-03-13 13:13:23 UTC (rev 108)
+++ trunk/progsqc/server.qc 2008-03-14 19:40:18 UTC (rev 109)
@@ -122,6 +122,11 @@
if ((self.classnum > ACTORTYPE_TOTAL) || (self.classnum <= ACTORTYPE_INVALID))
self.classnum = 1;
}
+ else if( c == "selectteam" )
+ {
+ self.team = stof(argv(1));
+ //if (self.team != 5 14 13 10
+ }
// edit this to do what you want with the received commands
else if (c == "say") clientcommand(self, s);
else if (c == "say_team") clientcommand(self, s);
More information about the zymotic-commits
mailing list