added racetrack to the game module, added Odin's new structures to the assets documentation

1 files changed, 11 insertions, 9 deletions

diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index 81df14b..fce758e 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -170,6 +170,8 @@ GameServer::GameServer() : GameInterface()
 	func = Func::add("who", func_who, Func::Shared);
 	func->set_info("get a list of connected players");
 
+	server_players.clear();
+
 	if (!Cvar::sv_dedicated->value()) {
 		player_connect(localplayer());
 	}
@@ -211,7 +213,7 @@ GameServer::~GameServer()
 
 	server_instance = 0;
 
-	players.clear();
+	server_players.clear();
 }
 
 void GameServer::abort()
@@ -225,7 +227,7 @@ void GameServer::list_players()
 	stringstream msgstr;
 	int count = 0;
 
-	for (std::list<Player *>:: iterator it = players.begin(); it != players.end(); it++) {
+	for (Players::iterator it = server_players.begin(); it != server_players.end(); it++) {
 		msgstr.str("");
 		con_print << setw(3) << (*it)->id() << aux::pad_left((*it)->name(), 24) << std::endl;
 		count++;
@@ -257,7 +259,7 @@ Player *GameServer::find_player(std::string const search)
 	std::istringstream searchstr(search);
 	int id = 0;
 	if (searchstr >> id) {
-		for (std::list<Player *>:: iterator it = players.begin(); it != players.end(); it++) {
+		for (std::list<Player *>:: iterator it = server_players.begin(); it != server_players.end(); it++) {
 			if ((*it)->id() == id) {
 				return (*it);
 			}
@@ -267,7 +269,7 @@ Player *GameServer::find_player(std::string const search)
 	if (search.size() <3)
 		return 0;
 
-	for (std::list<Player *>:: iterator it = players.begin(); it != players.end(); it++) {
+	for (std::list<Player *>:: iterator it = server_players.begin(); it != server_players.end(); it++) {
 		if (aux::text_strip_lowercase((*it)->name()).find(lowercase(search)) != std::string::npos)
 			return (*it);
 	}
@@ -470,7 +472,7 @@ void GameServer::player_connect(Player *player)
 	server_module->player_connect(player);
 
 	// manage player list
-	players.push_back(player);
+	server_players.push_back(player);
 }
 
 void GameServer::player_disconnect(Player *player)
@@ -487,12 +489,12 @@ void GameServer::player_disconnect(Player *player)
 	server_module->player_disconnect(player);
 
 	// manage player list
-	std::list<Player *>:: iterator it = players.begin(); 
-	while (((*it)->id() != player->id()) && (it != players.end())) {
+	std::list<Player *>:: iterator it = server_players.begin(); 
+	while (((*it)->id() != player->id()) && (it != server_players.end())) {
 		it++;
 	}
-	if (it != players.end()) {
-			players.erase(it);
+	if (it != server_players.end()) {
+			server_players.erase(it);
 	}
 }