[Orxonox-commit 5750] r10410 - code/branches/core7/src/libraries/network/synchronisable

[landauf at orxonox.net]

Author: landauf
Date: 2015-05-02 16:47:21 +0200 (Sat, 02 May 2015)
New Revision: 10410

Removed:
   code/branches/core7/src/libraries/network/synchronisable/SynchronisableVariable.cc
Modified:
   code/branches/core7/src/libraries/network/synchronisable/CMakeLists.txt
   code/branches/core7/src/libraries/network/synchronisable/SynchronisableVariable.h
Log:
SynchronisableVariableBase::state_ is not used anymore

Modified: code/branches/core7/src/libraries/network/synchronisable/CMakeLists.txt
===================================================================
--- code/branches/core7/src/libraries/network/synchronisable/CMakeLists.txt	2015-04-30 14:47:36 UTC (rev 10409)
+++ code/branches/core7/src/libraries/network/synchronisable/CMakeLists.txt	2015-05-02 14:47:21 UTC (rev 10410)
@@ -1,7 +1,6 @@
 ADD_SOURCE_FILES(NETWORK_SRC_FILES
   NetworkCallbackManager.cc
   Synchronisable.cc
-  SynchronisableVariable.cc
 )
 
 ADD_SOURCE_FILES(NETWORK_HDR_FILES

Deleted: code/branches/core7/src/libraries/network/synchronisable/SynchronisableVariable.cc
===================================================================
--- code/branches/core7/src/libraries/network/synchronisable/SynchronisableVariable.cc	2015-04-30 14:47:36 UTC (rev 10409)
+++ code/branches/core7/src/libraries/network/synchronisable/SynchronisableVariable.cc	2015-05-02 14:47:21 UTC (rev 10410)
@@ -1,36 +0,0 @@
-/*
- *   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 "SynchronisableVariable.h"
-
-namespace orxonox{
-
-uint8_t SynchronisableVariableBase::state_ = 0;
-
-
-} //namespace

Modified: code/branches/core7/src/libraries/network/synchronisable/SynchronisableVariable.h
===================================================================
--- code/branches/core7/src/libraries/network/synchronisable/SynchronisableVariable.h	2015-04-30 14:47:36 UTC (rev 10409)
+++ code/branches/core7/src/libraries/network/synchronisable/SynchronisableVariable.h	2015-05-02 14:47:21 UTC (rev 10410)
@@ -64,8 +64,6 @@
       virtual void* getReference()=0;
       virtual uint8_t getMode()=0;
       virtual ~SynchronisableVariableBase() {}
-    protected:
-      static uint8_t state_;
   };
 
   template <class T>
@@ -107,10 +105,6 @@
   template <class T> SynchronisableVariable<T>::SynchronisableVariable(T& variable, uint8_t syncDirection, NetworkCallbackBase *cb):
       variable_( variable ), mode_( syncDirection ), callback_( cb )
   {
-    if ( state_ == 0x0 )
-    {
-      state_ = GameMode::isMaster() ? 0x1 : 0x2;  // set the appropriate mode here
-    }
   }
 
   template <class T> SynchronisableVariable<T>::~SynchronisableVariable()