Context Navigation

munitions

Timestamp:

Aug 29, 2009, 10:19:38 PM (16 years ago)

Author:

landauf

Message:

merged libraries branch back to trunk

Location:

code/trunk

Files:

code/trunk
- Property svn:mergeinfo changed
  /code/branches/libraries (added) merged: 5612-5613,5615-5619,5621-5623,5625-5640,5642-5643,5647-5649,5665-5666,5685-5687,5692

r3053	r5693
1		ADD_SOURCE_FILES(~~ORXONOX~~_SRC_FILES
	1	ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
2	2	ReplenishingMunition.cc
3	3	LaserMunition.cc

-                      r3053
+                      r5693
 #define _FusionMunition_H__
 #include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "objects/weaponsystem/Munition.h"
 namespace orxonox
+{
     class _OrxonoxExport FusionMunition : public Munition
+    class _WeaponsystemExport FusionMunition : public Munition
+    {
         public:

-                      r3053
+                      r5693
 #define _LaserMunition_H__
 #include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "ReplenishingMunition.h"
 namespace orxonox
+{
     class _OrxonoxExport LaserMunition : public ReplenishingMunition
+    class _WeaponsystemExport LaserMunition : public ReplenishingMunition
+    {
         public:

-                      r3196
+                      r5693
 #define _ReplenishingMunition_H__
 #include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "tools/Timer.h"
 …
 namespace orxonox
+{
     class _OrxonoxExport ReplenishingMunition : public Munition
+    class _WeaponsystemExport ReplenishingMunition : public Munition
+    {
         public:

Note: See TracChangeset for help on using the changeset viewer.