Blame 8Kingdoms-1.1.0-64bit.patch

d07f282
diff -ur 8Kingdoms-1.1.0/gui/contexts/Game.cpp 8Kingdoms-1.1.0.new/gui/contexts/Game.cpp
d07f282
--- 8Kingdoms-1.1.0/gui/contexts/Game.cpp	2007-07-22 03:32:57.000000000 +0200
d07f282
+++ 8Kingdoms-1.1.0.new/gui/contexts/Game.cpp	2007-11-24 22:44:14.000000000 +0100
d07f282
@@ -3216,7 +3216,7 @@
d07f282
         else          
d07f282
           ei = GAME_EVENT(iPlayerOnTurn, eitUnitMembersDied, hid, rmtxti->getWChar(wtemp, LABEL_MAX_LENGTH, TEXT_EVENT_UNHEALEDMEN));
d07f282
         ei->data1 = (void*)u;
d07f282
-        ei->data2 = *((void**)&count);
d07f282
+        ei->data2 = (void*)count;
d07f282
       }
d07f282
       else{
d07f282
         u->membersDied(count);
d07f282
diff -ur 8Kingdoms-1.1.0/net/netinit.cpp 8Kingdoms-1.1.0.new/net/netinit.cpp
d07f282
--- 8Kingdoms-1.1.0/net/netinit.cpp	2007-07-22 03:32:59.000000000 +0200
d07f282
+++ 8Kingdoms-1.1.0.new/net/netinit.cpp	2007-11-24 22:43:29.000000000 +0100
d07f282
@@ -325,7 +325,7 @@
d07f282
           if (freeprofilename==0) // pokud takovy profil neni uz pripojen
d07f282
           {
d07f282
             net_server->startPing(from);
d07f282
-            KSendMessage(RQUEUE,MSG_NEW_CONNECTION_ACCEPTED,MOD_NET,MOD_NET,*((void**)(&from)));
d07f282
+            KSendMessage(RQUEUE,MSG_NEW_CONNECTION_ACCEPTED,MOD_NET,MOD_NET,(void*)from);
d07f282
           }
d07f282
           else
d07f282
           {
d07f282
@@ -379,8 +379,8 @@
d07f282
         int from = new_connection_info->msgFrom();
d07f282
         net_server->stopAnnouncingMissingPlayers();
d07f282
         net_server->startPing(from);
d07f282
-        KSendMessage(RQUEUE,MSG_CLIENT_HAS_RECONNECTED,MOD_NET,BROADCAST,*((void**)(&from)));
d07f282
-        KSendMessage(RQUEUE,MSG_CLIENT_RECONNECTION_ACCEPTED,MOD_NET,MOD_NET,*((void**)(&from)));
d07f282
+        KSendMessage(RQUEUE,MSG_CLIENT_HAS_RECONNECTED,MOD_NET,BROADCAST,(void*)from);
d07f282
+        KSendMessage(RQUEUE,MSG_CLIENT_RECONNECTION_ACCEPTED,MOD_NET,MOD_NET,(void*)from);
d07f282
       }
d07f282
     }
d07f282
 
d07f282
@@ -435,9 +435,9 @@
d07f282
         net_client->addClientInfo(ni);
d07f282
       }
d07f282
       if (msgId==MSG_CLIENT_RECONNECTION_INFO)
d07f282
-        KSendMessage(RQUEUE,MSG_CLIENT_RECONNECTION_REPORT,MOD_NET,BROADCAST,*((void**)(&(ni->clientid)))); 
d07f282
+        KSendMessage(RQUEUE,MSG_CLIENT_RECONNECTION_REPORT,MOD_NET,BROADCAST,(void*)(ni->clientid)); 
d07f282
       else
d07f282
-        KSendMessage(RQUEUE,MSG_NEW_CONNECTION_REPORT,MOD_NET,BROADCAST,*((void**)(&(ni->clientid)))); 
d07f282
+        KSendMessage(RQUEUE,MSG_NEW_CONNECTION_REPORT,MOD_NET,BROADCAST,(void*)(ni->clientid)); 
d07f282
 
d07f282
       delete(new_connetion_info);
d07f282
       KMemFree(ni);
d07f282
@@ -489,7 +489,7 @@
d07f282
       {
d07f282
         net_client->removeClientInfo(who);
d07f282
       }
d07f282
-      KSendMessage(RQUEUE,MSG_CLIENT_DISCONNECTION_REPORT,MOD_NET,BROADCAST,*((void**)(&who))); 
d07f282
+      KSendMessage(RQUEUE,MSG_CLIENT_DISCONNECTION_REPORT,MOD_NET,BROADCAST,(void*)who); 
d07f282
       delete(message);
d07f282
     }
d07f282
     break;
d07f282
diff -ur 8Kingdoms-1.1.0/net/server.cpp 8Kingdoms-1.1.0.new/net/server.cpp
d07f282
--- 8Kingdoms-1.1.0/net/server.cpp	2007-07-22 03:32:59.000000000 +0200
d07f282
+++ 8Kingdoms-1.1.0.new/net/server.cpp	2007-11-24 22:42:03.000000000 +0100
d07f282
@@ -259,7 +259,7 @@
d07f282
 
d07f282
     // In case in profile is set to announce and is not currently announcing
d07f282
 
d07f282
-    KSendMessage(RQUEUE,MSG_CLIENT_DISCONNECTION_ACCEPTED,MOD_NET,MOD_NET,*((void**)(&id)));
d07f282
+    KSendMessage(RQUEUE,MSG_CLIENT_DISCONNECTION_ACCEPTED,MOD_NET,MOD_NET,(void*)id);
d07f282
   }
d07f282
   else
