[Ufo2000-svn] SF.net SVN: ufo2000:[1115] trunk/src

[<ufo...@li...>]

Revision: 1115
          http://ufo2000.svn.sourceforge.net/ufo2000/?rev=1115&view=rev
Author:   ssvb
Date:     2010-05-07 19:30:56 +0000 (Fri, 07 May 2010)

Log Message:
-----------
Put all server related code under ENABLE_UFO2K_SERVER define

From: Siarhei Siamashka <sia...@gm...>

Modified Paths:
--------------
    trunk/src/server.h
    trunk/src/server_game.h
    trunk/src/server_protocol.h

Modified: trunk/src/server.h
===================================================================
--- trunk/src/server.h	2010-04-15 09:00:12 UTC (rev 1114)
+++ trunk/src/server.h	2010-05-07 19:30:56 UTC (rev 1115)
@@ -26,13 +26,6 @@
 #define PACKET_SIZE_LIMIT 65536
 #endif
 
-inline double get_time_diff(const NLtime &x, const NLtime &y)
-{
-    return (double)(y.seconds - x.seconds) * 1000.0 + (double)(y.mseconds - x.mseconds);
-}
-
-class ServerDispatch;
-
 //! Encode std::map<std::string, std::string> into a single string
 int encode_stringmap(const std::map<std::string, std::string> &info, std::string &buffer);
 //! Decode std::map<std::string, std::string> from a string
@@ -63,6 +56,15 @@
     int wait_packet(NLuint &id, std::string &buffer);
 };
 
+#ifdef ENABLE_UFO2K_SERVER
+
+inline double get_time_diff(const NLtime &x, const NLtime &y)
+{
+    return (double)(y.seconds - x.seconds) * 1000.0 + (double)(y.mseconds - x.mseconds);
+}
+
+class ServerDispatch;
+
 /**
  * Server side client-server connection
  *
@@ -133,3 +135,5 @@
 };
 
 #endif
+
+#endif

Modified: trunk/src/server_game.h
===================================================================
--- trunk/src/server_game.h	2010-04-15 09:00:12 UTC (rev 1114)
+++ trunk/src/server_game.h	2010-05-07 19:30:56 UTC (rev 1115)
@@ -24,6 +24,8 @@
 
 #include "server_protocol.h"
 
+#ifdef ENABLE_UFO2K_SERVER
+
 class Server_Game_UFO
 {
 public:
@@ -51,3 +53,5 @@
 };
 
 #endif
+
+#endif

Modified: trunk/src/server_protocol.h
===================================================================
--- trunk/src/server_protocol.h	2010-04-15 09:00:12 UTC (rev 1114)
+++ trunk/src/server_protocol.h	2010-05-07 19:30:56 UTC (rev 1115)
@@ -58,6 +58,8 @@
 
 #define SRV_ADVANCED_PACKET_MASK   0x80000000
 
+#ifdef ENABLE_UFO2K_SERVER
+
 class Server_Game_UFO;
 
 class ServerClientUfo: public ServerClient
@@ -94,6 +96,8 @@
     int validate_user(const std::string &username, const std::string &password);
 };
 
+#endif
+
 class ClientServerUfo: public ClientServer
 {
 public:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.