Changeset 871 for code/trunk/src/orxonox/objects/weapon

Timestamp:

Mar 9, 2008, 4:44:36 PM (17 years ago)

Author:

landauf

Message:

merged core branch to trunk

Location:

code/trunk/src/orxonox/objects/weapon

Files:

• AmmunitionDump.cc (modified) (1 diff)
• AmmunitionDump.h (modified) (2 diffs)
• BarrelGun.cc (modified) (1 diff)
• BarrelGun.h (modified) (1 diff)
• BaseWeapon.cc (modified) (1 diff)
• BaseWeapon.h (modified) (1 diff)
• Bullet.cc (modified) (1 diff)
• Bullet.h (modified) (1 diff)
• BulletManager.cc (modified) (1 diff)
• BulletManager.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc

@@ -31 +31 @@
 #include "BulletManager.h"
 #include "util/tinyxml/tinyxml.h"
+#include "core/CoreIncludes.h"
 
 #include "AmmunitionDump.h"

code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h

@@ -37 +37 @@
 
 #include "network/Synchronisable.h"
-//#include "../core/CoreIncludes.h"
 #include "core/BaseObject.h"
 
@@ -66 +65 @@
     int *capacity_;
   };
-  ExportClass(AmmunitionDump, Orxonox);
 }
 

code/trunk/src/orxonox/objects/weapon/BarrelGun.cc

@@ -38 +38 @@
 #include "AmmunitionDump.h"
 #include "BaseWeapon.h"
+#include "core/CoreIncludes.h"
 
 #include "BarrelGun.h"

code/trunk/src/orxonox/objects/weapon/BarrelGun.h

@@ -60 +60 @@
 
   };
-  ExportClass(BarrelGun, Orxonox);
 }
 

code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc

@@ -38 +38 @@
 #include "BulletManager.h"
 #include "AmmunitionDump.h"
+#include "core/CoreIncludes.h"
 
 #include "BaseWeapon.h"

code/trunk/src/orxonox/objects/weapon/BaseWeapon.h

@@ -122 +122 @@
 
   };
-  ExportAbstractClass(BaseWeapon, Orxonox);
 }
 

code/trunk/src/orxonox/objects/weapon/Bullet.cc

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "core/CoreIncludes.h"
 
 #include "Bullet.h"

code/trunk/src/orxonox/objects/weapon/Bullet.h

@@ -47 +47 @@
     inline virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
  };
-  ExportClass(Bullet, Orxonox);
 }
 

code/trunk/src/orxonox/objects/weapon/BulletManager.cc

@@ -30 +30 @@
 #include "BulletManager.h"
 #include "Bullet.h"
+#include "core/CoreIncludes.h"
 
 

code/trunk/src/orxonox/objects/weapon/BulletManager.h

@@ -38 +38 @@
 #include "network/Synchronisable.h"
 #include "util/tinyxml/tinyxml.h"
-#include "../../core/CoreIncludes.h"
 #include "core/BaseObject.h"
 #include "../Tickable.h"
@@ -67 +66 @@
           int bulletsIndex_;
   };
-  ExportClass(BulletManager, Orxonox);
 }