Enforce team colours.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1875 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
e58ef84cda
commit
b65300ce58
1 changed files with 30 additions and 20 deletions
|
@ -537,13 +537,10 @@ void() PutClientInServer =
|
|||
self.invincible_time = 0;
|
||||
self.active = 1;
|
||||
self.solid = SOLID_NOT;
|
||||
self.materialize = 200;
|
||||
self.materialize = 20;
|
||||
|
||||
DecodeLevelParms ();
|
||||
|
||||
bprint(PRINT_HIGH, "current slot=");
|
||||
bprint(PRINT_HIGH, ftos(self.current_slot));
|
||||
bprint(PRINT_HIGH, "\n");
|
||||
if (self.current_slot == 0)
|
||||
{
|
||||
self.current_slot = 1;
|
||||
|
@ -1251,6 +1248,7 @@ void () PositionControl =
|
|||
}
|
||||
};
|
||||
|
||||
.float clientcolors;
|
||||
.float gravity;
|
||||
.vector movement;
|
||||
/*
|
||||
|
@ -1281,6 +1279,34 @@ void() PlayerPreThink =
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
if (self.team == 0)
|
||||
self.clientcolors = 0;
|
||||
else if (self.team == 1)
|
||||
self.clientcolors = 13 + 13*16;
|
||||
else
|
||||
self.clientcolors = 4 + 4*16;
|
||||
if (self.team == 0 && self.currentmenu == "none")
|
||||
{
|
||||
if (coop)
|
||||
self.team = 1;
|
||||
else
|
||||
{
|
||||
self.currentmenu = "select_team";
|
||||
DisplayMenu ();
|
||||
}
|
||||
}
|
||||
else if (self.class == 0 && self.currentmenu == "none")
|
||||
{
|
||||
self.currentmenu = "select_skill";
|
||||
DisplayMenu ();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (self.cycle1 < time)
|
||||
{
|
||||
if (self.currentmenu != "none")
|
||||
|
@ -1330,22 +1356,6 @@ void() PlayerPreThink =
|
|||
}
|
||||
}
|
||||
|
||||
if (self.team == 0 && self.currentmenu == "none")
|
||||
{
|
||||
if (coop)
|
||||
self.team = 1;
|
||||
else
|
||||
{
|
||||
self.currentmenu = "select_team";
|
||||
DisplayMenu ();
|
||||
}
|
||||
}
|
||||
else if (self.class == 0 && self.currentmenu == "none")
|
||||
{
|
||||
self.currentmenu = "select_skill";
|
||||
DisplayMenu ();
|
||||
}
|
||||
|
||||
if (self.class == 1)
|
||||
self.recoil = self.recoil - 0.16;
|
||||
if (self.class == 2)
|
||||
|
|
Loading…
Reference in a new issue