Changeset 247

Show
Ignore:
Timestamp:
11/19/08 13:50:27 (17 years ago)
Author:
yumileroy
Message:

Merge 246 and 247.

Original author: megamage
Date: 2008-11-16 17:22:48-06:00

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/game/ArenaTeam.cpp

    r246 r247  
    9898    if(pl) 
    9999    { 
    100         if(pl->GetArenaTeamId(GetType())) 
     100        if(pl->GetArenaTeamId(GetSlot())) 
    101101        { 
    102102            sLog.outError("Arena::AddMember() : player already in this sized team");