[Orxonox-commit 407] r2991 - in branches/netp3/src: network/synchronisable orxonox/objects orxonox/objects/controllers orxonox/objects/worldentities/pawns
scheusso at orxonox.net
scheusso at orxonox.net
Tue May 19 22:04:40 CEST 2009
Author: scheusso
Date: 2009-05-19 22:04:39 +0200 (Tue, 19 May 2009)
New Revision: 2991
Modified:
branches/netp3/src/network/synchronisable/SynchronisableVariable.cc
branches/netp3/src/network/synchronisable/SynchronisableVariable.h
branches/netp3/src/orxonox/objects/CMakeLists.txt
branches/netp3/src/orxonox/objects/controllers/AIController.cc
branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc
Log:
forgot some things
Modified: branches/netp3/src/network/synchronisable/SynchronisableVariable.cc
===================================================================
--- branches/netp3/src/network/synchronisable/SynchronisableVariable.cc 2009-05-19 19:35:10 UTC (rev 2990)
+++ branches/netp3/src/network/synchronisable/SynchronisableVariable.cc 2009-05-19 20:04:39 UTC (rev 2991)
@@ -33,4 +33,5 @@
uint8_t SynchronisableVariableBase::state_ = 0;
+
} //namespace
Modified: branches/netp3/src/network/synchronisable/SynchronisableVariable.h
===================================================================
--- branches/netp3/src/network/synchronisable/SynchronisableVariable.h 2009-05-19 19:35:10 UTC (rev 2990)
+++ branches/netp3/src/network/synchronisable/SynchronisableVariable.h 2009-05-19 20:04:39 UTC (rev 2991)
@@ -37,6 +37,7 @@
#include "util/Serialise.h"
#include "core/Core.h"
#include "core/CoreIncludes.h"
+#include "core/GameMode.h"
#include "network/synchronisable/NetworkCallback.h"
#include "network/synchronisable/NetworkCallbackManager.h"
@@ -63,7 +64,6 @@
virtual uint8_t getMode()=0;
virtual ~SynchronisableVariableBase() {}
protected:
- static void setState();
static uint8_t state_;
};
@@ -111,7 +111,10 @@
template <class T> SynchronisableVariable<T>::SynchronisableVariable(T& variable, uint8_t syncDirection, NetworkCallbackBase *cb):
variable_( variable ), mode_( syncDirection ), callback_( cb )
{
- setState();
+ if ( state_ == 0x0 )
+ {
+ state_ = GameMode::isMaster() ? 0x1 : 0x2; // set the appropriate mode here
+ }
}
template <class T> SynchronisableVariable<T>::~SynchronisableVariable()
@@ -159,66 +162,6 @@
return 0;
}
- /*template <> _NetworkExport uint32_t SynchronisableVariable<const bool>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const bool>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const bool>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const bool>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const unsigned char>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const unsigned char>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const unsigned char>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const unsigned char>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const short>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const short>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const short>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const short>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const unsigned short>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const unsigned short>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const unsigned short>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const unsigned short>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const int>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const int>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const int>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const int>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const unsigned int>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const unsigned int>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const unsigned int>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const unsigned int>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const long>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const long>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const long>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const long>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const unsigned long>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const unsigned long>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const unsigned long>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const unsigned long>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const long long>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const long long>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const long long>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const long long>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const unsigned long long>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const unsigned long long>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const unsigned long long>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const unsigned long long>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const float>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const float>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const float>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const float>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const double>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const double>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const double>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const double>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const long double>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const long double>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const long double>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const long double>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const std::string>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const std::string>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const std::string>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const std::string>::checkEquality(uint8_t* mem);
- template <> _NetworkExport uint32_t SynchronisableVariable<const Degree>::returnSize();
- template <> _NetworkExport void SynchronisableVariable<const Degree>::loadAndIncrease(uint8_t*& mem);
- template <> _NetworkExport void SynchronisableVariable<const Degree>::saveAndIncrease(uint8_t*& mem);
- template <> _NetworkExport bool SynchronisableVariable<const Degree>::checkEquality(uint8_t* mem);*/
Modified: branches/netp3/src/orxonox/objects/CMakeLists.txt
===================================================================
--- branches/netp3/src/orxonox/objects/CMakeLists.txt 2009-05-19 19:35:10 UTC (rev 2990)
+++ branches/netp3/src/orxonox/objects/CMakeLists.txt 2009-05-19 20:04:39 UTC (rev 2991)
@@ -9,7 +9,6 @@
RadarViewable.cc
Teamcolourable.cc
Tickable.cc
- Test.cc
Scene.cc
Script.cc
)
Modified: branches/netp3/src/orxonox/objects/controllers/AIController.cc
===================================================================
--- branches/netp3/src/orxonox/objects/controllers/AIController.cc 2009-05-19 19:35:10 UTC (rev 2990)
+++ branches/netp3/src/orxonox/objects/controllers/AIController.cc 2009-05-19 20:04:39 UTC (rev 2991)
@@ -100,7 +100,7 @@
void AIController::tick(float dt)
{
- if(Core::isMaster())
+ if(GameMode::isMaster())
{
if (!this->isActive())
return;
Modified: branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc
===================================================================
--- branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-05-19 19:35:10 UTC (rev 2990)
+++ branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-05-19 20:04:39 UTC (rev 2991)
@@ -131,7 +131,7 @@
// this->fire_ = this->firehack_;
// this->firehack_ = 0x0;
- if (Core::isMaster())
+ if (GameMode::isMaster())
if (this->health_ <= 0)
this->death();
}
@@ -262,7 +262,7 @@
void Pawn::doFire(uint8_t fireMode)
{
- if(Core::isMaster())
+ if(GameMode::isMaster())
{
if (this->weaponSystem_)
this->weaponSystem_->fire((WeaponMode::Enum)fireMode);
More information about the Orxonox-commit
mailing list