Merged heads, with manual fixes to not revert newer changes.

2009-04-27 19:51:29 +02:00
parent 257659a683 abd38ee033
commit c9724a09c7
35 changed files with 1161 additions and 521 deletions
--- a/src/zr/playerclasses/filtertools.inc
+++ b/src/zr/playerclasses/filtertools.inc
@ -359,7 +359,7 @@ ClassGetActiveIndex(client)
    else
    {
        // Not in admin mode, check if player is human or zombie.
-        if (IsPlayerHuman(client))
+        if (InfectIsClientHuman(client))
        {
            teamid = ZR_CLASS_TEAM_HUMANS;
        }