Changeset 2908 for code/branches/questsystem5/src/network

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/network/ChatListener.cc (modified) (1 diff)
• src/network/Client.cc (modified) (2 diffs)
• src/network/Client.h (modified) (1 diff)
• src/network/ClientConnectionListener.cc (modified) (2 diffs)
• src/network/ConnectionManager.cc (modified) (1 diff)
• src/network/Server.cc (modified) (2 diffs)
• src/network/Server.h (modified) (2 diffs)
• src/network/TrafficControl.cc (modified) (1 diff)
• src/network/packet/Gamestate.cc (modified) (2 diffs)
• src/network/packet/Gamestate.h (modified) (1 diff)
• src/network/synchronisable/NetworkCallback.h (modified) (1 prop)
• src/network/synchronisable/Synchronisable.cc (modified) (1 prop)
• src/network/synchronisable/Synchronisable.h (modified) (1 prop)
• src/network/synchronisable/SynchronisableVariable.cc (modified) (2 diffs)
• src/network/synchronisable/SynchronisableVariable.h (modified) (3 diffs)

code/branches/questsystem5/src/network/ChatListener.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
+#include "core/Core.h"
 
 namespace orxonox

code/branches/questsystem5/src/network/Client.cc

@@ -45 +45 @@
 #include "Host.h"
 #include "synchronisable/Synchronisable.h"
-#include "core/Clock.h"
 #include "core/CoreIncludes.h"
 #include "packet/Packet.h"
@@ -139 +138 @@
    * @param time
    */
-  void Client::update(const Clock& time){
+  void Client::tick(float time){
 //     COUT(3) << ".";
     if(client_connection.isConnected() && isSynched_){

code/branches/questsystem5/src/network/Client.h

@@ -76 +76 @@
     //bool sendChat(packet::Chat *chat);
 
-    void update(const Clock& time);
+    void tick(float time);
 
   private:

code/branches/questsystem5/src/network/ClientConnectionListener.cc

@@ -1 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Oliver Scheuss
- *   Co-authors:
- *      ...
- *
- */
-
 #include "ClientConnectionListener.h"
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 
 namespace orxonox{
@@ -39 +11 @@
 
   void ClientConnectionListener::getConnectedClients(){
-    if(GameMode::showsGraphics())
+    if(Core::showsGraphics())
       this->clientConnected(0); //server client id
     ClientInformation *client = ClientInformation::getBegin();

code/branches/questsystem5/src/network/ConnectionManager.cc

@@ -48 +48 @@
 #include <boost/thread/recursive_mutex.hpp>
 
-#include "util/Debug.h"
 #include "util/Math.h"
 #include "util/Sleep.h"

code/branches/questsystem5/src/network/Server.cc

@@ -51 +51 @@
 #include "ClientInformation.h"
 #include "util/Sleep.h"
-#include "core/Clock.h"
 #include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
@@ -150 +149 @@
   * @param time time since last tick
   */
-  void Server::update(const Clock& time) {
+  void Server::tick(float time) {
     processQueue();
     //this steers our network frequency
-    timeSinceLastUpdate_+=time.getDeltaTime();
+    timeSinceLastUpdate_+=time;
     if(timeSinceLastUpdate_>=NETWORK_PERIOD){
       timeSinceLastUpdate_ -= static_cast<unsigned int>( timeSinceLastUpdate_ / NETWORK_PERIOD ) * NETWORK_PERIOD;

code/branches/questsystem5/src/network/Server.h

@@ -53 +53 @@
   const int CLIENTID_SERVER = 0;
   const unsigned int NETWORK_FREQUENCY = 25;
-  const float NETWORK_PERIOD = 1.f/NETWORK_FREQUENCY;
+  const float NETWORK_PERIOD = 1./NETWORK_FREQUENCY;
 
   /**
@@ -71 +71 @@
     bool processChat(const std::string& message, unsigned int playerID);
     bool queuePacket(ENetPacket *packet, int clientID);
-    void update(const Clock& time);
+    void tick(float time);
     unsigned int getPing(unsigned int clientID);
     double getPacketLoss(unsigned int clientID);

code/branches/questsystem5/src/network/TrafficControl.cc

@@ -30 +30 @@
 
 #include "synchronisable/Synchronisable.h"
-#include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
 

code/branches/questsystem5/src/network/packet/Gamestate.cc

@@ -34 +34 @@
 #include "../synchronisable/Synchronisable.h"
 #include "../TrafficControl.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/Iterator.h"
@@ -162 +162 @@
     if(!s)
     {
-      if (!GameMode::isMaster())
+      if (!Core::isMaster())
       {
         Synchronisable::fabricate(mem, mode);

code/branches/questsystem5/src/network/packet/Gamestate.h

@@ -35 +35 @@
 #include "Packet.h"
 #include "network/TrafficControl.h"
-#include <string.h>
+#include "core/CoreIncludes.h"
 #include <map>
 #include <list>
-#include <cassert>
 #ifndef NDEBUG
 #include "util/CRC32.h"

code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.cc

@@ -30 +30 @@
 #include <cstring>
 #include "util/Math.h"
-#include "core/GameMode.h"
 
 
@@ -37 +36 @@
 uint8_t SynchronisableVariableBase::state_ = 0;
 
-/*static*/ void SynchronisableVariableBase::setState()
-{
-  if ( state_ == 0x0 )
-  {
-    state_ = GameMode::isMaster() ? 0x1 : 0x2;  // set the appropriate mode here
-  }
-}
 
 

code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.h

@@ -35 +35 @@
 #include <string>
 #include <cassert>
-#include "util/Math.h"
+#include "core/Core.h"
+#include "core/CoreIncludes.h"
 #include "network/synchronisable/NetworkCallback.h"
 #include "network/synchronisable/NetworkCallbackManager.h"
@@ -62 +63 @@
       virtual ~SynchronisableVariableBase() {}
     protected:
-      static void setState();
       static uint8_t state_;
   };
@@ -110 +110 @@
       variable_( variable ), mode_( syncDirection ), callback_( cb )
   {
-      setState();
+    if ( state_ == 0x0 )
+    {
+      state_ = Core::isMaster() ? 0x1 : 0x2;  // set the appropriate mode here
+    }
   }