Removed networking support

ChangeLog

@@ -11,6 +11,7 @@
 	* Moved system_timer into time utilities, changed its API
 	* Fixed a bug that prevented input of console commands using
 	  the shift key for eg. uppercase letters or symbols
+	* Removed (totally unfinished) networking support
 
 	[ 20140306 ]
 	* Created utility library

README.md

@@ -131,16 +131,6 @@ If you want to change this behaviour, this happens around line 1075 of `src/Open
 Console commands (BOOL is now '0' or '1' for less typing).
 Pressing <UP> will go back to last command entered (saves typing).
 
-#### Network
-
-| Command          | Action                                |
-| ----------------:|:------------------------------------- |
-| server           | Start network listen server           |
-| killserver       | Stop network listen server            |
-| port INT         | Set network port number               |
-| connect HOSTNAME | Connect to network server at HOSTNAME |
-| disconnect       | Disconnect from network server        |
-
 #### Game
 
 | Command             | Action                                                 |

data/OpenRaider.init

@@ -11,12 +11,6 @@ Font=~/.OpenRaider/data/test.ttf
 [Audio.OpenAL]
 Enable=true
 
-[Network.Server]
-Enable=false
-#Name=OpenRaider Server Beta 1
-#Dedicated=true
-Port=27910
-
 [Input.Mouse]
 SensitivityX=1.0
 SensitivityY=1.0

include/Network.h

@@ -1,112 +0,0 @@
-/*!
- * \file include/Network.h
- * \brief Networking Singleton class
- *
- * \author Mongoose
- */
-
-#ifndef _NETWORK_H_
-#define _NETWORK_H_
-
-/*!
- * \brief The packet holds the data for the network.
- *
- * This is encapsulated in the frame.
- */
-typedef struct network_packet_s {
-    char send;
-    unsigned int port;
-    unsigned int cid;
-    char  data[32];    //!< A short (32 char) string
-    float pos[3];
-    float pitch;
-    float yaw;
-    int aframe;
-    int bframe;
-    int view_model;
-    char gurantee;     //!< TCP like
-} network_packet_t;
-
-/*!
- * \brief The frame holds the data for the datalink layer.
- *
- * This goes over the line.
- */
-typedef struct network_frame_s {
-    unsigned int header;   //!< The header flags
-    unsigned int seq;      //!< The sequence number
-    unsigned int uid;
-    network_packet_t data; //!< The packet for the NL
-} network_frame_t;
-
-void from_network_layer(network_packet_t *p, unsigned int *last_id);
-void to_network_layer(network_packet_t p);
-
-void killNetworkSingleton();
-
-#define REMOTE_HOST_STR_SZ 64
-#define BIND_HOST_STR_SZ 64
-
-/*!
- * \brief Networking Singleton class
- */
-class Network {
-public:
-    /*!
-     * \brief Get the Singleton or create it on first use
-     * \returns Singleton of type Network
-     */
-    static Network *Instance();
-
-    /*!
-     * \brief Deconstructs an object of Network
-     */
-    ~Network();
-
-    network_frame_t &getPiggyBack();
-
-    unsigned int getUID();
-
-    int getPort();
-
-    void setDebug(bool toggle);
-
-    void setPort(unsigned int port);
-
-    void setBindHost(char *s);
-
-    void setRemoteHost(char *s);
-
-    void killServerThread();
-
-    void killClientThread();
-
-    void spawnServerThread();
-
-    void spawnClientThread();
-
-    int runServer();
-
-    void runClient();
-
-protected:
-    /*!
-     * \brief Constructs an object of Network
-     */
-    Network();
-
-private:
-    static Network *mInstance;            //!< Singleton use
-    bool mSpawnedClient;
-    bool mSpawnedServer;
-    int mPort;
-    char mRemoteHost[REMOTE_HOST_STR_SZ];
-    char mBindHost[BIND_HOST_STR_SZ];
-    bool mPiggyBack;
-    bool mNetworkReliable;
-    bool mKillClient;
-    bool mKillServer;
-    bool mDebug;
-};
-
-#endif

include/OpenRaider.h

@@ -16,7 +16,6 @@
 #include "Render.h"
 #include "Sound.h"
 #include "SDLSystem.h"
-#include "Network.h"
 #include "World.h"
 #include "templates/List.h"
 #include "templates/Vector.h"
@@ -226,7 +225,6 @@ private:
     char *m_pakDir;              //!< Current pak directory
     char *m_audioDir;            //!< Current audio directory
     char *m_homeDir;             //!< Current home directory
-    Vector<entity_t *> mClients; //!< Player entity/clients
 };
 
 #endif

src/CMakeLists.txt

@@ -4,7 +4,6 @@ set (SRCS ${SRCS} "Emitter.cpp")
 set (SRCS ${SRCS} "GLString.cpp")
 set (SRCS ${SRCS} "Matrix.cpp")
 set (SRCS ${SRCS} "Mesh.cpp")
-set (SRCS ${SRCS} "Network.cpp")
 set (SRCS ${SRCS} "OpenRaider.cpp")
 set (SRCS ${SRCS} "Particle.cpp")
 set (SRCS ${SRCS} "Quaternion.cpp")

src/Network.cpp

@@ -1,698 +0,0 @@
-/*!
- * \file src/Network.cpp
- * \brief Networking Singleton class
- *
- * \author Mongoose
- */
-
-#include <unistd.h>
-#include <signal.h>
-#include <string.h>
-#include <time.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <strings.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <stdlib.h>
-
-#include "utils/math.h" // Random Number
-#include "Network.h"
-
-//#define LOCAL_BCAST
-#define MAX_CLIENTS 32
-
-typedef struct client_s {
-    unsigned int uid;
-    char active;
-    unsigned int seq;
-    unsigned int frameExpected;
-} client_t;
-
-#include <pthread.h>
-pthread_t gPThreadId[3];
-
-unsigned int gUID;
-client_t gClients[MAX_CLIENTS];
-unsigned int gNumClients = 0;
-network_frame_t gPiggyBack;
-
-
-////////////////////////////////////////////////////////////
-// Constructors
-////////////////////////////////////////////////////////////
-
-Network *Network::mInstance = 0x0;
-
-
-Network *Network::Instance()
-{
-    if (mInstance == 0x0)
-    {
-        mInstance = new Network();
-    }
-
-    return mInstance;
-}
-
-
-void killNetworkSingleton()
-{
-    printf("Shutting down Network...\n");
-
-    // Requires public deconstructor
-    delete Network::Instance();
-}
-
-
-Network::Network()
-{
-    strncpy(mRemoteHost, "localhost", REMOTE_HOST_STR_SZ);
-    memset(mBindHost, 0, BIND_HOST_STR_SZ);
-    setPort(8080);
-
-    mPiggyBack = true;
-    mNetworkReliable = true;
-    mSpawnedClient = false;
-    mSpawnedServer = false;
-    mKillClient = false;
-    mKillServer = false;
-    mDebug = false;
-
-    gUID = getUID();
-
-    printf("UID %u\n", gUID);
-
-    for (gNumClients = MAX_CLIENTS; gNumClients > 0;)
-    {
-        --gNumClients;
-
-        gClients[gNumClients].active = 0;
-        gClients[gNumClients].uid = 0;
-        gClients[gNumClients].seq = 0;
-    }
-}
-
-
-Network::~Network()
-{
-    killServerThread();
-    killClientThread();
-}
-
-
-////////////////////////////////////////////////////////////
-// Public Accessors
-////////////////////////////////////////////////////////////
-
-network_frame_t &Network::getPiggyBack()
-{
-    return gPiggyBack;
-}
-
-
-unsigned int Network::getUID()
-{
-    struct timeval tv;
-    struct timezone tz;
-
-
-    gettimeofday(&tv, &tz);
-
-    srand(tv.tv_usec);
-
-    return ((unsigned int)(tv.tv_sec * helRandomNum(2.0f, 3.3f) -
-                tv.tv_sec * helRandomNum(1.0f, 2.0f)) +
-            (unsigned int)(tv.tv_usec * helRandomNum(2.0f, 3.3f) -
-                tv.tv_usec * helRandomNum(1.0f, 2.0f)) +
-            (unsigned int)helRandomNum(666.0f, 5000.0f));
-}
-
-
-int Network::getPort()
-{
-    return mPort;
-}
-
-
-////////////////////////////////////////////////////////////
-// Public Mutators
-////////////////////////////////////////////////////////////
-
-void *client_thread(void *v)
-{
-    Network &network = *Network::Instance();
-    network.runClient();
-
-    return NULL;
-}
-
-
-void *server_thread(void *v)
-{
-    Network &network = *Network::Instance();
-    network.runServer();
-
-    return NULL;
-}
-
-
-void Network::setBindHost(char *s)
-{
-    if (!s || !s[0])
-        return;
-
-    strncpy(mBindHost, s, BIND_HOST_STR_SZ);
-}
-
-
-void Network::setRemoteHost(char *s)
-{
-    if (!s || !s[0])
-        return;
-
-    strncpy(mRemoteHost, s, REMOTE_HOST_STR_SZ);
-}
-
-
-void Network::setDebug(bool toggle)
-{
-    mDebug = toggle;
-}
-
-
-void Network::setPort(unsigned int port)
-{
-    mPort = port;
-}
-
-
-void Network::killServerThread()
-{
-    mKillServer = true;
-
-    // Remember for mutex
-    //  while (mKillServer)
-    //  {
-    //  }
-
-    mSpawnedServer = false;
-}
-
-
-void Network::killClientThread()
-{
-    mKillClient = true;
-
-    // Remember for mutex
-    //  while (mKillClient)
-    //  {
-    //  }
-
-    mSpawnedClient = false;
-}
-
-
-void Network::spawnServerThread()
-{
-    // For now don't handle shutting down server to start client and vv
-    if (!mSpawnedServer && !mSpawnedClient)
-    {
-        pthread_create(gPThreadId + 0, 0, server_thread, NULL);
-        mSpawnedServer = true;
-    }
-}
-
-
-void Network::spawnClientThread()
-{
-    // For now don't handle shutting down server to start client and vv
-    if (!mSpawnedServer && !mSpawnedClient)
-    {
-        pthread_create(gPThreadId + 1, 0, client_thread, NULL);
-        mSpawnedClient = true;
-    }
-}
-
-
-////////////////////////////////////////////////////////////
-// Protected Mutators
-////////////////////////////////////////////////////////////
-
-int Network::runServer()
-{
-    unsigned int fsize;
-    int socket_fd, cc, cip;
-    struct sockaddr_in s_in, from;
-    char hostid[64];
-    network_frame_t f;
-    unsigned int i;
-    unsigned int packetsRecieved = 0;
-
-
-    socket_fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-
-    if (socket_fd < 0)
-    {
-        perror("recv_udp:socket");
-        return -1;
-    }
-
-    if (mBindHost[0])
-    {
-        strncpy(hostid, mBindHost, 64);
-    }
-    else
-    {
-        if (gethostname(hostid, 64) < 0)
-        {
-            perror("Server: recv_udp:gethostname");
-            return -1;
-        }
-
-        printf("Server: gethostname returned '%s'\n", hostid);
-        fflush(stdout);
-    }
-
-    // Setup for port binding
-    memset(&s_in, 0, sizeof(s_in));
-    s_in.sin_family = AF_INET;
-#ifdef LOCAL_BCAST
-    // Replace deprecated gethostbyname() with getaddrinfo()
-    //struct hostent *hostptr;
-    //if ((hostptr = gethostbyname(hostid)) == NULL)
-    //{
-    //    fprintf(stderr, "Server: recv_udp, Invalid host name '%s'\n", hostid);
-    //    return -1;
-    //}
-    //memcpy((void *)(&s_in.sin_addr), hostptr->h_addr, hostptr->h_length);
-    struct addrinfo *result, *res;
-    bool found = false;
-    int error = getaddrinfo(hostid, NULL, NULL, &result);
-    if (error != 0) {
-        fprintf(stderr, "Server: %s\n", gai_strerror(error));
-        return -1;
-    }
-    for (res = result; res != NULL; res = res->ai_next) {
-        if (res->ss_family == AF_INET) {
-            found = true;
-            memcpy((void *)&s_in, res->ai_addr, res->ai_addrlen);
-            break; // Found something suitable
-        }
-    }
-    freeaddrinfo(result);
-    if (!found) {
-        fprintf(stderr, "Server: Can't bind to %s\n", hostid);
-        return -1;
-    }
-#else
-    s_in.sin_addr.s_addr = htonl(INADDR_ANY);
-#endif
-    int port = getPort();
-    s_in.sin_port = htons(port); // htons new
-
-    fflush(stdout);
-
-    // Bind
-    while (bind(socket_fd, (struct sockaddr *)&s_in, sizeof(s_in)) < 0)
-    {
-        if (s_in.sin_port++ > (port + 10))
-        {
-            perror("Server: recv_udp:bind exhausted");
-            return -1;
-        }
-    }
-
-    cip = ntohl(s_in.sin_addr.s_addr);
-
-    printf("Server: Started on ( %i.%i.%i.%i:%i )\n",
-            cip >> 24, cip << 8 >> 24,
-            cip << 16 >> 24, cip << 24 >> 24, s_in.sin_port);
-
-    for (; !mKillClient;)
-    {
-        fsize = sizeof(from);
-
-        // 1. Wait for event
-        // 2. Get inbound frame
-        cc = recvfrom(socket_fd, &f, sizeof(network_frame_t), 0,
-                (struct sockaddr *)&from, &fsize);
-
-        if (cc < 0)
-        {
-            perror("Server: recv_udp:recvfrom");
-            continue;
-        }
-
-        ++packetsRecieved;
-
-        if (mDebug)
-        {
-            printf("=====================================================\n");
-            printf("Packet %u\n", packetsRecieved);
-            printf("Server: Recieved packet from %u\n",
-                    f.uid);
-        }
-
-        // A. Look and see if this client has connected before
-        for (i = 0; i < gNumClients; ++i)
-        {
-            if (gClients[i].uid == f.uid)
-            {
-                break;
-            }
-        }
-
-        // B. Collect client data if it's a new connection
-        if (!gClients[i].active)
-        {
-            for (i = 0; i < gNumClients+1; ++i)
-            {
-                if ((i + 1) < MAX_CLIENTS && !gClients[i].active)
-                {
-                    gClients[i].uid = f.uid;
-                    gClients[i].active = 1;
-                    gClients[i].frameExpected = 0;
-                    ++gNumClients;
-
-                    printf("Server: %u made connection, as client %u\n",
-                            gClients[i].uid, i);
-                    break;
-                }
-            }
-
-            if (i == MAX_CLIENTS || !gClients[i].active)
-            {
-                if (mDebug)
-                {
-                    printf("Server: Handshake packet from %u failed?\n",
-                            f.uid);
-                }
-                continue;
-            }
-        }
-
-        cip = ntohl(from.sin_addr.s_addr);
-
-        if (mDebug)
-        {
-            printf("Server: Client (Famliy %d, Address %i.%i.%i.%i:%d)\n",
-                    ntohs(from.sin_family), cip >> 24, cip << 8 >> 24,
-                    cip << 16 >> 24, cip << 24 >> 24,
-                    ntohs(from.sin_port));
-
-            printf("Server: Datalink layer recieved: packet seq %u\n",
-                    f.seq);
-        }
-
-        if (mNetworkReliable)
-        {
-            if (f.seq == gClients[i].seq)
-            {
-                if (mDebug)
-                {
-                    printf("SERVER> Msg from %u\n", f.uid);
-                }
-
-                to_network_layer(f.data);
-                gClients[i].seq = f.seq;
-            }
-            else
-            {
-                continue;
-            }
-        }
-
-        //! \fixme Combine with above, duh
-        // 3. Send to network layer
-        if (gClients[i].frameExpected == f.header)
-        {
-            f.data.cid = i;
-
-            to_network_layer(f.data);
-            gClients[i].frameExpected = !gClients[i].frameExpected;
-        }
-
-        fflush(stdout);
-
-#ifdef UNIT_TEST
-        if ((rand() % 10 == 0))
-        {
-            printf("Server: Simulating a lost ack %u\n", f.seq);
-            continue;
-        }
-#endif
-
-        // 4. Send ACK, w/ piggyback if requested
-        if (mPiggyBack)
-        {
-            gPiggyBack.header = 0;
-            gPiggyBack.seq = f.seq;
-            gPiggyBack.uid = gUID;
-
-            if (mDebug)
-            {
-                printf("SERVER> Sending data by piggyback\n");
-            }
-
-            cc = sendto(socket_fd, &gPiggyBack, sizeof(gPiggyBack), 0,
-                    (struct sockaddr *)&from, sizeof(from));
-        }
-        else
-        {
-            f.header = 0;
-            f.seq = 0;
-            f.uid = gUID;
-
-            cc = sendto(socket_fd, &f, sizeof(f), 0,
-                    (struct sockaddr *)&from, sizeof(from));
-        }
-
-        if (cc < 0)
-        {
-            perror("Server: send_udp:sendto");
-        }
-        else
-        {
-            if (mDebug)
-            {
-                printf("Server: Ack sent to %u\n", gClients[i].uid);
-            }
-        }
-    }
-
-    mKillClient = false;
-
-    return 0;
-}
-
-
-void Network::runClient()
-{
-    unsigned int fsize, last_frame_sent = 0;
-    int socket_fd, cc, done;
-    struct sockaddr_in dest;
-    struct addrinfo *addr;
-    network_frame_t f;
-    struct timeval timeout;
-    fd_set readfds;
-    unsigned int packetsSent = 0;
-    unsigned int seq = 0;
-    char timedOut = 1;
-
-    if (!mRemoteHost || !mRemoteHost[0])
-    {
-        return;
-    }
-
-    memset((char*) &timeout, 0, sizeof(timeout));
-    timeout.tv_sec = 5;
-
-    socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
-
-    if (socket_fd == -1)
-    {
-        perror("Client: send_udp: socket");
-        exit(0);
-    }
-
-    //if ((hostptr = gethostbyname(mRemoteHost)) == NULL)
-    //{
-    //    fprintf(stderr, "Client: send_udp: invalid host name, %s\n",
-    //            mRemoteHost);
-    //    exit(0);
-    //}
-
-    int error = getaddrinfo(mRemoteHost, NULL, NULL, &addr);
-    if (error != 0) {
-        fprintf(stderr, "Client: %s\n", gai_strerror(error));
-        exit(0);
-    }
-
-    // Setup connection
-    memset(&dest, 0, sizeof(dest));
-    dest.sin_family = AF_INET;
-    int port = getPort();
-    dest.sin_port = htons(port);
-#ifdef LOCAL_BCAST
-    //memcpy(hostptr->h_addr, (char *) &dest.sin_addr, hostptr->h_length);
-    bool found = false;
-    for (struct addrinfo *res = addr; res != NULL; res = res->ai_next) {
-        if (res->ss_family == AF_INET) {
-            found = true;
-            memcpy((void *)&dest.sin_addr, res->ai_addr.sin_addr, sizeof(res->ai_addr.sin_addr));
-            break; // Found something suitable
-        }
-    }
-    freeaddrinfo(addr);
-    if (!found) {
-        fprintf(stderr, "Client: Can't connect to %s\n", hostid);
-        return;
-    }
-#else
-    if (inet_pton(AF_INET, mRemoteHost, &dest.sin_addr) < 0)
-    {
-        perror("inet_pton");
-        return;
-    }
-#endif
-
-
-    // init
-    f.data.send = 0;
-    f.seq = 0;
-
-    for (; !mKillServer;)
-    {
-        ++packetsSent;
-
-        if (mDebug)
-        {
-            printf("=====================================================\n");
-            printf("Packet %u\n", packetsSent);
-        }
-
-        // 1. Get packet to send over wire
-        if (mNetworkReliable && timedOut && f.seq != seq)
-        {
-            if (mDebug)
-            {
-                printf("Client: Resending packet\n");
-            }
-        }
-        else
-        {
-            from_network_layer(&f.data, &last_frame_sent);
-
-            if (!f.data.send)
-            {
-                struct timespec tmp;
-                tmp.tv_sec = 0;
-                tmp.tv_nsec = 20000;
-                nanosleep(&tmp, NULL);
-                continue;
-            }
-        }
-
-        // 2. Copy to frame
-        f.seq = 0;//seq;  // 0 forces all packets to check out
-        f.uid = gUID;
-
-        // 3. Send over the wire
-        done = 0;
-        timedOut = 0;
-
-        while (!done)
-        {
-            if (mDebug)
-            {
-                printf("Client: Sending packet %u\n", f.seq);
-            }
-
-            cc = sendto(socket_fd, &f, sizeof(f), 0,
-                    (struct sockaddr *)&dest, sizeof(dest));
-
-            if (cc < 0)
-            {
-                perror("Client: send_udp:sendto");
-
-                if (errno == EMSGSIZE)
-                {
-                    printf("Client: packet was too large\n");
-                }
-            }
-            else
-            {
-                f.data.send = 0;
-            }
-
-            // Comment out this to enable more reliable service
-            done = 1;
-        }
-
-        // 4. Wait for +ack or resend
-        FD_ZERO(&readfds);
-
-        // Setup socket to listen on here
-        FD_SET(socket_fd, &readfds);
-
-        // Set timeout in milliseconds
-        timeout.tv_usec = 850;
-
-        cc = select(socket_fd + 1, &readfds, NULL, NULL, &timeout);
-
-        if ((cc < 0) && (errno != EINTR))
-        {
-            // there was an local error with select
-        }
-
-        if (cc == 0)
-        {
-            if (mDebug)
-            {
-                printf("Client: Timeout detected on packet %u\n", f.seq);
-            }
-            timedOut = 1;
-            continue;
-        }
-
-        // Clear header for recv use
-        f.header = 0;
-
-        fsize = sizeof(dest);
-        cc = recvfrom(socket_fd, &f, sizeof(f), 0,
-                (struct sockaddr *)&dest, &fsize);
-
-        if (cc < 0)
-        {
-            perror("Client: recv_udp:recvfrom");
-        }
-        else
-        {
-            if (mDebug)
-            {
-                printf("Client: Datalink layer recieved: packet seq %u\n", f.seq);
-                printf("CLIENT> Msg from %u\n", f.uid);
-            }
-
-            to_network_layer(f.data);
-        }
-
-        if (seq == f.seq)
-        {
-            if (mDebug)
-            {
-                printf("Client: Recieved ack %u\n", f.seq);
-            }
-
-            ++seq;
-        }
-    }
-
-    mKillServer = false;
-}
-

src/OpenRaider.cpp

@@ -31,10 +31,6 @@ std::map<int, int> gMapTex2Bump;
 Vector <unsigned int> gColorTextureHACK;
 int gTextureOffset;
 entity_t *LARA = 0x0;
-entity_t *gClientPlayer[32];
-unsigned int gNetTicks = 0;
-unsigned int gNetLastTicks = 0;
-bool gStartServer = false;
 skeletal_model_t *gLaraModel = 0x0;
 char *gFontFilename = 0x0;
 
@@ -58,8 +54,6 @@ OpenRaider *OpenRaider::Instance()
 
 
 void killOpenRaiderSingleton() {
-    killNetworkSingleton();
-
     printf("Shutting down Game...\n");
 
     // Requires public deconstructor
@@ -75,13 +69,6 @@ void killOpenRaiderSingleton() {
 
 OpenRaider::OpenRaider() : SDLSystem()
 {
-    Network::Instance();
-
-    for (unsigned int i = 0; i < 32; ++i)
-    {
-        gClientPlayer[i] = 0x0;
-    }
-
     m_pakDir = 0x0;
     m_audioDir = 0x0;
     m_homeDir = 0x0;
@@ -100,7 +87,6 @@ OpenRaider::OpenRaider() : SDLSystem()
      * Only do this when you know the amount of commands + 1 (0 reserved)
      */
     mMode[addCommandMode("[OpenRaider.Engine]")] = 2;
-    mMode[addCommandMode("[Network.Server]")] = 5;
     mMode[addCommandMode("[Video.OpenGL]")] = 0;
     mMode[addCommandMode("[Audio.OpenAL]")] = 1;
     mMode[addCommandMode("[OpenRaider.Console]")] = 4;
@@ -194,116 +180,6 @@ void openraider_error(const char *func_name, const char *error,
 }
 
 
-void from_network_layer(network_packet_t *p, unsigned int *last_id)
-{
-    static unsigned int i = 0;
-
-
-    *last_id = i++;
-
-    if (gNetTicks > gNetLastTicks + 200) // 200ms
-    {
-        gNetLastTicks = gNetTicks;
-        p->send = 1;
-    }
-
-    if (LARA)
-    {
-        p->pos[0] = LARA->pos[0];
-        p->pos[1] = LARA->pos[1];
-        p->pos[2] = LARA->pos[2];
-        p->yaw = LARA->angles[1];
-        p->pitch = LARA->angles[1];
-        p->view_model = LARA->modelId;
-
-        SkeletalModel *mdl = static_cast<SkeletalModel *>(LARA->tmpHook);
-
-        if (mdl)
-        {
-            p->aframe = mdl->getAnimation();
-            p->bframe = mdl->getFrame();
-        }
-    }
-
-#ifdef DEBUG_NETWORK
-    printf("<> Sending data\n");
-#endif
-}
-
-
-void to_network_layer(network_packet_t p)
-{
-    OpenRaider &game = *OpenRaider::Instance();
-
-
-#ifdef DEBUG_NETWORK
-    printf("<> Recieved data\n");
-#endif
-
-    if (gClientPlayer[p.cid])
-    {
-        gClientPlayer[p.cid]->pos[0] = p.pos[0];
-        gClientPlayer[p.cid]->pos[1] = p.pos[1];
-        gClientPlayer[p.cid]->pos[2] = p.pos[2];
-        gClientPlayer[p.cid]->angles[1] = p.yaw;
-        gClientPlayer[p.cid]->angles[2] = p.pitch;
-    }
-    else if (LARA)
-    {
-        gClientPlayer[p.cid] = new entity_t;
-
-        gClientPlayer[p.cid]->pos[0] = p.pos[0];
-        gClientPlayer[p.cid]->pos[1] = p.pos[1];
-        gClientPlayer[p.cid]->pos[2] = p.pos[2];
-        gClientPlayer[p.cid]->angles[1] = p.yaw;
-        gClientPlayer[p.cid]->angles[2] = p.pitch;
-        gClientPlayer[p.cid]->moving = true;
-        gClientPlayer[p.cid]->objectId = 0;
-        gClientPlayer[p.cid]->id = LARA->id+1000+p.cid;
-        gClientPlayer[p.cid]->type = 0x02;
-
-        SkeletalModel *mdl = new SkeletalModel();
-        gClientPlayer[p.cid]->tmpHook = mdl;
-        mdl->setAnimation(p.aframe);
-        mdl->setFrame(p.bframe);
-        mdl->setIdleAnimation(TR_ANIAMTION_STAND);
-        gClientPlayer[p.cid]->modelId = LARA->modelId; //p.view_model;
-        gClientPlayer[p.cid]->animate = true;
-
-        gWorld.addEntity(gClientPlayer[p.cid]);
-        game.print(true, "A new player (%u) connected", p.cid);
-    }
-
-    if (LARA)
-    {
-        Network &network = *Network::Instance();
-        network_frame_t &gPiggyBack = network.getPiggyBack();
-
-
-        if (gNetTicks > gNetLastTicks + 200)
-        {
-            gNetLastTicks = gNetTicks;
-            gPiggyBack.data.send = 1;
-        }
-
-        gPiggyBack.data.pos[0] = LARA->pos[0];
-        gPiggyBack.data.pos[1] = LARA->pos[1];
-        gPiggyBack.data.pos[2] = LARA->pos[2];
-        gPiggyBack.data.yaw = LARA->angles[1];
-        gPiggyBack.data.pitch = LARA->angles[2];
-        gPiggyBack.data.view_model = LARA->modelId;
-
-        SkeletalModel *mdl = static_cast<SkeletalModel *>(LARA->tmpHook);
-
-        if (mdl)
-        {
-            gPiggyBack.data.aframe = mdl->getAnimation();
-            gPiggyBack.data.bframe = mdl->getFrame();
-        }
-    }
-}
-
-
 void OpenRaider::handleMouseMotionEvent(float x, float y)
 {
     if (x > 0)
@@ -1165,8 +1041,8 @@ void OpenRaider::gameFrame()
 
 
     // Remember: ticks in milliseconds, time in hundredths
-    gNetTicks = ticks = systemTimerGet();
-    time = gNetTicks * 0.1f;
+    ticks = systemTimerGet();
+    time = ticks * 0.1f;
 
     switch (m_render.getMode())
     {
@@ -2835,45 +2711,6 @@ void OpenRaider::consoleCommand(char *cmd)
     {
         shutdown(0);
     }
-    else if (rc_command("port", cmd))
-    {
-        Network &net = *Network::Instance();
-        net.setPort(atoi(cmd));
-    }
-    else if (rc_command("killserver", cmd))
-    {
-        Network &net = *Network::Instance();
-
-
-        print(true, "Stopping network server...");
-        net.killServerThread();
-    }
-    else if (rc_command("server", cmd))
-    {
-        Network &net = *Network::Instance();
-
-
-        print(true, "Starting network server...");
-        net.spawnServerThread();
-    }
-    else if (rc_command("disconnect", cmd))
-    {
-        Network &net = *Network::Instance();
-
-
-        print(true, "Diconnecting...");
-        net.killClientThread();
-    }
-    else if (rc_command("connect", cmd))
-    {
-        Network &net = *Network::Instance();
-
-
-        print(true, "Connecting to %s...", cmd);
-
-        net.setRemoteHost(cmd);
-        net.spawnClientThread();
-    }
     else if (rc_command("fly", cmd))
     {
         if (LARA)
@@ -3549,28 +3386,6 @@ void OpenRaider::handleCommand(char *cmd, unsigned int mode)
 
             consoleCommand(cmd);
             break;
-        case 5:
-            if (rc_command("Enable", cmd))
-            {
-                rc_get_bool(cmd, &gStartServer);
-            }
-            else if (rc_command("Port", cmd))
-            {
-                if (gStartServer)
-                {
-                    Network &net = *Network::Instance();
-                    int port = atoi(cmd);
-
-                    net.setPort(port);
-                    print(true, "Starting network server on port %i...", port);
-                    net.spawnServerThread();
-                }
-            }
-            else
-            {
-                printf("Command> [Network.Server] '%s' not implemented\n", cmd);
-            }
-            break;
     }
 }
 

test/CMakeLists.txt

@@ -37,19 +37,6 @@ target_link_libraries (SoundTest ${SOUNDLIBS})
 
 #################################################################
 
-# Add Thread Library
-find_package (Threads REQUIRED)
-set (THREADLIBS ${THREADLIBS} ${CMAKE_THREAD_LIBS_INIT})
-
-# Network Test
-set (NETWORKSRCS "${PROJECT_SOURCE_DIR}/test/Network.cpp" "${PROJECT_SOURCE_DIR}/src/Network.cpp")
-set (NETWORKSRCS ${NETWORKSRCS} "${PROJECT_SOURCE_DIR}/src/utils/math.cpp" "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp")
-add_executable (NetworkTest EXCLUDE_FROM_ALL ${NETWORKSRCS})
-set_target_properties (NetworkTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
-target_link_libraries (NetworkTest m ${THREADLIBS})
-
-#################################################################
-
 # Math Test
 set (MATHSRCS "${PROJECT_SOURCE_DIR}/test/math.cpp" "${PROJECT_SOURCE_DIR}/src/utils/math.cpp" "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp")
 add_executable (MathTest EXCLUDE_FROM_ALL ${MATHSRCS})
@@ -108,7 +95,7 @@ target_link_libraries (TombRaiderTest ${ZLIBS})
 
 # Add test build target
 add_custom_target (tests)
-add_dependencies (tests GLStringTest MathTest MatrixTest NetworkTest SoundTest TGATest TombRaiderTest)
+add_dependencies (tests GLStringTest MathTest MatrixTest SoundTest TGATest TombRaiderTest)
 
 # Add test run target
 add_custom_target (testRun echo "Running Unit Tests..."

test/Network.cpp

@@ -1,96 +0,0 @@
-/*!
- * \file test/Network.cpp
- * \brief Networking Singleton Unit test
- *
- * \author Mongoose
- */
-
-#include <Network.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-
-extern network_frame_t gPiggyBack;
-
-void from_network_layer(network_packet_t *p, unsigned int *last_id)
-{
-    static unsigned int i = 0;
-
-
-    if (!p)
-    {
-        return;
-    }
-
-    *last_id = i++;
-
-    sleep(1);
-
-    p->send = 1;
-    p->pos[0] = i*3;
-    p->pos[1] = i*3+1;
-    p->pos[2] = i*3+2;
-
-    printf("<S>ending { %f %f %f }\n", p->pos[0], p->pos[1], p->pos[2]);
-}
-
-
-void to_network_layer(network_packet_t p)
-{
-    printf("<R>ecieved { %f %f %f }\n", p.pos[0], p.pos[1], p.pos[2]);
-
-    gPiggyBack.data.pos[0] = gPiggyBack.seq*4;
-    gPiggyBack.data.pos[1] = gPiggyBack.seq*4+1;
-    gPiggyBack.data.pos[2] = gPiggyBack.seq*4+2;
-    gPiggyBack.data.send = 1;
-    gPiggyBack.data.yaw = 90.0f;
-}
-
-
-int main(int argc, char *argv[])
-{
-    printf("\n\n[Network class test]\n");
-    Network &test = *Network::Instance();
-
-
-    if (argc > 3)
-    {
-        if (argv[1][1] == 'v')
-        {
-            test.setDebug(true);
-        }
-
-        switch (argv[1][0])
-        {
-            case 'c':
-                test.setRemoteHost(argv[2]);
-                test.setPort(atoi(argv[3]));
-                test.runClient();
-                break;
-            case 's':
-                test.setBindHost(argv[2]);
-                test.setPort(atoi(argv[3]));
-                test.runServer();
-                break;
-            default:
-                printf("Error in command line, run %s for help\n", argv[0]);
-        }
-    }
-    else if (argc > 2)
-    {
-        test.setPort(atoi(argv[2]));
-        test.runServer();
-    }
-    else
-    {
-        printf("Server: %s s [bind_host_name] port\n", argv[0]);
-        printf("Client: %s c remote_host_name remote_host_port\n", argv[0]);
-        printf("Append 'v' behind c/s option for verbose. eg cv\n");
-    }
-
-    killNetworkSingleton();
-
-    return 0;
-}
-