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