/[pkgs]/devel/8Kingdoms/8Kingdoms-1.1.0-locking.patch
ViewVC logotype

Contents of /devel/8Kingdoms/8Kingdoms-1.1.0-locking.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Tue Dec 11 11:34:11 2007 UTC (23 months, 2 weeks ago) by jwrdegoede
Branch: MAIN
CVS Tags: Kingdoms-1_1_0-6_fc9, Kingdoms-1_1_0-3_fc9, Kingdoms-1_1_0-5_fc9, F-10-split, Kingdoms-1_1_0-7_fc11, Kingdoms-1_1_0-4_fc9, F-9-split, Kingdoms-1_1_0-2_fc9, HEAD
File MIME type: text/x-patch 
initial 8Kingdoms import
1 diff -up 8Kingdoms-1.1.0/world/world_engine.cpp~ 8Kingdoms-1.1.0/world/world_engine.cpp
2 --- 8Kingdoms-1.1.0/world/world_engine.cpp~ 2007-12-02 12:43:53.000000000 +0100
3 +++ 8Kingdoms-1.1.0/world/world_engine.cpp 2007-12-02 12:43:53.000000000 +0100
4 @@ -1214,7 +1214,10 @@ int TWorldServerEngine::unitMove(int uni
5 }
6
7 if (!can_move)
8 + {
9 + unlock();
10 return ERR_NotOperational;
11 + }
12
13 TPacket_RCT_UNIT_MOVE * packet = new TPacket_RCT_UNIT_MOVE();
14 packet->unit_id = unit_id;
15 diff -up 8Kingdoms-1.1.0/world/world_client.cpp~ 8Kingdoms-1.1.0/world/world_client.cpp
16 --- 8Kingdoms-1.1.0/world/world_client.cpp~ 2007-12-02 12:09:28.000000000 +0100
17 +++ 8Kingdoms-1.1.0/world/world_client.cpp 2007-12-02 12:09:28.000000000 +0100
18 @@ -321,6 +321,7 @@ RVAL WORLD_CLIENT_MSG_HANDLER(MESSAGE_ID
19
20 if (world_client[i]->state == WCS_GAME_ENDED && action_type == AT_ENDGAME) {
21 // zprava o ukonceni hry pro jiz ukoncenou hru - ignoruji
22 + world_client_mutex.unlock();
23 break;
24 }
25 else if (!(((action_type == AT_GAME_START) && (world_client[i]->state >= WCS_WORLD_INITIALIZED) && (world_client[i]->state < WCS_GAME_STARTED))
26 @@ -328,6 +329,7 @@ RVAL WORLD_CLIENT_MSG_HANDLER(MESSAGE_ID
27 (world_client[i]->state == WCS_GAME_STARTED)
28 )) {
29 // zprava prisla v nevhodnou chvili - ignoruji
30 + world_client_mutex.unlock();
31 break;
32 }
33
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2