From 20e8e4c0fb1262a25c2491679da4587d264208a2 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 11 Jan 2009 12:15:22 +0000
Subject: core::Player interface updates

---
 src/core/gameserver.cc | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'src/core/gameserver.cc')

diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index 44b8ccb..f7838a4 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -24,7 +24,7 @@ Player *console_find_player(std::string const & target)
 {
 	Player *targetplayer = server()->find_player(target);
 	if (!targetplayer) {
-		con_print << "^BPlayer " + target + "^B not found";
+		con_print << "^BPlayer '" + target + "^B' not found";
 	}
 	return targetplayer;
 }
@@ -240,31 +240,6 @@ bool GameServer::interactive() const
 	}
 }
 
-Player *GameServer::find_player(std::string const search)
-{
-	using aux::lowercase;
-
-	std::istringstream searchstr(search);
-	int id = 0;
-	if (searchstr >> id) {
-		for (std::list<Player *>:: iterator it = game_players.begin(); it != game_players.end(); it++) {
-			if ((*it)->id() == id) {
-				return (*it);
-			}
-		}
-	}
-
-	if (search.size() <3)
-		return 0;
-
-	for (std::list<Player *>:: iterator it = game_players.begin(); it != game_players.end(); it++) {
-		if (aux::text_strip_lowercase((*it)->name()).find(lowercase(search)) != std::string::npos)
-			return (*it);
-	}
-
-	return 0;
-}
-
 void GameServer::say(Player *player, std::string const &message)
 {
 	if (!message.size())
@@ -537,7 +512,7 @@ void GameServer::frame(unsigned long timestamp)
 	
 	if (localplayer()->zonechange()) {
 		application()->notify_zonechange();
-		localplayer()->player_zonechange = false;
+		localplayer()->set_zonechange(false);
 	}
 
 	/*if (!Cvar::sv_dedicated->value()) {
-- 
cgit v1.2.3