Changeset 3580 in orxonox.OLD

Timestamp:

Mar 16, 2005, 6:09:32 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: added character_attributes to orxonox, it will contain, what it is named after. some other changes in projectile.cc

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• world_entities/character_attributes.cc (added)
• world_entities/character_attributes.h (added)
• world_entities/weapon.h (modified) (2 diffs)

orxonox/trunk/src/Makefile.am

@@ -47 +47 @@
                  world_entities/weapon.cc \
                  world_entities/projectile.cc \
+                 world_entities/character_attributes.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -94 +95 @@
                  world_entities/weapon.h \
                  world_entities/projectile.h \
+                 world_entities/character_attributes.h \
                  ai/ai.h \
                  network/synchronisable.h \

orxonox/trunk/src/Makefile.in

@@ -60 +60 @@
         player.$(OBJEXT) environment.$(OBJEXT) skysphere.$(OBJEXT) \
         terrain.$(OBJEXT) primitive.$(OBJEXT) weapon.$(OBJEXT) \
-        projectile.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
-        null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
-        data_tank.$(OBJEXT) fontset.$(OBJEXT) array.$(OBJEXT) \
-        objModel.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
-        texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \
-        ini_parser.$(OBJEXT) list.$(OBJEXT) vector.$(OBJEXT) \
-        matrix.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
+        projectile.$(OBJEXT) character_attributes.$(OBJEXT) \
+        ai.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT) \
+        helper_parent.$(OBJEXT) data_tank.$(OBJEXT) fontset.$(OBJEXT) \
+        array.$(OBJEXT) objModel.$(OBJEXT) model.$(OBJEXT) \
+        material.$(OBJEXT) texture.$(OBJEXT) base_entity.$(OBJEXT) \
+        base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \
+        vector.$(OBJEXT) matrix.$(OBJEXT) curve.$(OBJEXT) \
+        glmenu_imagescreen.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -76 +77 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po ./$(DEPDIR)/camera.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
@@ -246 +248 @@
                  world_entities/weapon.cc \
                  world_entities/projectile.cc \
+                 world_entities/character_attributes.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -293 +296 @@
                  world_entities/weapon.h \
                  world_entities/projectile.h \
+                 world_entities/character_attributes.h \
                  ai/ai.h \
                  network/synchronisable.h \
@@ -392 +396 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/campaign.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/character_attributes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command_node.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Po@am__quote@
@@ -617 +622 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o projectile.obj `if test -f 'world_entities/projectile.cc'; then $(CYGPATH_W) 'world_entities/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/projectile.cc'; fi`
+
+character_attributes.o: world_entities/character_attributes.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT character_attributes.o -MD -MP -MF "$(DEPDIR)/character_attributes.Tpo" -c -o character_attributes.o `test -f 'world_entities/character_attributes.cc' || echo '$(srcdir)/'`world_entities/character_attributes.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/character_attributes.Tpo" "$(DEPDIR)/character_attributes.Po"; else rm -f "$(DEPDIR)/character_attributes.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/character_attributes.cc' object='character_attributes.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/character_attributes.Po' tmpdepfile='$(DEPDIR)/character_attributes.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o character_attributes.o `test -f 'world_entities/character_attributes.cc' || echo '$(srcdir)/'`world_entities/character_attributes.cc
+
+character_attributes.obj: world_entities/character_attributes.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT character_attributes.obj -MD -MP -MF "$(DEPDIR)/character_attributes.Tpo" -c -o character_attributes.obj `if test -f 'world_entities/character_attributes.cc'; then $(CYGPATH_W) 'world_entities/character_attributes.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/character_attributes.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/character_attributes.Tpo" "$(DEPDIR)/character_attributes.Po"; else rm -f "$(DEPDIR)/character_attributes.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/character_attributes.cc' object='character_attributes.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/character_attributes.Po' tmpdepfile='$(DEPDIR)/character_attributes.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o character_attributes.obj `if test -f 'world_entities/character_attributes.cc'; then $(CYGPATH_W) 'world_entities/character_attributes.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/character_attributes.cc'; fi`
 
 ai.o: ai/ai.cc

orxonox/trunk/src/world_entities/weapon.h

@@ -43 +43 @@
   Projectile* getProjectile();
 
-  void activate();
-  void deactivate();
+  virtual void activate();
+  virtual void deactivate();
   bool isActive();
 
@@ -52 +52 @@
   int getWeaponEnergy();
 
-  void fire();
+  virtual void fire();
   virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void destroy ();