Changeset 8087 in orxonox.OLD for branches/bsp_model/src/world_entities

Timestamp:

Jun 1, 2006, 5:10:54 PM (19 years ago)

Author:

bensch

Message:

merges some merges

Location:

branches/bsp_model/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• bsp_entity.cc (copied) (copied from branches/bsp_model_old/src/world_entities/bsp_entity.cc) (4 diffs)
• bsp_entity.h (copied) (copied from branches/bsp_model_old/src/world_entities/bsp_entity.h)

branches/bsp_model/src/world_entities/WorldEntities.am

@@ -15 +15 @@
                 world_entities/test_entity.cc \
                 world_entities/planet.cc \
+                world_entities/bsp_entity.cc \
                 \
                 world_entities/weapons/test_gun.cc \
@@ -67 +68 @@
                 test_entity.h \
                 planet.h \
+                bsp_entity.h \
                 \
                 weapons/test_gun.h \

branches/bsp_model/src/world_entities/bsp_entity.cc

@@ -16 +16 @@
 #include "bsp_entity.h"
 #include "util/loading/resource_manager.h"
-using namespace std;
 
 CREATE_FACTORY(BSPEntity, CL_BSP_ENTITY);
+
+
 /**
  * constructs and loads a BSPEntity from a XML-element
@@ -42 +43 @@
 {
   printf("+++++++++++ LOADING NAME %s\n", name.c_str());
-  
+
   this->bspManager->load(name.c_str(), 0.1f);
 }
@@ -58 +59 @@
 
   this->toList(OM_ENVIRON);
-  
+
   /**
    * @todo: Write CL_BSP_ENTITY INTO THE src/defs/class_id.h (your own definition)
@@ -75 +76 @@
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
  // WorldEntity::loadParam(root);
-  
+
   LoadParam(root, "Name", this, BSPEntity, setName)
       .describe("Sets the of the BSP file.");