Merge branch 'master' into 303

Conflicts:
	src/game/Player.h
This commit is contained in:
tomrus88 2008-12-12 18:14:49 +03:00
commit 5d4d7292b9
47 changed files with 244 additions and 209 deletions

View file

@ -2304,7 +2304,7 @@ void World::KickAllLess(AccountTypes sec)
}
/// Kick (and save) the designated player
bool World::KickPlayer(std::string playerName)
bool World::KickPlayer(const std::string& playerName)
{
SessionMap::iterator itr;