From f261d257b7e7500c0ddcdcb7e03737b4ac5edb69 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Sat, 22 Dec 2007 18:36:53 +0000
Subject: [PATCH] serverinfo ip binding fix

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1469 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/client.cpp     | 2 +-
 source/src/clientgame.cpp | 6 ------
 source/src/serverms.cpp   | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/source/src/client.cpp b/source/src/client.cpp
index 23d89386..5129d4f6 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -415,7 +415,7 @@ bool securemapcheck(char *map)
     if(strstr(map, "maps/")==map || strstr(map, "maps\\")==map) map += strlen("maps/");
     loopv(securemaps) if(!strcmp(securemaps[i], map))
     {
-        conoutf("\f3map %s is secured, you can not send or overwrite it", map);
+        conoutf("\f3map %s is secured, you can not send, receive or overwrite it", map);
         return true;
     }
     return false;
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 36f4d5ab..c4814f91 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -526,7 +526,6 @@ int suicided = -1;
 void startmap(char *name)   // called just after a map load
 {
     clearminimap();
-    //if(netmapstart()) { gamemode = 0;}  //needs fixed to switch modes?
     senditemstoserver = true;
     // Added by Rick
 	if(m_botmode) BotManager.BeginMap(name);
@@ -539,12 +538,7 @@ void startmap(char *name)   // called just after a map load
     particlereset();
     suicided = -1;
     spawncycle = -1;
-
-    // FIXME
-    /*if(!m_mp(gamemode)) spawnplayer(player1);
-    else findplayerstart(player1);*/
     respawnself();
-
     player1->frags = player1->flagscore = player1->lifesequence = 0;
     loopv(players) if(players[i]) players[i]->frags = players[i]->flagscore = players[i]->lifesequence = 0;
     s_strcpy(clientmap, name);
diff --git a/source/src/serverms.cpp b/source/src/serverms.cpp
index d782bcde..1a19be90 100644
--- a/source/src/serverms.cpp
+++ b/source/src/serverms.cpp
@@ -243,7 +243,7 @@ void servermsinit(const char *master, char *ip, int infoport, char *sdesc, bool
 	if(listen)
 	{
         ENetAddress address = { ENET_HOST_ANY, infoport };
-        if(*ip && enet_address_set_host(&msaddress, ip)<0) printf("WARNING: server ip not resolved");
+        if(*ip && enet_address_set_host(&address, ip)<0) printf("WARNING: server ip not resolved");
         pongsock = enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM, &address);
         if(pongsock == ENET_SOCKET_NULL) fatal("could not create server info socket\n");
         else enet_socket_set_option(pongsock, ENET_SOCKOPT_NONBLOCK, 1);