Cleanup: Removed include/de_network.h (2)

doomsday/apps/server/CMakeLists.txt

@@ -44,7 +44,6 @@ set (SHARED_WITH_CLIENT
     ${src}/include/de_graphics.h
     ${src}/include/de_infine.h
     ${src}/include/de_misc.h
-    ${src}/include/de_network.h
     ${src}/include/de_platform.h
     ${src}/include/de_play.h
     ${src}/include/de_render.h

doomsday/apps/server/include/server/sv_def.h

@@ -1,8 +1,9 @@
-/** @file sv_def.h Server Definitions.
+/** @file sv_def.h  Server Definitions.
+ *
  * @ingroup server
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2006-2015 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -18,20 +19,20 @@
  * http://www.gnu.org/licenses</small>
  */
 
-#ifndef __DOOMSDAY_SERVER_H__
-#define __DOOMSDAY_SERVER_H__
+#ifndef SERVER_DEF_H
+#define SERVER_DEF_H
+
+#ifndef __cplusplus
+#  error "server/sv_def.h requires C++"
+#endif
 
+#include <de/libcore.h>
+#include <de/Record>
 #include "dd_def.h"
 #include "network/protocol.h"
-//#include "network/sys_network.h"
-#include <de/Record>
 
 struct material_s;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define SV_WELCOME_STRING   "Doomsday " DOOMSDAY_VERSION_TEXT " Server (R22)"
 
 // Anything closer than this is always taken into consideration when
@@ -41,48 +42,59 @@ extern "C" {
 // Anything farther than this will never be taken into consideration.
 #define FAR_MOBJ_DIST       1500
 
-extern int svMaxPlayers;
-extern int allowFrames; // Allow sending of frames.
-extern int frameInterval; // In tics.
-extern int netRemoteUser; // The client who is currently logged in.
-extern char* netPassword; // Remote login password.
+extern de::dint svMaxPlayers;
+extern de::dint allowFrames;    ///< Allow sending of frames.
+extern de::dint frameInterval;  ///< In tics.
+extern de::dint netRemoteUser;  ///< The client who is currently logged in.
+extern char *netPassword;       ///< Remote login password.
+
+void Sv_Shutdown();
+
+void Sv_StartNetGame();
+
+void Sv_StopNetGame();
+
+dd_bool Sv_PlayerArrives(nodeid_t nodeID, char const *name);
+
+void Sv_PlayerLeaves(nodeid_t nodeID);
+
+void Sv_Handshake(de::dint playernum, dd_bool newplayer);
 
-void            Sv_Shutdown(void);
-void            Sv_StartNetGame(void);
-void            Sv_StopNetGame(void);
-dd_bool         Sv_PlayerArrives(nodeid_t nodeID, char const *name);
-void            Sv_PlayerLeaves(nodeid_t nodeID);
-void            Sv_Handshake(int playernum, dd_bool newplayer);
-void            Sv_GetPackets(void);
+void Sv_GetPackets();
 
 /**
  * Sends a console message to one or more clients.
  *
- * @param to     Client number to send text to. Use a negative number to
- *               broadcast to everybody.
+ * @param to     Client number to send @a msg to. Use a negative number to broadcast
+ *               the message to everyone.
  * @param flags  @ref consolePrintFlags
- * @param text   Text to send.
+ * @param msg    Message to send.
  */
-void            Sv_SendText(int to, int flags, const char* text);
-
-void            Sv_Ticker(timespan_t ticLength);
-int             Sv_Latency(byte cmdTime);
-void            Sv_Kick(int who);
-void            Sv_GetInfo(serverinfo_t* info);
-size_t          Sv_InfoToString(serverinfo_t* info, ddstring_t* msg);
-de::Record *    Sv_InfoToRecord(serverinfo_t *info);
-int             Sv_GetNumPlayers(void);
-int             Sv_GetNumConnected(void);
-dd_bool         Sv_CheckBandwidth(int playerNumber);
-dd_bool         Sv_CanTrustClientPos(int plrNum);
+void Sv_SendText(de::dint to, de::dint flags, char const *msg);
+
+void Sv_Ticker(timespan_t ticLength);
+
+de::dint Sv_Latency(byte cmdTime);
+
+void Sv_Kick(de::dint who);
+
+void Sv_GetInfo(serverinfo_t *info);
+
+de::dsize Sv_InfoToString(serverinfo_t *info, ddstring_t *msg);
+
+de::Record *Sv_InfoToRecord(serverinfo_t *info);
+
+de::dint Sv_GetNumPlayers();
+
+de::dint Sv_GetNumConnected();
+
+dd_bool Sv_CheckBandwidth(de::dint playerNumber);
+
+dd_bool Sv_CanTrustClientPos(de::dint plrNum);
 
 /**
  * Returns a unique id for material @a mat that can be passed on to clients.
  */
-unsigned int Sv_IdForMaterial(Material *mat);
+de::duint Sv_IdForMaterial(Material *mat);
 
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif
+#endif  // SERVER_DEF_H

doomsday/apps/server/include/server/sv_frame.h

@@ -1,4 +1,5 @@
-/** @file sv_frame.h F rame Generation and Transmission.
+/** @file sv_frame.h  Frame Generation and Transmission.
+ *
  * @ingroup server
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>

doomsday/apps/server/src/server/sv_infine.cpp

@@ -1,8 +1,7 @@
-/** @file sv_infine.cpp Server-side InFine.
- * @ingroup server
+/** @file sv_infine.cpp  Server-side InFine.
  *
  * @authors Copyright © 2003-2010 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2005-2010 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2005-2015 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -18,32 +17,37 @@
  * http://www.gnu.org/licenses</small>
  */
 
-#include "de_network.h"
+#include "server/sv_infine.h"
+
+#include "network/net_main.h"
+#include "network/net_msg.h"
+
 #include "ui/infine/finale.h"
 
-void Sv_Finale(finaleid_t id, int flags, char const *script)
-{
-    size_t scriptLen = 0;
+using namespace de;
 
-    if(isClient) return;
+void Sv_Finale(finaleid_t id, dint flags, char const *script)
+{
+    if(::isClient) return;
 
     // How much memory do we need?
+    dsize scriptLen = 0;
     if(script)
     {
         flags |= FINF_SCRIPT;
-        scriptLen = strlen(script);
+        scriptLen = qstrlen(script);
     }
 
     // First the flags.
     Msg_Begin(PSV_FINALE);
-    Writer_WriteByte(msgWriter, flags);
-    Writer_WriteUInt32(msgWriter, id); // serverside Id
+    Writer_WriteByte(::msgWriter, flags);
+    Writer_WriteUInt32(::msgWriter, id); // serverside Id
 
     if(script)
     {
         // Then the script itself.
-        Writer_WriteUInt32(msgWriter, scriptLen);
-        Writer_Write(msgWriter, script, scriptLen);
+        Writer_WriteUInt32(::msgWriter, scriptLen);
+        Writer_Write(::msgWriter, script, scriptLen);
     }
 
     Msg_End();