Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10321 in orxonox.OLD for trunk


Ignore:
Timestamp:
Jan 24, 2007, 10:28:18 AM (18 years ago)
Author:
patrick
Message:

silvans complete patch

Location:
trunk/src
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/importer/bsp/bsp_file.cc

    r10317 r10321  
    10461046  Face->meshvert = patchOffset -sz;  //3*(patchOffset-sz)*level1*level1;
    10471047  Face->n_meshverts = sz;
    1048   PRINTF(0)("BSP FILE: sz: %i. \n", sz);
    1049   PRINTF(0)("BSP FILE: Face->meshvert %i . \n", Face->meshvert);
     1048  PRINTF(4)("BSP FILE: sz: %i. \n", sz);
     1049  PRINTF(4)("BSP FILE: Face->meshvert %i . \n", Face->meshvert);
    10501050
    10511051  //Face->n_meshverts = sz;

  • trunk/src/lib/script_engine/script.cc

    r10319 r10321  
    9494 {
    9595   std::string filedest(Resources::ResourceManager::getInstance()->mainGlobalPath().name());
    96    filedest += "/scripts/" + filename;
     96
     97   std::string directory = "";
     98   std::string file = filename;
     99
     100   unsigned int seperation =  filename.find_last_of('/');
     101   if (seperation != std::string::npos)
     102   {
     103    directory = filename.substr( 0, seperation+1 );
     104    file = filename.substr( seperation+1 );
     105   }
     106   filedest += "scripts/" + directory + file;
    97107
    98108   this->addThisScript();

  • trunk/src/world_entities/WorldEntities.am

    r10276 r10321  
     1
    12## THE SUBCLASSES. THESE MUST BE DYNAMICALLY LINKED OR COMPILED IN DIRECTLY
    23WorldEntities_SOURCES_ = \
    … …  
    2526                world_entities/bsp_entity.cc \
    2627                world_entities/mount_point.cc \
     28                world_entities/sound_entity.cc \
    2729                \
    2830                world_entities/weapons/test_gun.cc \
    … …  
    6567                world_entities/environments/model_entity.cc \
    6668                world_entities/environments/building.cc \
     69                world_entities/environments/rotor.cc \
    6770                world_entities/environments/mapped_water.cc \
    68                 world_entities/environments/rotor.cc \
    6971                \
    7072                world_entities/elements/image_entity.cc \
    … …  
    130132                bsp_entity.h \
    131133                mount_point.h \
     134                sound_entity.h \
    132135                \
    133136                weapons/test_gun.h \
    … …  
    169172                environments/model_entity.h \
    170173                environments/building.h \
     174                environments/rotor.h \
    171175                environments/mapped_water.h \
    172                 environments/rotor.h \
    173176                \
    174177                elements/image_entity.h \
    … …  
    206209                weather_effects/lense_flare.h
    207210
     211

  • trunk/src/world_entities/creatures/fps_player.cc

    r10316 r10321  
    119119  registerEvent(EV_MOUSE_MOTION);
    120120
    121 
     121  this->aimingSystem = NULL;
    122122
    123123  // weapon manager for the fps
    … …  
    241241
    242242
    243     this->aimingSystem->toList(OM_GROUP_01);
    244     this->aimingSystem->setParent(&this->cameraNode);
    245 //     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
    246     this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
    247     this->aimingSystem->setRelCoor(0, -1, -1);
     243    if( this->aimingSystem != NULL)
     244    {
     245      this->aimingSystem->toList(OM_GROUP_01);
     246      this->aimingSystem->setParent(&this->cameraNode);
     247  //     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
     248      this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
     249      this->aimingSystem->setRelCoor(0, -1, -1);
     250    }
    248251
    249252

  • trunk/src/world_entities/script_trigger.cc

    r10319 r10321  
    187187  }
    188188
    189   if( !invert && this->distance(target) < radius)
    190   {
    191     executeAction(timestep);
    192     scriptCalled = true;
    193     return;
    194 
    195   }
    196   else if( invert && this->distance(target) > radius)
    197   {
    198     executeAction(timestep);
    199     scriptCalled = true;
    200     return;
     189  if( this->target != NULL)
     190  {
     191    if( !invert && this->distance(target) < radius)
     192    {
     193      executeAction(timestep);
     194      scriptCalled = true;
     195      return;
     196
     197    }
     198    else if( invert && this->distance(target) > radius)
     199    {
     200      executeAction(timestep);
     201      scriptCalled = true;
     202      return;
     203    }
    201204  }
    202205 //else
Note: See TracChangeset for help on using the changeset viewer.