d07f282
   {
d07f282
@@ -345,7 +345,7 @@
d07f282
 //                  printf("Socket se zavrel - klient %i\n",i);
d07f282
                   if (that->status!=STATUS_ENDING) 
d07f282
                   {
d07f282
-                    KSendMessage(RQUEUE,MSG_CLIENT_HAS_DISCONNECTED,MOD_NET,BROADCAST,*((void**)(&i)));
d07f282
+                    KSendMessage(RQUEUE,MSG_CLIENT_HAS_DISCONNECTED,MOD_NET,BROADCAST,(void*)i);
d07f282
                     that->clientDisconnected(i);
d07f282
                   }
d07f282
                 }
d07f282
@@ -655,8 +655,8 @@
d07f282
       GLOBALLOGID(PRIORITY_NEW_CONNECTION, "Server - A local client having id %i has connected, free space: %i",(*client)->clientid,this->getFreeClientCount());
d07f282
 //      printf("\nKlient se pripojil id %i, port %i, volne: %i",(*client)->clientid,(*client)->fd,this->getFreeClientCount()); 
d07f282
 
d07f282
-      KSendMessage(RQUEUE,MSG_LOCAL_CLIENT_ADDED,MOD_NET,MOD_NET,*((void**)(&((*client)->clientid))));
d07f282
-      KSendMessage(RQUEUE,MSG_NEW_CONNECTION_ACCEPTED,MOD_NET,MOD_NET,*((void**)(&((*client)->clientid))));
d07f282
+      KSendMessage(RQUEUE,MSG_LOCAL_CLIENT_ADDED,MOD_NET,MOD_NET,(void*)((*client)->clientid));
d07f282
+      KSendMessage(RQUEUE,MSG_NEW_CONNECTION_ACCEPTED,MOD_NET,MOD_NET,(void*)((*client)->clientid));
d07f282
 
d07f282
       this->unlock();
d07f282
       return 1;
d07f282
@@ -1223,7 +1223,7 @@
d07f282
           {
d07f282
             that->unlock();
d07f282
             if (that->status!=STATUS_ENDING) 
d07f282
-              KSendMessage(RQUEUE,MSG_CLIENT_HAS_DISCONNECTED,MOD_NET,BROADCAST,*((void**)(&i)));
d07f282
+              KSendMessage(RQUEUE,MSG_CLIENT_HAS_DISCONNECTED,MOD_NET,BROADCAST,(void*)i);
d07f282
             else
d07f282
               return 0;
d07f282
             that->lock();
d07f282
diff -ur 8Kingdoms-1.1.0/world/world_server.cpp 8Kingdoms-1.1.0.new/world/world_server.cpp
d07f282
--- 8Kingdoms-1.1.0/world/world_server.cpp	2007-07-22 03:33:12.000000000 +0200
d07f282
+++ 8Kingdoms-1.1.0.new/world/world_server.cpp	2007-11-24 22:45:14.000000000 +0100
d07f282
@@ -2032,7 +2032,7 @@
d07f282
 
d07f282
               for (int i = 0; i < MAX_PLAYERS; i++)
d07f282
               {
d07f282
-                if (game_start_disconnections[i] == ((int) p)) 
d07f282
+                if (game_start_disconnections[i] == ((long) p))
d07f282
                 {
d07f282
                   game_start_disconnections[i] = 0;
d07f282
                   break;
d07f282
@@ -2043,7 +2043,7 @@
d07f282
             else if (world_server->state == WSS_GAME_STARTED) 
d07f282
             {
d07f282
               // Hra jiz bezi, tedy doslo k znovu pripojeni    
d07f282
-              int client_id = (int)p;
d07f282
+              int client_id = (long)p;
d07f282
               for (TPlayerIterator it = world_server->world.players.begin(); it != world_server->world.players.end(); it++) 
d07f282
               {
d07f282
                 int temp=it->second->data().client_data.oldclient_id;
d07f282
@@ -2099,7 +2099,7 @@
d07f282
               // Az skonci nahravani hry, odpojeni klienta se vyresi dodatecne
d07f282
               for (int i = 0; i < MAX_PLAYERS; i++) 
d07f282
                 if (game_start_disconnections[i] == 0) 
d07f282
-                  game_start_disconnections[i] = (int)p;
d07f282
+                  game_start_disconnections[i] = (long)p;
d07f282
               break;
d07f282
             }
d07f282
             else if (world_server->state < WSS_GAME_STARTED) {
d07f282
@@ -2110,7 +2110,7 @@
d07f282
             }
d07f282
             else if (world_server->state == WSS_GAME_STARTED) {
d07f282
               // Hra jiz bezi    
d07f282
-              int client_id = (int)p;
d07f282
+              int client_id = (long)p;
d07f282
               for (TPlayerIterator it = world_server->world.players.begin(); it != world_server->world.players.end(); it++) {
d07f282
                 if (it->second->data().client_data.client_id == client_id) {
d07f282
                   // odpojil se hrac it->first
d07f282
diff -up 8Kingdoms-1.1.0/net/server.cpp~ 8Kingdoms-1.1.0/net/server.cpp
d07f282
--- 8Kingdoms-1.1.0/net/server.cpp~	2007-11-24 22:57:18.000000000 +0100
d07f282
+++ 8Kingdoms-1.1.0/net/server.cpp	2007-11-24 22:57:18.000000000 +0100
d07f282
@@ -415,7 +415,7 @@ int accept_thread(void * data)
d07f282
   #ifdef WIN32 
d07f282
     int sin_size = sizeof(struct sockaddr_in); // Windows chteji do accept int
d07f282
   #else
d07f282
-    size_t sin_size = sizeof(struct sockaddr_in);
d07f282
+    socklen_t sin_size = sizeof(struct sockaddr_in);
d07f282
   #endif
d07f282
 
d07f282
     int s;