Changeset 8886 in orxonox.OLD

Timestamp:

Jun 28, 2006, 7:01:42 PM (18 years ago)

Author:

snellen

Message:

fixed bug that led to a segmentation fault while adding the scripttrigger to a nonexistent script

Location:

branches/single_player_map/src

Files:

• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (1 diff)
• world_entities/door.cc (modified) (1 diff)
• world_entities/script_trigger.cc (modified) (3 diffs)

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

@@ -90 +90 @@
 
       height = collPos.y - box->halfLength[1];
-      PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
-      PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
+     // PRINTF(0)("height: %f          , model height: %f\n", height, box->halfLength[1]);
+     // PRINTF(0)(" ground normal: %f, %f, %f\n", normal.x, normal.y, normal.z);
 
       // object is beneath the plane (ground)

branches/single_player_map/src/world_entities/door.cc

@@ -73 +73 @@
 
 
-  this->loadMD2Texture("maps/doormtl_cmbo.jpg");
+  this->loadMD2Texture("maps/doors.jpg");
   this->loadModel("models/creatures/doors.md2", 1.0);
   this->setAnimation(DOOR_CLOSE, MD2_ANIM_ONCE);

branches/single_player_map/src/world_entities/script_trigger.cc

@@ -46 +46 @@
   scriptCalled = false;
   scriptIsOk = false;
-  triggerLasts = false;
+  triggerLasts = true;
   addToScript = false;
   
@@ -54 +54 @@
   loadParams(root);
   
-  if(addToScript)
+  if(addToScript && scriptIsOk)
   {
     script->addObject( "ScriptTrigger", this->getName());
@@ -104 +104 @@
     LoadParam(root, "invert", this, ScriptTrigger, setInvert)
         .describe("")
-        .defaultValues("");
+        .defaultValues("false");
     LoadParam(root, "triggerlasts", this, ScriptTrigger, setTriggerLasts)
         .describe("")
-        .defaultValues("");
+        .defaultValues("true");
     LoadParam(root, "debugdraw", this, ScriptTrigger, setDebugDraw)
         .describe("")
-        .defaultValues("");
+        .defaultValues("false");
     LoadParam(root, "addtoscript", this, ScriptTrigger, setAddToScript)
         .describe("True if this scripttrigger should be aviable in the script")
-        .defaultValues("");
+        .defaultValues("false");
 }