[Freeorion-programmers] SF.net SVN: freeorion:[4036] trunk/FreeOrion/server

[<geo...@us...>]

Revision: 4036
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4036&view=rev
Author:   geoffthemedio
Date:     2011-07-13 07:18:04 +0000 (Wed, 13 Jul 2011)

Log Message:
-----------
Removed TimerExpired server FSM event stuff.  Would / will implement timer-spawned events differently.

Modified Paths:
--------------
    trunk/FreeOrion/server/ServerFSM.cpp
    trunk/FreeOrion/server/ServerFSM.h

Modified: trunk/FreeOrion/server/ServerFSM.cpp
===================================================================
--- trunk/FreeOrion/server/ServerFSM.cpp	2011-07-11 00:27:59 UTC (rev 4035)
+++ trunk/FreeOrion/server/ServerFSM.cpp	2011-07-13 07:18:04 UTC (rev 4036)
@@ -1242,15 +1242,7 @@
     return transit<WaitingForSaveData>();
 }
 
-sc::result WaitingForTurnEndIdle::react(const TimerExpired& t)
-{
-    if (TRACE_EXECUTION) Logger().debugStream() << "(ServerFSM) WaitingForTurnEndIdle.TimerExpired";
-    ServerApp& server = Server();
-    post_event(CheckTurnEndConditions());
-    return discard_event();
-}
 
-
 ////////////////////////////////////////////////////////////
 // WaitingForSaveData
 ////////////////////////////////////////////////////////////

Modified: trunk/FreeOrion/server/ServerFSM.h
===================================================================
--- trunk/FreeOrion/server/ServerFSM.h	2011-07-11 00:27:59 UTC (rev 4035)
+++ trunk/FreeOrion/server/ServerFSM.h	2011-07-13 07:18:04 UTC (rev 4036)
@@ -42,7 +42,6 @@
 struct CheckStartConditions : sc::event<CheckStartConditions>           {};
 struct CheckTurnEndConditions : sc::event<CheckTurnEndConditions>       {};
 struct ProcessTurn : sc::event<ProcessTurn>                             {};
-struct TimerExpired : sc::event<TimerExpired>                           {};
 
 struct ResolveCombat : sc::event<ResolveCombat>
 {
@@ -297,15 +296,13 @@
 struct WaitingForTurnEndIdle : sc::state<WaitingForTurnEndIdle, WaitingForTurnEnd>
 {
     typedef boost::mpl::list<
-        sc::custom_reaction<SaveGameRequest>,
-        sc::custom_reaction<TimerExpired>
+        sc::custom_reaction<SaveGameRequest>
     > reactions;
 
     WaitingForTurnEndIdle(my_context c);
     ~WaitingForTurnEndIdle();
 
     sc::result react(const SaveGameRequest& msg);
-    sc::result react(const TimerExpired& t);
 
     SERVER_ACCESSOR
 };
@@ -320,8 +317,7 @@
         sc::custom_reaction<ClientSaveData>,
         sc::deferral<SaveGameRequest>,
         sc::deferral<TurnOrders>,
-        sc::deferral<PlayerChat>,
-        sc::deferral<TimerExpired>
+        sc::deferral<PlayerChat>
     > reactions;
 
     WaitingForSaveData(my_context c);