Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10374 in orxonox.OLD for trunk/src/world_entities


Ignore:
Timestamp:
Jan 25, 2007, 11:27:47 PM (18 years ago)
Author:
patrick
Message:

merged branche gui

Location:
trunk/src/world_entities
Files:
2 edited
5 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/WorldEntities.am

    r10368 r10374  
    2828                world_entities/mount_point.cc \
    2929                world_entities/sound_entity.cc \
     30                \
     31                world_entities/questGUI/quest_gui.cc \
     32                world_entities/questGUI/quest.cc \
    3033                \
    3134                world_entities/weapons/test_gun.cc \
    … …  
    153156                sound_entity.h \
    154157                \
     158                questGUI/quest_gui.h \
     159                questGUI/quest.h \
     160                \
    155161                weapons/test_gun.h \
    156162                weapons/laser_cannon.cc \

  • trunk/src/world_entities/script_trigger.cc

    r10321 r10374  
    181181   }
    182182
    183   if(triggerRemains && scriptCalled)
     183 if(triggerRemains && scriptCalled)
    184184  {
    185185    executeAction(timestep);
    … …  
    190190  {
    191191    if( !invert && this->distance(target) < radius)
     192    {
     193    //printf("Distance is %f \n", this->distance(target));
     194    executeAction(timestep);
     195    scriptCalled = true;
     196    return;
     197
     198    }
     199    else if( invert && this->distance(target) > radius)
    192200    {
    193201      executeAction(timestep);
    194202      scriptCalled = true;
    195203      return;
    196 
    197     }
    198     else if( invert && this->distance(target) > radius)
    199     {
    200       executeAction(timestep);
    201       scriptCalled = true;
    202       return;
    203     }
    204   }
    205  //else
    206    //printf("SCRIPTTRIGGER: target out of range\n");
    207 
     204    }
     205  }
    208206}
    209207
    … …  
    211209void ScriptTrigger::executeAction(float timestep)
    212210{
    213 
    214211  if(scriptIsOk)
    215212  {
Note: See TracChangeset for help on using the changeset viewer.