Changeset 5795 in orxonox.OLD for trunk/src/world_entities/weapons/ground_turret.h

Timestamp:

Nov 27, 2005, 4:04:52 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/worldEntities back to the trunk svn merge -r5750:HEAD branches/world_entities/ trunk/

File:

• trunk/src/world_entities/weapons/ground_turret.h (modified) (1 diff)

trunk/src/world_entities/weapons/ground_turret.h

@@ -19 +19 @@
   virtual ~GroundTurret();
 
+  void init();
   void loadParams(const TiXmlElement* root);
-  void init();
+
+  void loadWeapons(const TiXmlElement* root);
 
   virtual void postSpawn ();