Changeset 8847 in orxonox.OLD for branches/single_player_map/src

Timestamp:

Jun 28, 2006, 1:23:25 PM (18 years ago)

Author:

bensch

Message:

segfault preverter

Location:

branches/single_player_map/src

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (4 diffs)
• lib/util/executor/executor_functional.cc (modified) (1 diff)
• lib/util/executor/executor_lua.cc (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (3 diffs)

branches/single_player_map/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -66 +66 @@
   //   collision->getEntityB()->getAbsCoor().debug();
 
-  float height;
+  Vector height;
   AABB* box = collision->getEntityB()->getModelAABB();
   WorldEntity* entity = collision->getEntityB();
-
+/*
   float CR_MAX_WALK_HEIGHT = 2.0f;
 
@@ -88 +88 @@
 
 
-  }
+  }*/
 
 
@@ -94 +94 @@
 
 
-#if 0
+//#if 0
   if( box != NULL)
     height = ( ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor() )*(-1.0f) ;
@@ -151 +151 @@
 
   }// if(box!= NULL)
-#endif
+//#endif
   /*
   PRINTF(0)("Collision with Ground: \n");

branches/single_player_map/src/lib/util/executor/executor_functional.cc

@@ -15 +15 @@
 
 #include "executor.h"
-std::string ExecutorFunctional_returningString_from[5];
+std::string ExecutorFunctional_returningString_from[7];
 
 

branches/single_player_map/src/lib/util/executor/executor_lua.cc

@@ -20 +20 @@
 #include "lunar.h"
 
-std::string temp[5];
+std::string temp[7];
 
 template<typename type> type fromLua(lua_State* state, int index) { type *obj = Lunar<type>::check(state, 1); lua_remove(state, 1); return obj;};

branches/single_player_map/src/world_entities/npcs/generic_npc.cc

@@ -408 +408 @@
 bool GenericNPC::turnTo(float qu, float qx, float qy, float qz)
 {
-  Quaternion destDir = Quaternion(Vector(qx, qy, qz), qu);
+  Quaternion destDir = Quaternion(Vector(qx, qy, qz).getNormalized(), qu);
 
   printf("Turning: %f, %f, %f, %f \n",qu,qx,qy,qz);
@@ -418 +418 @@
 //     if( this->currentAnim != NULL)
 //       this->currentAnim->stop();
-//     
+//
     PRINTF(0)("SET ANIMATION\n");
     this->destDir = destDir;
-// 
-   
-    
+//
+
+
     if( this->currentAnim != NULL)
       delete this->currentAnim;
-    
+
     this->setAbsDir(destDir);
 /*
@@ -437 +437 @@
     this->currentAnim->setInfinity(ANIM_INF_CONSTANT);
     this->currentAnim->play();*/
-    
+
     this->setAnimation(STAND, MD2_ANIM_LOOP);
   }