Imported fix from dev: 717:fe907635426c - Fixed classes not always restored from cookies.

This commit is contained in:
Richard Helgeby 2010-06-03 21:12:28 +02:00
parent 64c49df505
commit 648b62527b

View File

@ -1026,7 +1026,7 @@ ClassClientSetDefaultIndexes(client = -1)
// If not, fall back to default class indexes. Otherwise substract // If not, fall back to default class indexes. Otherwise substract
// index by one. // index by one.
if (zombieindex <= 0 || if (zombieindex <= 0 ||
!(ClassGetTeamID(zombieindex - 1) == ZR_CLASS_TEAM_ZOMBIES) || !ClassTeamCompare(zombieindex - 1, ZR_CLASS_TEAM_ZOMBIES) ||
!ClassFilterMatch(zombieindex - 1, filter)) !ClassFilterMatch(zombieindex - 1, filter))
{ {
zombieindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_ZOMBIES, filter); zombieindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_ZOMBIES, filter);
@ -1038,7 +1038,7 @@ ClassClientSetDefaultIndexes(client = -1)
} }
if (humanindex <= 0 || if (humanindex <= 0 ||
!(ClassGetTeamID(humanindex - 1) == ZR_CLASS_TEAM_HUMANS) || !ClassTeamCompare(humanindex - 1, ZR_CLASS_TEAM_HUMANS) ||
!ClassFilterMatch(humanindex - 1, filter)) !ClassFilterMatch(humanindex - 1, filter))
{ {
humanindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_HUMANS, filter); humanindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_HUMANS, filter);
@ -1050,7 +1050,7 @@ ClassClientSetDefaultIndexes(client = -1)
} }
if (adminindex <= 0 || if (adminindex <= 0 ||
!(ClassGetTeamID(adminindex - 1) == ZR_CLASS_TEAM_ADMINS) || !ClassTeamCompare(adminindex - 1, ZR_CLASS_TEAM_ADMINS) ||
!ClassFilterMatch(adminindex - 1, filter)) !ClassFilterMatch(adminindex - 1, filter))
{ {
adminindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_ADMINS, filter); adminindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_ADMINS, filter);