[Orxonox-commit 4986] r9655 - in code/branches/core6/src: modules/docking modules/questsystem modules/questsystem/effects orxonox/collisionshapes orxonox/infos orxonox/weaponsystem orxonox/worldentities
landauf at orxonox.net
landauf at orxonox.net
Fri Aug 16 23:08:58 CEST 2013
Author: landauf
Date: 2013-08-16 23:08:58 +0200 (Fri, 16 Aug 2013)
New Revision: 9655
Modified:
code/branches/core6/src/modules/docking/DockingEffect.cc
code/branches/core6/src/modules/questsystem/Quest.cc
code/branches/core6/src/modules/questsystem/QuestEffect.cc
code/branches/core6/src/modules/questsystem/effects/ChangeQuestStatus.cc
code/branches/core6/src/orxonox/collisionshapes/CollisionShape.cc
code/branches/core6/src/orxonox/infos/PlayerInfo.cc
code/branches/core6/src/orxonox/weaponsystem/WeaponMode.cc
code/branches/core6/src/orxonox/worldentities/WorldEntity.cc
Log:
register abstract classes
Modified: code/branches/core6/src/modules/docking/DockingEffect.cc
===================================================================
--- code/branches/core6/src/modules/docking/DockingEffect.cc 2013-08-16 21:08:30 UTC (rev 9654)
+++ code/branches/core6/src/modules/docking/DockingEffect.cc 2013-08-16 21:08:58 UTC (rev 9655)
@@ -36,6 +36,8 @@
namespace orxonox
{
+ RegisterAbstractClass(DockingEffect).inheritsFrom(Class(BaseObject));
+
DockingEffect::DockingEffect(Context* context) : BaseObject(context)
{
RegisterObject(DockingEffect);
Modified: code/branches/core6/src/modules/questsystem/Quest.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/Quest.cc 2013-08-16 21:08:30 UTC (rev 9654)
+++ code/branches/core6/src/modules/questsystem/Quest.cc 2013-08-16 21:08:58 UTC (rev 9655)
@@ -44,6 +44,8 @@
namespace orxonox
{
+ RegisterAbstractClass(Quest).inheritsFrom(Class(QuestItem));
+
/**
@brief
Constructor. Registers and initializes object.
Modified: code/branches/core6/src/modules/questsystem/QuestEffect.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/QuestEffect.cc 2013-08-16 21:08:30 UTC (rev 9654)
+++ code/branches/core6/src/modules/questsystem/QuestEffect.cc 2013-08-16 21:08:58 UTC (rev 9655)
@@ -36,6 +36,8 @@
namespace orxonox
{
+ RegisterAbstractClass(QuestEffect).inheritsFrom(Class(BaseObject));
+
/**
@brief
Constructor. Creates a new QuestEffect.
Modified: code/branches/core6/src/modules/questsystem/effects/ChangeQuestStatus.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/effects/ChangeQuestStatus.cc 2013-08-16 21:08:30 UTC (rev 9654)
+++ code/branches/core6/src/modules/questsystem/effects/ChangeQuestStatus.cc 2013-08-16 21:08:58 UTC (rev 9655)
@@ -41,6 +41,8 @@
namespace orxonox
{
+ RegisterAbstractClass(ChangeQuestStatus).inheritsFrom(Class(QuestEffect));
+
/**
@brief
Constructor. Registers the object.
Modified: code/branches/core6/src/orxonox/collisionshapes/CollisionShape.cc
===================================================================
--- code/branches/core6/src/orxonox/collisionshapes/CollisionShape.cc 2013-08-16 21:08:30 UTC (rev 9654)
+++ code/branches/core6/src/orxonox/collisionshapes/CollisionShape.cc 2013-08-16 21:08:58 UTC (rev 9655)
@@ -43,6 +43,7 @@
namespace orxonox
{
+ RegisterAbstractClass(CollisionShape).inheritsFrom(Class(BaseObject)).inheritsFrom(Class(Synchronisable));
/**
@brief
Modified: code/branches/core6/src/orxonox/infos/PlayerInfo.cc
===================================================================
--- code/branches/core6/src/orxonox/infos/PlayerInfo.cc 2013-08-16 21:08:30 UTC (rev 9654)
+++ code/branches/core6/src/orxonox/infos/PlayerInfo.cc 2013-08-16 21:08:58 UTC (rev 9655)
@@ -39,6 +39,8 @@
namespace orxonox
{
+ RegisterAbstractClass(PlayerInfo).inheritsFrom(Class(Info));
+
PlayerInfo::PlayerInfo(Context* context) : Info(context)
{
RegisterObject(PlayerInfo);
Modified: code/branches/core6/src/orxonox/weaponsystem/WeaponMode.cc
===================================================================
--- code/branches/core6/src/orxonox/weaponsystem/WeaponMode.cc 2013-08-16 21:08:30 UTC (rev 9654)
+++ code/branches/core6/src/orxonox/weaponsystem/WeaponMode.cc 2013-08-16 21:08:58 UTC (rev 9655)
@@ -44,6 +44,8 @@
namespace orxonox
{
+ RegisterAbstractClass(WeaponMode).inheritsFrom(Class(BaseObject));
+
WeaponMode::WeaponMode(Context* context) : BaseObject(context)
{
RegisterObject(WeaponMode);
Modified: code/branches/core6/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/WorldEntity.cc 2013-08-16 21:08:30 UTC (rev 9654)
+++ code/branches/core6/src/orxonox/worldentities/WorldEntity.cc 2013-08-16 21:08:58 UTC (rev 9655)
@@ -60,6 +60,8 @@
BOOST_STATIC_ASSERT((int)Ogre::Node::TS_PARENT == (int)WorldEntity::Parent);
BOOST_STATIC_ASSERT((int)Ogre::Node::TS_WORLD == (int)WorldEntity::World);
+ RegisterAbstractClass(WorldEntity).inheritsFrom(Class(BaseObject)).inheritsFrom(Class(Synchronisable));
+
/**
@brief
Creates a new WorldEntity that may immediately be used.
More information about the Orxonox-commit
mailing list