Changeset 7221 in orxonox.OLD for trunk/src/world_entities/creatures

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

Location:

trunk/src/world_entities/creatures

Files:

• md2_creature.cc (modified) (3 diffs)
• md2_creature.h (modified) (1 diff)

trunk/src/world_entities/creatures/md2_creature.cc

@@ -52 +52 @@
  * @param fileName the name of the File to load the MD2Creature from (absolute path)
  */
-MD2Creature::MD2Creature(const char* fileName)
+MD2Creature::MD2Creature(const std::string& fileName)
 {
   this->init();
@@ -59 +59 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for md2 creature.\n", fileName);
+    PRINTF(2)("Loading file %s failed for md2 creature.\n", fileName.c_str());
     return;
   }
@@ -255 +255 @@
   this->shiftCoor (move);
 
-  if( this->bJump)
+  if( this->bJump && likely(this->getModel(0) != NULL))
   {
     ((MD2Model*)this->getModel(0))->setAnim(JUMP);
   }
-  else if( this->bFire)
+  else if( this->bFire && likely(this->getModel(0) != NULL))
   {
     if( ((MD2Model*)this->getModel(0))->getAnim() != ATTACK) ((MD2Model*)this->getModel(0))->setAnim(ATTACK);
   }
-  else if( fabs(move.len()) > 0.0f)
+  else if( fabs(move.len()) > 0.0f && likely(this->getModel(0) != NULL))
   {
     if( ((MD2Model*)this->getModel(0))->getAnim() != RUN) ((MD2Model*)this->getModel(0))->setAnim(RUN);
   }
-  else
+  else if (likely(this->getModel(0) != NULL))
   {
     if( ((MD2Model*)this->getModel(0))->getAnim() != STAND) ((MD2Model*)this->getModel(0))->setAnim(STAND);

trunk/src/world_entities/creatures/md2_creature.h

@@ -19 +19 @@
   public:
 
-    MD2Creature(const char* fileName);
+    MD2Creature(const std::string& fileName);
     MD2Creature(const TiXmlElement* root = NULL);
     virtual ~MD2Creature();