devel/8Kingdoms/8Kingdoms-1.1.0-64bit.patch

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;
1	diff -ur 8Kingdoms-1.1.0/gui/contexts/Game.cpp 8Kingdoms-1.1.0.new/gui/contexts/Game.cpp
2	--- 8Kingdoms-1.1.0/gui/contexts/Game.cpp 2007-07-22 03:32:57.000000000 +0200
3	+++ 8Kingdoms-1.1.0.new/gui/contexts/Game.cpp 2007-11-24 22:44:14.000000000 +0100
4	@@ -3216,7 +3216,7 @@
5	else
6	ei = GAME_EVENT(iPlayerOnTurn, eitUnitMembersDied, hid, rmtxti->getWChar(wtemp, LABEL_MAX_LENGTH, TEXT_EVENT_UNHEALEDMEN));
7	ei->data1 = (void*)u;
8	- ei->data2 = ((void*)&count);
9	+ ei->data2 = (void*)count;
10	}
11	else{
12	u->membersDied(count);
13	diff -ur 8Kingdoms-1.1.0/net/netinit.cpp 8Kingdoms-1.1.0.new/net/netinit.cpp
14	--- 8Kingdoms-1.1.0/net/netinit.cpp 2007-07-22 03:32:59.000000000 +0200
15	+++ 8Kingdoms-1.1.0.new/net/netinit.cpp 2007-11-24 22:43:29.000000000 +0100
16	@@ -325,7 +325,7 @@
17	if (freeprofilename==0) // pokud takovy profil neni uz pripojen
18	{
19	net_server->startPing(from);
20	- KSendMessage(RQUEUE,MSG_NEW_CONNECTION_ACCEPTED,MOD_NET,MOD_NET,((void*)(&from)));
21	+ KSendMessage(RQUEUE,MSG_NEW_CONNECTION_ACCEPTED,MOD_NET,MOD_NET,(void*)from);
22	}
23	else
24	{
25	@@ -379,8 +379,8 @@
26	int from = new_connection_info->msgFrom();
27	net_server->stopAnnouncingMissingPlayers();
28	net_server->startPing(from);
29	- KSendMessage(RQUEUE,MSG_CLIENT_HAS_RECONNECTED,MOD_NET,BROADCAST,((void*)(&from)));
30	- KSendMessage(RQUEUE,MSG_CLIENT_RECONNECTION_ACCEPTED,MOD_NET,MOD_NET,((void*)(&from)));
31	+ KSendMessage(RQUEUE,MSG_CLIENT_HAS_RECONNECTED,MOD_NET,BROADCAST,(void*)from);
32	+ KSendMessage(RQUEUE,MSG_CLIENT_RECONNECTION_ACCEPTED,MOD_NET,MOD_NET,(void*)from);
33	}
34	}
35
36	@@ -435,9 +435,9 @@
37	net_client->addClientInfo(ni);
38	}
39	if (msgId==MSG_CLIENT_RECONNECTION_INFO)
40	- KSendMessage(RQUEUE,MSG_CLIENT_RECONNECTION_REPORT,MOD_NET,BROADCAST,((void*)(&(ni->clientid))));
41	+ KSendMessage(RQUEUE,MSG_CLIENT_RECONNECTION_REPORT,MOD_NET,BROADCAST,(void*)(ni->clientid));
42	else
43	- KSendMessage(RQUEUE,MSG_NEW_CONNECTION_REPORT,MOD_NET,BROADCAST,((void*)(&(ni->clientid))));
44	+ KSendMessage(RQUEUE,MSG_NEW_CONNECTION_REPORT,MOD_NET,BROADCAST,(void*)(ni->clientid));
45
46	delete(new_connetion_info);
47	KMemFree(ni);
48	@@ -489,7 +489,7 @@
49	{
50	net_client->removeClientInfo(who);
51	}
52	- KSendMessage(RQUEUE,MSG_CLIENT_DISCONNECTION_REPORT,MOD_NET,BROADCAST,((void*)(&who)));
53	+ KSendMessage(RQUEUE,MSG_CLIENT_DISCONNECTION_REPORT,MOD_NET,BROADCAST,(void*)who);
54	delete(message);
55	}
56	break;
57	diff -ur 8Kingdoms-1.1.0/net/server.cpp 8Kingdoms-1.1.0.new/net/server.cpp
58	--- 8Kingdoms-1.1.0/net/server.cpp 2007-07-22 03:32:59.000000000 +0200
59	+++ 8Kingdoms-1.1.0.new/net/server.cpp 2007-11-24 22:42:03.000000000 +0100
60	@@ -259,7 +259,7 @@
61
62	// In case in profile is set to announce and is not currently announcing
63
64	- KSendMessage(RQUEUE,MSG_CLIENT_DISCONNECTION_ACCEPTED,MOD_NET,MOD_NET,((void*)(&id)));
65	+ KSendMessage(RQUEUE,MSG_CLIENT_DISCONNECTION_ACCEPTED,MOD_NET,MOD_NET,(void*)id);
66	}
67	else
68	{
69	@@ -345,7 +345,7 @@
70	// printf("Socket se zavrel - klient %i\n",i);
71	if (that->status!=STATUS_ENDING)
72	{
73	- KSendMessage(RQUEUE,MSG_CLIENT_HAS_DISCONNECTED,MOD_NET,BROADCAST,((void*)(&i)));
74	+ KSendMessage(RQUEUE,MSG_CLIENT_HAS_DISCONNECTED,MOD_NET,BROADCAST,(void*)i);
75	that->clientDisconnected(i);
76	}
77	}
78	@@ -655,8 +655,8 @@
79	GLOBALLOGID(PRIORITY_NEW_CONNECTION, "Server - A local client having id %i has connected, free space: %i",(*client)->clientid,this->getFreeClientCount());
80	// printf("\nKlient se pripojil id %i, port %i, volne: %i",(client)->clientid,(client)->fd,this->getFreeClientCount());
81
82	- KSendMessage(RQUEUE,MSG_LOCAL_CLIENT_ADDED,MOD_NET,MOD_NET,((void)(&((client)->clientid))));
83	- KSendMessage(RQUEUE,MSG_NEW_CONNECTION_ACCEPTED,MOD_NET,MOD_NET,((void)(&((client)->clientid))));
84	+ KSendMessage(RQUEUE,MSG_LOCAL_CLIENT_ADDED,MOD_NET,MOD_NET,(void)((client)->clientid));
85	+ KSendMessage(RQUEUE,MSG_NEW_CONNECTION_ACCEPTED,MOD_NET,MOD_NET,(void)((client)->clientid));
86
87	this->unlock();
88	return 1;
89	@@ -1223,7 +1223,7 @@
90	{
91	that->unlock();
92	if (that->status!=STATUS_ENDING)
93	- KSendMessage(RQUEUE,MSG_CLIENT_HAS_DISCONNECTED,MOD_NET,BROADCAST,((void*)(&i)));
94	+ KSendMessage(RQUEUE,MSG_CLIENT_HAS_DISCONNECTED,MOD_NET,BROADCAST,(void*)i);
95	else
96	return 0;
97	that->lock();
98	diff -ur 8Kingdoms-1.1.0/world/world_server.cpp 8Kingdoms-1.1.0.new/world/world_server.cpp
99	--- 8Kingdoms-1.1.0/world/world_server.cpp 2007-07-22 03:33:12.000000000 +0200
100	+++ 8Kingdoms-1.1.0.new/world/world_server.cpp 2007-11-24 22:45:14.000000000 +0100
101	@@ -2032,7 +2032,7 @@
102
103	for (int i = 0; i < MAX_PLAYERS; i++)
104	{
105	- if (game_start_disconnections[i] == ((int) p))
106	+ if (game_start_disconnections[i] == ((long) p))
107	{
108	game_start_disconnections[i] = 0;
109	break;
110	@@ -2043,7 +2043,7 @@
111	else if (world_server->state == WSS_GAME_STARTED)
112	{
113	// Hra jiz bezi, tedy doslo k znovu pripojeni
114	- int client_id = (int)p;
115	+ int client_id = (long)p;
116	for (TPlayerIterator it = world_server->world.players.begin(); it != world_server->world.players.end(); it++)
117	{
118	int temp=it->second->data().client_data.oldclient_id;
119	@@ -2099,7 +2099,7 @@
120	// Az skonci nahravani hry, odpojeni klienta se vyresi dodatecne
121	for (int i = 0; i < MAX_PLAYERS; i++)
122	if (game_start_disconnections[i] == 0)
123	- game_start_disconnections[i] = (int)p;
124	+ game_start_disconnections[i] = (long)p;
125	break;
126	}
127	else if (world_server->state < WSS_GAME_STARTED) {
128	@@ -2110,7 +2110,7 @@
129	}
130	else if (world_server->state == WSS_GAME_STARTED) {
131	// Hra jiz bezi
132	- int client_id = (int)p;
133	+ int client_id = (long)p;
134	for (TPlayerIterator it = world_server->world.players.begin(); it != world_server->world.players.end(); it++) {
135	if (it->second->data().client_data.client_id == client_id) {
136	// odpojil se hrac it->first
137	diff -up 8Kingdoms-1.1.0/net/server.cpp~ 8Kingdoms-1.1.0/net/server.cpp
138	--- 8Kingdoms-1.1.0/net/server.cpp~ 2007-11-24 22:57:18.000000000 +0100
139	+++ 8Kingdoms-1.1.0/net/server.cpp 2007-11-24 22:57:18.000000000 +0100
140	@@ -415,7 +415,7 @@ int accept_thread(void * data)
141	#ifdef WIN32
142	int sin_size = sizeof(struct sockaddr_in); // Windows chteji do accept int
143	#else
144	- size_t sin_size = sizeof(struct sockaddr_in);
145	+ socklen_t sin_size = sizeof(struct sockaddr_in);
146	#endif
147
148	int s;
admin@fedoraproject.org	ViewVC Help
Powered by ViewVC 1.1.2