- Timestamp:
- Oct 25, 2005, 11:38:46 AM (19 years ago)
- Location:
- trunk/src
- Files:
-
- 5 edited
- 2 copied
-
Makefile.am (modified) (2 diffs)
-
Makefile.in (modified) (6 diffs)
-
defs/class_id.h (modified) (2 diffs)
-
world_entities/power_ups/power_up.cc (modified) (2 diffs)
-
world_entities/power_ups/power_up.h (modified) (1 diff)
-
world_entities/power_ups/turret_power_up.cc (copied) (copied from trunk/src/world_entities/power_ups/power_up.cc) (2 diffs)
-
world_entities/power_ups/turret_power_up.h (copied) (copied from trunk/src/world_entities/power_ups/power_up.h) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/Makefile.am
r5433 r5434 65 65 world_entities/weapons/crosshair.cc \ 66 66 world_entities/power_ups/power_up.cc \ 67 world_entities/power_ups/turret_power_up.cc \ 67 68 subprojects/benchmark.cc 68 69 … … 93 94 world_entities/weapons/test_bullet.h \ 94 95 world_entities/weapons/crosshair.h \ 95 world_entities/power_ups/power_up.h \ 96 world_entities/power_ups/power_up.h \ 97 world_entities/power_ups/turret_power_up.h \ 96 98 defs/stdincl.h \ 97 99 defs/stdlibincl.h \ -
trunk/src/Makefile.in
r5433 r5434 66 66 orxonox-test_gun.$(OBJEXT) orxonox-turret.$(OBJEXT) \ 67 67 orxonox-test_bullet.$(OBJEXT) orxonox-crosshair.$(OBJEXT) \ 68 orxonox-power_up.$(OBJEXT) orxonox-benchmark.$(OBJEXT) 68 orxonox-power_up.$(OBJEXT) orxonox-turret_power_up.$(OBJEXT) \ 69 orxonox-benchmark.$(OBJEXT) 69 70 orxonox_OBJECTS = $(am_orxonox_OBJECTS) 70 71 am__DEPENDENCIES_1 = … … 93 94 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-test_gun.Po \ 94 95 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-turret.Po \ 96 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-turret_power_up.Po \ 95 97 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-weapon.Po \ 96 98 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-weapon_manager.Po \ … … 280 282 world_entities/weapons/crosshair.cc \ 281 283 world_entities/power_ups/power_up.cc \ 284 world_entities/power_ups/turret_power_up.cc \ 282 285 subprojects/benchmark.cc 283 286 … … 308 311 world_entities/weapons/test_bullet.h \ 309 312 world_entities/weapons/crosshair.h \ 310 world_entities/power_ups/power_up.h \ 313 world_entities/power_ups/power_up.h \ 314 world_entities/power_ups/turret_power_up.h \ 311 315 defs/stdincl.h \ 312 316 defs/stdlibincl.h \ … … 426 430 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-test_gun.Po@am__quote@ 427 431 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-turret.Po@am__quote@ 432 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-turret_power_up.Po@am__quote@ 428 433 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-weapon.Po@am__quote@ 429 434 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-weapon_manager.Po@am__quote@ … … 830 835 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 831 836 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-power_up.obj `if test -f 'world_entities/power_ups/power_up.cc'; then $(CYGPATH_W) 'world_entities/power_ups/power_up.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/power_ups/power_up.cc'; fi` 837 838 orxonox-turret_power_up.o: world_entities/power_ups/turret_power_up.cc 839 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-turret_power_up.o -MD -MP -MF "$(DEPDIR)/orxonox-turret_power_up.Tpo" -c -o orxonox-turret_power_up.o `test -f 'world_entities/power_ups/turret_power_up.cc' || echo '$(srcdir)/'`world_entities/power_ups/turret_power_up.cc; \ 840 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-turret_power_up.Tpo" "$(DEPDIR)/orxonox-turret_power_up.Po"; else rm -f "$(DEPDIR)/orxonox-turret_power_up.Tpo"; exit 1; fi 841 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/power_ups/turret_power_up.cc' object='orxonox-turret_power_up.o' libtool=no @AMDEPBACKSLASH@ 842 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/orxonox-turret_power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-turret_power_up.TPo' @AMDEPBACKSLASH@ 843 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 844 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-turret_power_up.o `test -f 'world_entities/power_ups/turret_power_up.cc' || echo '$(srcdir)/'`world_entities/power_ups/turret_power_up.cc 845 846 orxonox-turret_power_up.obj: world_entities/power_ups/turret_power_up.cc 847 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-turret_power_up.obj -MD -MP -MF "$(DEPDIR)/orxonox-turret_power_up.Tpo" -c -o orxonox-turret_power_up.obj `if test -f 'world_entities/power_ups/turret_power_up.cc'; then $(CYGPATH_W) 'world_entities/power_ups/turret_power_up.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/power_ups/turret_power_up.cc'; fi`; \ 848 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-turret_power_up.Tpo" "$(DEPDIR)/orxonox-turret_power_up.Po"; else rm -f "$(DEPDIR)/orxonox-turret_power_up.Tpo"; exit 1; fi 849 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/power_ups/turret_power_up.cc' object='orxonox-turret_power_up.obj' libtool=no @AMDEPBACKSLASH@ 850 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/orxonox-turret_power_up.Po' tmpdepfile='$(DEPDIR)/orxonox-turret_power_up.TPo' @AMDEPBACKSLASH@ 851 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 852 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-turret_power_up.obj `if test -f 'world_entities/power_ups/turret_power_up.cc'; then $(CYGPATH_W) 'world_entities/power_ups/turret_power_up.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/power_ups/turret_power_up.cc'; fi` 832 853 833 854 orxonox-benchmark.o: subprojects/benchmark.cc -
trunk/src/defs/class_id.h
r5384 r5434 18 18 /*! 19 19 * @file class_id.h 20 *list of orxonox classID's21 22 23 24 25 26 27 28 29 30 31 */20 * @brief list of orxonox classID's 21 * 22 * this File is used to identify an Object with its class and also with its sub/super-classes. 23 * this is also used by the ObjectManager to identify and load important classes 24 * 25 * !! important !! 26 * When adding a new CLASS be sure about the following: 27 * 1. if it is a (SUB)SUPERCLASS make sure there is still space left (if not think of a new approach) 28 * 2. if it is a (SUB)SUPERCLASS also add the CLASS to BaseObject::whatIs() so we have nice output :) 29 * 3. check if the Number you add is not refered to twice, and that with (SUB)SUPERCLASSES there are no intersections 30 * 4. be sure to add you stuff in the right section, and don't interest yourself for the order of things. :) 31 */ 32 32 33 33 #ifndef _CLASS_ID_H … … 133 133 CL_TURRET = 0x0000020b, 134 134 135 CL_TURRET_POWER_UP = 0x0000020b, 136 135 137 136 138 // gamePlay (range from 0x00000500 0x000005ff) -
trunk/src/world_entities/power_ups/power_up.cc
r5433 r5434 27 27 { 28 28 this->setClassID(CL_POWER_UP, "PowerUp"); 29 29 30 } 30 31 … … 34 35 35 36 37 void PowerUp::loadParam(const TiXmlElement* root) 38 { 39 static_cast<WorldEntity*>(this)->loadParams(root); 40 41 } 42 -
trunk/src/world_entities/power_ups/power_up.h
r5433 r5434 9 9 #include "world_entity.h" 10 10 11 class PowerUp : WorldEntity {11 class PowerUp : public WorldEntity { 12 12 13 13 public: 14 14 PowerUp (); 15 15 virtual ~PowerUp (); 16 16 void loadParam(const TiXmlElement* root); 17 17 }; 18 18 -
trunk/src/world_entities/power_ups/turret_power_up.cc
r5433 r5434 1 2 3 1 /* 4 2 orxonox - the future of 3D-vertical-scrollers … … 12 10 13 11 ### File Specific: 14 main-programmer: ...12 main-programmer: Benjamin Grauer 15 13 co-programmer: ... 16 14 */ 17 15 18 16 19 #include " power_up.h"20 17 #include "turret_power_up.h" 18 #include "factory.h" 21 19 22 20 using namespace std; 23 21 22 CREATE_FACTORY(TurretPowerUp); 24 23 25 24 26 PowerUp::PowerUp ()25 TurretPowerUp::TurretPowerUp () 27 26 { 28 this->setClassID(CL_POWER_UP, "PowerUp"); 27 this->init(); 28 } 29 30 TurretPowerUp::TurretPowerUp(const TiXmlElement* root) 31 { 32 this->init(); 33 34 this->loadParams(root); 29 35 } 30 36 31 37 32 33 PowerUp::~PowerUp () {} 38 TurretPowerUp::~TurretPowerUp () {} 34 39 35 40 41 void TurretPowerUp::init() 42 { 43 this->setClassID(CL_TURRET_POWER_UP, "TurretPowerUp"); 44 this->loadModel("models/guns/turret1.obj"); 45 } 46 47 48 void TurretPowerUp::loadParams(const TiXmlElement* root) 49 { 50 static_cast<PowerUp*>(this)->loadParams(root); 51 52 } -
trunk/src/world_entities/power_ups/turret_power_up.h
r5433 r5434 1 1 /*! 2 * @file power_up.h2 * @file turret_power_up.h 3 3 * @brief A class representing a PowerUp in the world. 4 4 */ 5 5 6 #ifndef _ POWER_UP_H7 #define _ POWER_UP_H6 #ifndef _TURRET_POWER_UP_H 7 #define _TURRET_POWER_UP_H 8 8 9 #include " world_entity.h"9 #include "power_up.h" 10 10 11 class PowerUp : WorldEntity{11 class TurretPowerUp : public PowerUp { 12 12 13 13 public: 14 PowerUp (); 15 virtual ~PowerUp (); 14 TurretPowerUp(); 15 TurretPowerUp(const TiXmlElement* root); 16 virtual ~TurretPowerUp (); 16 17 18 private: 19 void init(); 20 void loadParams(const TiXmlElement* root); 17 21 }; 18 22 19 #endif /* _ POWER_UP_H */23 #endif /* _TURRET_POWER_UP_H */
Note: See TracChangeset
for help on using the changeset viewer.
