Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8316 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Jun 11, 2006, 1:57:27 PM (19 years ago)
Author:
bensch
Message:

trunk: fixed most -Wall warnings… but there are still many missing :/

Location:
trunk/src
Files:
55 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/collision_detection/cd_engine.cc

    r8186 r8316  
    9999  if( likely( this->terrain != NULL))
    100100  {
    101     Quadtree* q = dynamic_cast<Terrain*>(this->terrain)->ssp->getQuadtree();
     101//    Quadtree* q = dynamic_cast<Terrain*>(this->terrain)->ssp->getQuadtree();
    102102//    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
    103103  }
    104  
     104
    105105  if( likely( this->bspManager != NULL))
    106106  {
  • trunk/src/lib/collision_detection/obb_tree.cc

    r7711 r8316  
    7474  /* triangles indexes created */
    7575  int* triangleIndexes = new int[modelInf.numTriangles];
    76   for( int i = 0; i < modelInf.numTriangles; ++i)
     76  for(unsigned int i = 0; i < modelInf.numTriangles; ++i)
    7777    triangleIndexes[i] = i;
    7878
  • trunk/src/lib/collision_detection/obb_tree_node.cc

    r8190 r8316  
    152152  Vector    p, q, r;                                 //!< holder of the polygon data, much more conveniant to work with Vector than sVec3d
    153153  Vector    t1, t2;                                  //!< temporary values
    154   float     covariance[3][3] = {0,0,0, 0,0,0, 0,0,0};//!< the covariance matrix
    155   const float*   tmpVec = NULL;                           //!< a temp saving place for sVec3Ds
     154  float     covariance[3][3] = {{0,0,0}, {0,0,0}, {0,0,0}};//!< the covariance matrix
    156155
    157156  /* fist compute all the convex hull face/facelets and centroids */
     
    275274  PRINTF(4)("Calculate Box Axis\n");
    276275  /* now get the axis length */
    277   float               halfLength[3];                         //!< half length of the axis
    278276  float               tmpLength;                             //!< tmp save point for the length
    279277  Plane               p0(box.axis[0], box.center);           //!< the axis planes
     
    371369  PRINTF(4)("Separating along the longest axis\n");
    372370  /* get the closest vertex near the center */
    373   float               dist = 999999.0f;                    //!< the smallest distance to each vertex
    374371  float               tmpDist;                             //!< variable to save diverse distances temporarily
    375   int                 vertexIndex;                         //!< index of the vertex near the center
    376372  Plane               middlePlane(box.axis[longestAxisIndex], box.center); //!< the middle plane
    377   const sVec3D*       tmpVec;                              //!< temp simple 3D vector
    378373
    379374
     
    662657        glBegin(GL_POINTS);
    663658        glColor3f(0.3, 0.8, 0.54);
    664         for( int i = 0; i < this->bvElement->modelInf->numVertices*3; i+=3)
     659        for(unsigned int i = 0; i < this->bvElement->modelInf->numVertices*3; i+=3)
    665660          glVertex3f(this->bvElement->modelInf->pVertices[i],
    666661                     this->bvElement->modelInf->pVertices[i+1],
  • trunk/src/lib/coord/p_node.cc

    r7954 r8316  
    3636 */
    3737PNode::PNode (PNode* parent, long nodeFlags)
    38     : Synchronizeable(), BaseObject()
     38  : BaseObject(), Synchronizeable()
    3939{
    4040  this->setClassID(CL_PARENT_NODE, "PNode");
     
    798798        {
    799799          this->relDirection = rotQuat;
    800           this->bRelDirChanged;
     800          this->bRelDirChanged = true;
    801801        }
    802802        else
     
    805805          this->toDirection = NULL;
    806806          PRINTF(5)("SmoothRotate of %s finished\n", this->getName());
    807           this->bRelDirChanged;
     807          this->bRelDirChanged = true;
    808808        }
    809809      }
     
    10581058  else if (parentingMode == PNODE_ROTATE_AND_MOVE)
    10591059    return "rotate-and-move";
     1060  else
     1061    return "all";
    10601062}
    10611063
     
    10771079  else  if (parentingMode == "rotate-and-move")
    10781080    return (PNODE_ROTATE_AND_MOVE);
     1081  else
     1082    return PNODE_ALL;
    10791083}
    10801084
  • trunk/src/lib/event/event_handler.cc

    r8228 r8316  
    369369  SDL_Event event;
    370370  Event ev;
    371   EventListener* listener = NULL;
    372371  while( SDL_PollEvent (&event))
    373372  {
  • trunk/src/lib/graphics/effects/fog_effect.cc

    r8255 r8316  
    7272        this->fogFadeDuration = 0;
    7373        this->localTimer = 0;
    74        
     74
    7575        this->fogMode = GL_EXP2;
    7676        this->fogDensity = 0.001;
     
    7979        this->colorVector = Vector(0.7, 0.7, 0.7);
    8080
     81        return true;
    8182}
    8283
     
    8788
    8889        this->fogActivate = true;
    89        
     90
    9091        GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
    9192        glFogi(GL_FOG_MODE, this->fogMode);
     
    9596        glFogf(GL_FOG_START, this->fogStart);
    9697        glFogf(GL_FOG_END, this->fogEnd);
    97        
     98
    9899        glEnable(GL_FOG);
    99100        // glClearColor(0.5, 0.5, 0.5, 1.0);
     101        return true;
    100102}
    101103
     
    106108
    107109        this->fogActivate = false;
    108        
     110
    109111        glDisable(GL_FOG);
     112
     113        return true;
    110114}
    111115
     
    122126        if (!this->fogActivate)
    123127                return;
    124                
     128
    125129
    126130        if (this->fogFadeDuration != 0 && this->localTimer < this->fogFadeDuration) {
  • trunk/src/lib/graphics/effects/graphics_effect.cc

    r7193 r8316  
    6161 */
    6262bool GraphicsEffect::init()
    63 {}
     63{
     64  return true;
     65}
    6466
    6567
  • trunk/src/lib/graphics/effects/lense_flare.cc

    r7844 r8316  
    104104 */
    105105bool LenseFlare::init()
    106 {}
     106{
     107  return true;
     108}
    107109
    108110
     
    113115{
    114116  this->bActivated = true;
     117
     118  return true;
    115119}
    116120
     
    122126{
    123127  this->bActivated = false;
     128
     129  return true;
    124130}
    125131
     
    130136 */
    131137GLint LenseFlare::stringToFogMode(const std::string& mode)
    132 {}
     138{
     139  PRINTF(1)("NOT IMPLEMENTED");
     140  return 0;
     141}
    133142
    134143
  • trunk/src/lib/graphics/effects/lightening_effect.cc

    r8255 r8316  
    3636{
    3737        this->setClassID(CL_LIGHTENING_EFFECT, "LighteningEffect");
    38  
     38
    3939        this->init();
    4040
     
    5454{
    5555        WeatherEffect::loadParams(root);
    56  
     56
    5757  LoadParam(root, "coord", this, LighteningEffect, coord);
    5858  LoadParam(root, "option", this, LighteningEffect, setLighteningOption);
     
    6868{
    6969  lighteningActivate = false;
    70  
     70
    7171  this->time = 0.0;
    7272  this->flashFrequency = 1.4f;
     
    117117    ResourceManager::getInstance()->unload(this->thunderBuffer);
    118118  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/thunder.wav", WAV);*/
     119
     120  return true;
    119121}
    120122
     
    149151  this->time = 0;
    150152  lighteningActivate = true;
     153
     154  return true;
    151155}
    152156
     
    160164  this->billboard[3]->setVisibiliy(false);
    161165  lighteningActivate = false;
     166
     167
     168  return true;
    162169}
    163170
     
    166173  if(!lighteningActivate)
    167174    return;
    168  
     175
    169176  this->time += dt;
    170177
     
    175182    else
    176183      this->flashLight->setDiffuseColor(100,100,100);
    177    
     184
    178185    //PRINTF(0)("100*time: %f %i\n", 100*time, (int)(100*time));
    179186}*/
    180  
     187
    181188  if( this->time > this->flashFrequency)
    182189  {
    183190    this->billboard[0]->setVisibiliy(true);
    184191    this->time = 0.0f;
    185    
     192
    186193    this->flashLight = new Light();
    187194    this->flashLight->setAbsCoor(this->billboard[0]->getAbsCoor().x, this->billboard[0]->getAbsCoor().y, this->billboard[0]->getAbsCoor().z);
    188195    this->flashLight->setDiffuseColor(100,100,100);
    189    
     196
    190197    //this->soundSource.play(this->thunderBuffer);
    191198  }
     
    195202    this->time = 0.0f;
    196203    this->bNewCoordinate = true;
    197    
     204
    198205    if(flashLight != NULL)
    199206    {
  • trunk/src/lib/graphics/effects/rain_effect.cc

    r8255 r8316  
    117117        lightMan = LightManager::getInstance();
    118118        this->rainAmbient = lightMan->getAmbientColor();
     119
     120        return true;
    119121}
    120122
     
    150152
    151153        this->emitter->setSpread(this->rainWindForce / 50, 0.2);
    152        
     154
    153155        this->soundSource.loop(this->rainBuffer, this->soundRainVolume);
    154156        if (this->rainWindForce != 0) this->soundSource.loop(this->windBuffer, 0.1f * this->rainWindForce);
    155157
    156158        lightMan->setAmbientColor(.1,.1,.1);
     159
     160        return true;
    157161}
    158162
     
    161165{
    162166        PRINTF(0)("Deactivating RainEffect\n");
    163        
     167
    164168        this->rainActivate = false;
    165169        this->emitter->setSystem(NULL);
     
    170174        // Restore Light Ambient
    171175        lightMan->setAmbientColor(this->rainAmbient, this->rainAmbient, this->rainAmbient);
     176
     177        return true;
    172178}
    173179
     
    176182        if (!this->rainActivate)
    177183                return;
    178                
     184
    179185        if (this->rainMove) {
    180186                this->rainCoord = State::getCameraNode()->getAbsCoor();
     
    202208                // this->soundSource.fadein(this->rainBuffer, 10);
    203209        }
    204        
     210
    205211}
    206212
  • trunk/src/lib/graphics/effects/snow_effect.cc

    r8255 r8316  
    7979        LoadParam(root, "size", this, SnowEffect, size);
    8080        LoadParam(root, "coord", this, SnowEffect, coord);
    81  
     81
    8282        LOAD_PARAM_START_CYCLE(root, element);
    8383        {
     
    111111        this->snowCoord = Vector(100,450,400);
    112112        this->snowWindForce = 1;
     113
     114        return true;
    113115}
    114116
     
    143145        if (this->snowWindForce > 1)
    144146                this->soundSource.loop(this->windBuffer);
     147
     148        return true;
    145149}
    146150
     
    156160                ResourceManager::getInstance()->unload(this->windBuffer);
    157161
     162        return true;
    158163}
    159164
     
    171176        /*
    172177        float distance = (State::getCameraNode()->getAbsCoor() - Vector(snowCoord.x, State::getCameraNode()->getAbsCoor().y, snowCoord.z)).len();
    173        
     178
    174179        if(activated)
    175180        {
     
    182187        else if(distance > 0.1*snowSize.x || distance > 0.1*snowSize.y)
    183188        this->alpha = 0.4;
    184        
     189
    185190        SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
    186191        SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
     
    197202        else if( distance < 0.1*snowSize.x || distance < 0.1*snowSize.y )
    198203        this->alpha = 0.5;
    199        
     204
    200205        SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
    201206        SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
  • trunk/src/lib/graphics/effects/volfog_effect.cc

    r7810 r8316  
    2929
    3030//#include <GL/glext.h> //OpenGL Extensions
    31 //#include <GL/glxext.h> // GLX Extensions 
     31//#include <GL/glxext.h> // GLX Extensions
    3232
    3333#ifndef GL_EXT_fog_coord
     
    9292        // Set fog color
    9393        float fogColor[4] = {0.6f,0.58f,0.79f,0.0f};
    94        
     94
    9595
    9696        glFogCoordfEXT       = (PFNGLFOGCOORDFEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordfEXT");
     
    132132{
    133133        PRINTF(0)("Activating VolFogEffect\n");
     134
     135        return true;
    134136}
    135137
     
    139141
    140142        glDisable(GL_FOG);
     143
     144        return true;
    141145}
    142146
     
    160164        //glEnable(GL_BLEND);
    161165        //glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
    162        
     166
    163167        int i;
    164168        glLoadIdentity();
    165169
    166        
     170
    167171        glBegin( GL_LINES );
    168172                glNormal3f(0,1,0);
     
    210214* ticks the effect if there is any time dependancy
    211215*/
    212 void VolFogEffect::tick(float dt)       
    213 {
    214 }
     216void VolFogEffect::tick(float dt)
     217{
     218}
  • trunk/src/lib/graphics/effects/weather_effect.cc

    r8255 r8316  
    5656 */
    5757bool WeatherEffect::init()
    58 {}
     58{
     59  return true;
     60}
    5961
    6062
  • trunk/src/lib/graphics/graphics_engine.cc

    r8148 r8316  
    145145    return -1;
    146146  this->initVideo(640, 480, 16);
     147  return 1;
    147148}
    148149
     
    161162  // looking if we are in fullscreen-mode
    162163  MultiType textures = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO_ADVANCED, CONFIG_NAME_TEXTURES, "1");
    163     Texture::setTextureEnableState(textures.getBool());
     164  Texture::setTextureEnableState(textures.getBool());
    164165
    165166  // searching for a usefull resolution
     
    167168  //resolution.debug();
    168169  MultiType x = resolution.getString(0), y = resolution.getString(1);
    169   this->initVideo(x.getInt(), y.getInt(), 16);
     170  return this->initVideo(x.getInt(), y.getInt(), 16);
    170171
    171172  //   GraphicsEffect* fe = new FogEffect(NULL);
     
    203204  {
    204205    PRINTF(1)("could not initialize SDL Video\n");
    205     //      return -1;
     206    return -1;
    206207  }
    207208  // initialize SDL_GL-settings
     
    238239
    239240  this->isInit = true;
     241  return 1;
    240242}
    241243
     
    263265 * @brief Sets the GL-attributes
    264266 */
    265 int GraphicsEngine::setGLattribs()
     267void GraphicsEngine::setGLattribs()
    266268{
    267269  // Set video mode
     
    358360    //    SDL_Quit();
    359361    //    return -1;
     362    return -1;
    360363  }
    361364  glViewport(0, 0, width, height);                     // Reset The Current Viewport
     
    379382  }
    380383#endif /* __WIN32__ */
     384  return 1;
    381385}
    382386
     
    410414 * @param resizeInfo SDL information about the size of the new screen size
    411415 */
    412 int GraphicsEngine::resolutionChanged(const SDL_ResizeEvent& resizeInfo)
     416void GraphicsEngine::resolutionChanged(const SDL_ResizeEvent& resizeInfo)
    413417{
    414418  this->setResolution(resizeInfo.w, resizeInfo.h, this->bitsPerPixel);
     
    655659  switch (event.type)
    656660  {
    657   case EV_VIDEO_RESIZE:
    658     this->resolutionChanged(event.resize);
    659     break;
    660   }
    661 }
     661    case EV_VIDEO_RESIZE:
     662      this->resolutionChanged(event.resize);
     663      break;
     664  }
     665}
  • trunk/src/lib/graphics/graphics_engine.h

    r7840 r8316  
    5454    inline int getbbp() const { return this->bitsPerPixel; };
    5555
    56     int resolutionChanged(const SDL_ResizeEvent& resizeInfo);
     56    void resolutionChanged(const SDL_ResizeEvent& resizeInfo);
    5757
    5858    static void enter2DMode();
     
    8888    GraphicsEngine();
    8989    int initVideo(unsigned int resX, unsigned int resY, unsigned int bbp);
    90     int setGLattribs();
     90    void setGLattribs();
    9191    void grabHardwareSettings();
    9292
  • trunk/src/lib/graphics/importer/height_map.cc

    r8068 r8316  
    108108
    109109  float height = 0;
    110   int offset = 0;
    111110
    112111  float r = 0.0;
     
    474473  Vector v = State::getCameraNode()->getAbsCoor();
    475474
    476   int i_min = 0;
    477475  int i_max = (heightMap->h )/ HM_TILE_SIZE;
    478   int j_min = 0;
    479476  int j_max= (heightMap->w  ) / HM_TILE_SIZE;
    480477
  • trunk/src/lib/graphics/importer/material.cc

    r8312 r8316  
    169169  }
    170170  Material::selectedMaterial = this;
     171
     172  return true;
    171173}
    172174
     
    411413void Material::setAmbientMap(const std::string& aMap, GLenum target)
    412414{
    413   SDL_Surface* ambientMap;
     415  /// FIXME SDL_Surface* ambientMap;
    414416
    415417}
     
    422424void Material::setSpecularMap(const std::string& sMap, GLenum target)
    423425{
    424   SDL_Surface* specularMap;
     426  /// FIXME SDL_Surface* specularMap;
    425427
    426428}
     
    437439
    438440
    439 int Material::getMaxTextureUnits()
     441unsigned int Material::getMaxTextureUnits()
    440442{
    441443  int maxTexUnits = 0;
  • trunk/src/lib/graphics/importer/material.h

    r8037 r8316  
    6969    static const GLenum glTextureArbs[];  //!< The Texture ARB's
    7070
    71     static int getMaxTextureUnits();
     71    static unsigned int getMaxTextureUnits();
    7272
    7373  private:
  • trunk/src/lib/graphics/importer/md2Model.cc

    r8309 r8316  
    290290{
    291291  //static sVec3D this->verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
    292   int* pCommands = this->data->pGLCommands;
     292//  int* pCommands = this->data->pGLCommands;
    293293  /* some face culling stuff */
    294294//   glPushAttrib(GL_POLYGON_BIT);
     
    541541  delete [] buffer;
    542542  fclose(pFile);
     543  return true;
    543544}
    544545
     
    563564  this->material.setIllum(3);
    564565  this->material.setAmbient(1.0, 1.0, 1.0);
    565 }
     566  return true;
     567}
  • trunk/src/lib/graphics/importer/media_container.cc

    r7221 r8316  
    182182
    183183  // get all the frames and save them in the sequence
    184   while(this->addFrame(this->getNextFrame()) != NULL);
     184  while(this->addFrame(this->getNextFrame()) != 0);
    185185}
    186186
  • trunk/src/lib/graphics/importer/model.cc

    r7732 r8316  
    6767
    6868  glBegin(GL_TRIANGLES);
    69   for( int i = 0; i < this->pModelInfo.numTriangles; ++i)
     69  for(unsigned int i = 0; i < this->pModelInfo.numTriangles; ++i)
    7070    {
    7171      //printf("int i = %i\n", i);
  • trunk/src/lib/graphics/importer/primitive_model.cc

    r8145 r8316  
    105105  // defining the binding Faces.
    106106  int v1, v2, v3, v4;
    107   for (int i = 0; i <= detail * 2 -1; i++)
    108   {
    109     for (int j = 0; j <= detail; j++)
     107  for (unsigned int i = 0; i <= detail * 2 -1; i++)
     108  {
     109    for (unsigned int j = 0; j <= detail; j++)
    110110    {
    111111
     
    147147  if (detail <= 3)
    148148    detail = 3;
    149   int count = 0;
     149  unsigned int count = 0;
    150150  // defining Points of the Cylinder.
    151151  for (float phi = 0.0; phi < 2.0*PI; phi += 2.0*PI/(float)detail)
     
    163163  }
    164164  // adding Faces
    165   for (int i = 0; i < detail-1; i++)
     165  for (unsigned int i = 0; i < detail-1; i++)
    166166  {
    167167    int p1, p2, p3, p4;
     
    204204
    205205  //defining Faces
    206   for (int i = 0; i < detail; i++)
     206  for (unsigned int i = 0; i < detail; i++)
    207207  {
    208208    unsigned int v1, v2;
    209209    v1 = i+2;
    210     if (i == detail -1)
     210    if (i+1 == detail)
    211211      v2 = 2;
    212212    else
     
    225225{
    226226  //defining vertices
    227   for (int i = 0; i < detail; i++)
    228     for (int j = 0; j < detail; j++)
     227  for (unsigned int i = 0; i < detail; i++)
     228    for (unsigned int j = 0; j < detail; j++)
    229229    {
    230230      this->addVertex(((float)i/(float)(detail-1) -.5)*size,
     
    236236  //defining Faces
    237237  int v1, v2, v3, v4;
    238   for (int i = 0; i < detail-1; i++)
    239     for (int j = 0; j < detail-1; j++)
     238  for (unsigned int i = 0; i < detail-1; i++)
     239    for (unsigned int j = 0; j < detail-1; j++)
    240240    {
    241241      v1 = i*detail + j;
  • trunk/src/lib/graphics/importer/static_model.cc

    r7732 r8316  
    386386  }
    387387  ++this->groupCount;
     388  return true;
    388389}
    389390
     
    558559  this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount -2;
    559560  this->faceCount += this->currentGroup->currentFace->vertexCount -2;
     561  return true;
    560562}
    561563
     
    591593  this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount - 2;
    592594  this->faceCount += this->currentGroup->currentFace->vertexCount -2;
     595  return true;
    593596}
    594597
     
    606609  if (this->currentGroup->faceCount == 0)
    607610    this->currentGroup->faceCount++;
     611  return true;
    608612}
    609613
     
    621625  if (this->currentGroup->faceCount == 0)
    622626    this->currentGroup->faceCount++;
     627  return true;
    623628}
    624629
     
    637642
    638643  Vector* normArray = new Vector [vertices.size()/3];
    639   for (int i=0; i<vertices.size()/3;i++)
     644  for (unsigned int i=0; i<vertices.size()/3;i++)
    640645    normArray[i] = Vector(.0,.0,.0);
    641646
    642   int firstTouch;
    643   int secondTouch;
    644647  Vector prevV;
    645648  Vector nextV;
     
    668671
    669672        curElem = firstElem;
    670         for (int j=0; j<tmpFace->vertexCount; j++)
     673        for (unsigned int j = 0; j < tmpFace->vertexCount; j++)
    671674        {
    672675          if (!(nextElem = curElem->next))
     
    696699  }
    697700
    698   for (int i=0; i < this->vertices.size()/3;i++)
     701  for (unsigned int i=0; i < this->vertices.size()/3;i++)
    699702  {
    700703    normArray[i].normalize();
     
    705708  }
    706709  delete[] normArray;
     710  return true;
    707711}
    708712
     
    741745          glEnd();
    742746        this->currentGroup->faceMode = 0;
    743         Material* tmpMat;
    744747        if (tmpFace->material != NULL)
    745748        {
     
    797800    this->currentGroup = this->currentGroup->next;
    798801  }
     802  return true;
    799803}
    800804
     
    933937  PRINTF(5)("importing grafical Element to openGL.\n");
    934938
    935   if (elem->texCoordNumber != -1)
    936   {
    937     if (likely(elem->texCoordNumber < this->pModelInfo.numTexCoor))
     939  if (elem->texCoordNumber > -1)
     940  {
     941    if (likely((unsigned int)elem->texCoordNumber < this->pModelInfo.numTexCoor))
    938942      glTexCoord2fv(&this->vTexture[0] + elem->texCoordNumber * 2);
    939943    else
     
    941945                elem->texCoordNumber, this->pModelInfo.numTexCoor);
    942946  }
    943   if (elem->normalNumber != -1)
    944   {
    945     if (likely(elem->normalNumber < this->pModelInfo.numNormals))
     947  if (elem->normalNumber > -1)
     948  {
     949    if (likely((unsigned int)elem->normalNumber < this->pModelInfo.numNormals))
    946950      glNormal3fv(&this->normals[0] + elem->normalNumber * 3);
    947951    else
     
    949953                elem->normalNumber, this->pModelInfo.numNormals);
    950954  }
    951   if (elem->vertexNumber != -1)
    952   {
    953     if (likely(elem->vertexNumber < this->pModelInfo.numVertices))
     955  if (elem->vertexNumber > -1)
     956  {
     957    if (likely((unsigned int)elem->vertexNumber < this->pModelInfo.numVertices))
    954958      glVertex3fv(&this->vertices[0]+ elem->vertexNumber * 3);
    955959    else
     
    958962  }
    959963
     964  return true;
    960965}
    961966
  • trunk/src/lib/graphics/importer/tc.cc

    r6608 r8316  
    707707    if(tc->UsingStaticVerts) {
    708708        double edgeTotal;
    709         for(i = 0; i < tc->VertRange; i++) {
     709        for(i = 0; i < (int)tc->VertRange; i++) {
    710710            v = &tc->StaticVerts[i];
    711711            if(v->Count > 0) {
     
    830830{
    831831    int i;
    832     int size;
     832    int size = 1;
    833833    ACTCVertex *v;
    834834
     
    838838    if(tc->UsingStaticVerts) {
    839839        size = tc->VertRange * sizeof(ACTCVertex);
    840         for(i = 0; i < tc->VertRange; i++) {
     840        for(i = 0; i < (int)tc->VertRange; i++) {
    841841            v = &tc->StaticVerts[i];
    842842            if(v->Count > 0)
     
    915915
    916916        case ACTC_IN_MAX_VERT:
    917             if(value < tc->MinInputVert) {
     917          if(value < (int)tc->MinInputVert) {
    918918                ACTC_DEBUG(fprintf(stderr, "actcParami : tried to set "
    919919                    "MAX_INPUT_VERT to %d, less than MIN_INPUT_VERT (%d)\n",
     
    925925
    926926        case ACTC_IN_MIN_VERT:
    927             if(value > tc->MaxInputVert) {
     927          if(value > (int)tc->MaxInputVert) {
    928928                ACTC_DEBUG(fprintf(stderr, "actcParami : tried to set "
    929929                    "MIN_INPUT_VERT to %d, greater than MAX_INPUT_VERT (%d)\n",
     
    10651065static int mapVertexEdge(ACTCData *tc, ACTCVertex *v1, ACTCVertex *v2, ACTCEdge **edge)
    10661066{
    1067     unsigned int i;
     1067    int i;
    10681068    ACTCEdge tmp;
    10691069    void *r;
  • trunk/src/lib/graphics/importer/texture.cc

    r8312 r8316  
    3333/*
    3434 * On the BIG_ENDIAN architecture, the 24 and 32bit bitmaps have
    35  * different masks. If you don't do this distinction properly, 
     35 * different masks. If you don't do this distinction properly,
    3636 * you will get weird-looking textures.
    3737 */
     
    161161  unsigned int* pixels = new unsigned int[width * height * channels];
    162162  memset(pixels, 0, width * height * channels * sizeof(unsigned int));
    163  
    164  
     163
     164
    165165  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
    166166  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
     
    169169
    170170  glTexImage2D(target, 0, channels, width, height, 0, type, GL_UNSIGNED_INT, pixels);
    171  
    172  
    173  
     171
     172
     173
    174174  delete[] pixels;
    175175
     
    309309
    310310        Uint32* mask = opaqueMask;
    311        
     311
    312312  /* Save the alpha blending attributes */
    313313  saved_flags = surface->flags&(SDL_SRCALPHA | SDL_RLEACCELOK);
     
    320320                mask = alphaMask;
    321321  }
    322                
     322
    323323  retSurface = SDL_CreateRGBSurface(SDL_HWSURFACE,
    324324                                    surface->w, surface->h,
     
    360360  int      errorCode = 0;           //!< the error code for the texture loading functions
    361361  GLuint   texture = 0;             //!< the OpenGL texture handle
    362   int      mipmapLevel = 0;         //!< the maximum mipmap level for this texture
    363   int      mipmapWidth = 0;         //!< the width of the mipmap
    364   int      mipmapHight = 0;         //!< the height of the mipmap
     362  //int      mipmapLevel = 0;         //!< the maximum mipmap level for this texture
     363  //int      mipmapWidth = 0;         //!< the width of the mipmap
     364  //int      mipmapHight = 0;         //!< the height of the mipmap
    365365  GLenum   format = GL_RGB;
    366366  if (surface->format->BitsPerPixel == 32)
  • trunk/src/lib/graphics/render2D/element_2d.cc

    r8035 r8316  
    961961        /* update the current absCoordinate */
    962962        this->prevRelCoordinate = this->relCoordinate;
    963         float sine = sin(this->parent->getAbsDir2D());
    964         float cose = cos(this->parent->getAbsDir2D());
     963//         float sine = sin(this->parent->getAbsDir2D());
     964//         float cose = cos(this->parent->getAbsDir2D());
    965965        //        this->absCoordinate.x = this->relCoordinate.x*cose - this->relCoordinate.y*sine + this->parent->getRelCoor2D().x*(1-cose) +this->parent->getRelCoor2D().y*sine;
    966966        //        this->absCoordinate.y = this->relCoordinate.x*sine + this->relCoordinate.y*cose + this->parent->getRelCoor2D().y*(1-cose) +this->parent->getRelCoor2D().x*sine;
     
    11671167  else if (parentingMode == E2D_PARENT_ROTATE_AND_MOVE)
    11681168    return "rotate-and-move";
     1169  else return "all";
    11691170}
    11701171
     
    11861187  else  if (parentingMode == "rotate-and-move")
    11871188    return (E2D_PARENT_ROTATE_AND_MOVE);
     1189  else return E2D_PARENT_ALL;
    11881190}
    11891191
  • trunk/src/lib/graphics/shader.cc

    r8255 r8316  
    153153      glAttachObjectARB(this->shaderProgram, shader);
    154154  }
     155  return true;
    155156}
    156157
  • trunk/src/lib/graphics/text_engine/font.cc

    r7727 r8316  
    220220
    221221/**
    222  * sets a specific renderStyle
     222 * @brief sets a specific renderStyle
    223223 * @param renderStyle the Style to render: a string (char-array) containing:
    224224 *   i: italic, b: bold, u, underline
     
    228228  this->renderStyle = TTF_STYLE_NORMAL;
    229229
    230   for (int i = 0; i < renderStyle.size(); i++)
     230  for (unsigned int i = 0; i < renderStyle.size(); i++)
    231231  {
    232232    if (renderStyle[i] == 'b')
     
    246246
    247247/**
    248  * creates and exports an Image, that has all the characters
     248 * @brief creates and exports an Image, that has all the characters
    249249 * stored in a Array (as an image)
    250250 * @param fileName the File to write the image into.
     
    257257
    258258  //
    259   SDL_Color tmpColor = {0, 0, 0};
    260259  // Surface definition.
    261260  SDL_Rect tmpRect; // this represents a Rectangle for blitting.
     
    277276  tmpRect.x = 0; tmpRect.y = 0; tmpRect.w = tmpSurf->w; tmpRect.h = tmpSurf->h;
    278277  SDL_SetClipRect(tmpSurf, &tmpRect);
    279   int maxLineHeight = 0;
    280278
    281279  int posX, posY;
     
    339337/**
    340338 * @returns the maximum ascent of the Font, if the font was initialized, 0 otherwise
    341 
    342    the ascent is the pixels of the font above the baseline
     339 *
     340 * the ascent is the pixels of the font above the baseline
    343341 */
    344342int Font::getMaxAscent() const
     
    352350/**
    353351 * @returns the maximum descent of the Font, if the font was initialized, 0 otherwise
    354 
    355    the descent is the pixels of the font below the baseline
     352 *
     353 * the descent is the pixels of the font below the baseline
    356354 */
    357355int Font::getMaxDescent() const
     
    404402
    405403/**
    406  * creates a Fast-Texture of this Font
     404 * @brief creates a Fast-Texture of this Font
    407405 */
    408406bool Font::createFastTexture()
     
    497495  if (this->setSurface(tmpSurf))
    498496    (this->setTexture(Texture::loadTexToGL(tmpSurf)));
     497  return true;
    499498}
    500499
     
    547546    return 0;
    548547
    549   int i;
    550   int x,y; // the counters
     548  unsigned int i;
     549  unsigned int x,y; // the counters
    551550  int maxLineHeight = this->getMaxHeight();
    552551  unsigned int size = 32;  // starting Value, we have to start somewhere 32 seems reasonable. (take any small enough 2^i number)
     
    587586
    588587/**
    589  * a simple function to get some interesting information about this class
     588 * @brief a simple function to get some interesting information about this class
    590589 */
    591590void Font::debug()
    592591{
    593592  // print the loaded font's style
    594   int style;
     593  int style = TTF_STYLE_NORMAL;
    595594  if (likely(this->fontTTF != NULL))
    596595    style = TTF_GetFontStyle(this->fontTTF);
  • trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc

    r8145 r8316  
    269269    glEnd();
    270270
    271     /* draw black border
    272271    glBegin(GL_QUADS);
    273272    glColor3f(0.0, 0.0, 0.0);
  • trunk/src/lib/gui/gl/signal_connector.cc

    r8271 r8316  
    7272    this->object = signalConnector.object;
    7373    this->exec = (signalConnector.exec == NULL) ? NULL : signalConnector.exec->clone();
     74
     75    return *this;
    7476  }
    7577
  • trunk/src/lib/gui/qt/gui_control.cc

    r8145 r8316  
    283283        ///case Qt::Key_Power: return SDLK_POWER;
    284284        ///case Qt::Key_Euro: return SDLK_EURO;
     285      default:
    285286        return -1;
    286287    }
  • trunk/src/lib/lang/class_list.cc

    r8271 r8316  
    367367      while (std::pow((float)10, (int)lenCount) <= (*cl).objectList.size())
    368368        ++lenCount;
    369       for (int i=0; i < 30-(*cl).className.size() - lenCount; i++)
     369      for (unsigned int i=0; i < 30-(*cl).className.size() - lenCount; i++)
    370370        (niceString[i]) = ' ';
    371371      niceString[30-(*cl).className.size() - lenCount] = '\0';
  • trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc

    r7319 r8316  
    5252  else
    5353    argTable.push_front( entry );
     54  return true;
    5455}
    5556
     
    7071      if ( s.length() > 2 && s[0] == '-' && s[1] != '-' )
    7172      {
    72         for ( int j = 1; j < s.length(); j++ )
     73        for (unsigned int j = 1; j < s.length(); j++ )
    7374        {
    7475          std::string t = "-";
     
    9596  }
    9697
    97   int i = 0;
     98  unsigned int i = 0;
    9899
    99100  ArgTable::iterator it;
     
    110111        found = true;
    111112
    112         int posArgs = 1;
     113        unsigned int posArgs = 1;
    113114
    114115        while ( i + posArgs < args.size() )
     
    130131        std::vector<MultiType> argArgs;
    131132
    132         for ( int j = 1; j <= it->numArgs; j++ )
     133        for (unsigned int j = 1; j <= it->numArgs; j++ )
    133134          argArgs.push_back( args[i+j] );
    134135
     
    219220    assert( it->numArgs == substr.size() );
    220221
    221     for ( int i = 0; i<it->numArgs; i++ )
     222    for (unsigned int i = 0; i<it->numArgs; i++ )
    222223    {
    223224      args += " [" + substr[i] + "]";
     
    251252  output.reverse();
    252253
    253   int maxShort = 0;
    254   int maxLong = 0;
     254  unsigned int maxShort = 0;
     255  unsigned int maxLong = 0;
    255256
    256257  std::list<std::vector<std::string> >::const_iterator it;
     
    269270    printf("%s ", (*it)[0].c_str());
    270271
    271     for ( int i = 0; i<maxShort-(*it)[0].length(); i++ )
     272    for (unsigned int i = 0; i<maxShort-(*it)[0].length(); i++ )
    272273      printf(" ");
    273274
    274275    printf("%s ", (*it)[1].c_str());
    275276
    276     for ( int i = 0; i<maxLong-(*it)[1].length(); i++ )
     277    for (unsigned int i = 0; i<maxLong-(*it)[1].length(); i++ )
    277278      printf(" ");
    278279
  • trunk/src/lib/parser/cmdline_parser/cmdline_parser.h

    r7256 r8316  
    1717struct ArgTableEntry
    1818{
    19   int         id;
    20   std::string longOption;
    21   char        shortOption;
    22   int         numArgs;
    23   std::string argNames;
    24   std::string help;
     19  unsigned int    id;
     20  std::string     longOption;
     21  char            shortOption;
     22  unsigned int    numArgs;
     23  std::string     argNames;
     24  std::string     help;
    2525};
    2626
     
    3636    CmdLineParser();
    3737    virtual ~CmdLineParser();
    38    
     38
    3939    bool add( int id, const std::string& longOption, char shortOption, int numArgs, const std::string & argNames, const std::string& help, bool back=false );
    4040
    4141    bool parse( ArgParserCallback cb, void* data, int argc, char** argv );
    42    
     42
    4343    void showHelp();
    44    
     44
    4545  private:
    4646    ArgTable argTable;
    4747    std::string exeName;
    48    
     48
    4949    inline bool matches( ArgTableEntry entry, std::string arg, bool & finish );
    5050
  • trunk/src/lib/parser/preferences/cmd_line_prefs_reader.cc

    r7261 r8316  
    4343{
    4444  CallbackData * cbd = (CallbackData *)data;
    45  
     45
    4646  switch ( entry.id )
    4747  {
     
    5454      key.erase( 0, key.find(".")+1 );
    5555      //PRINTF(0)("SECTION '%s', KEY '%s'\n", section.c_str(), key.c_str());
    56      
     56
    5757      if ( key == "" || section == "" || argArgs.size() != 1 )
    5858      {
     
    6060        return false;
    6161      }
    62      
     62
    6363      //Preferences::getInstance()->setMultiType( section, key, argArgs[0], true );
    6464      cbd->iniEntries.push_back( IniEntry() );
     
    7272      return true;
    7373  }
    74  
    75   if ( entry.id >= ID_PREFS && entry.id - ID_PREFS < regArgs.size() )
     74
     75  if ( entry.id >= ID_PREFS && entry.id  < regArgs.size() + ID_PREFS)
    7676  {
    7777    if ( regArgs[entry.id - ID_PREFS].value == "%arg%" )
    7878    {
    7979      assert( argArgs.size() == 1 );
    80      
     80
    8181      cbd->iniEntries.push_back( IniEntry() );
    8282      cbd->iniEntries.back().section = regArgs[entry.id - ID_PREFS].section;
     
    9696    assert(false);
    9797  }
    98  
     98
    9999  return true;
    100100}
     
    104104{
    105105  CmdLineParser parser;
    106  
     106
    107107  parser.add( ID_HELP, "help", 'h', 0, "", "Shows this help and exits");
    108  
    109   for ( int i = 0; i<regArgs.size(); i++ )
     108
     109  for (unsigned int i = 0; i<regArgs.size(); i++ )
    110110  {
    111111    if ( regArgs[i].value == "%arg%" )
     
    118118    }
    119119  }
    120  
     120
    121121  parser.add( ID_SET_INI, "set-%", '\0', 1, "value", "Override a configuration element." );
    122  
     122
    123123  CallbackData cbd;
    124  
     124
    125125  cbd.parser = &parser;
    126  
     126
    127127  if ( parser.parse( &callBack, &cbd, argc, argv ) )
    128128  {
     
    137137    exit(EXIT_FAILURE);
    138138  }
    139  
     139
    140140  return true;
    141141}
     
    144144{
    145145  RegistredArgument arg;
    146  
     146
    147147  arg.longOption = longOption;
    148148  while ( arg.longOption.find("_") != std::string::npos )
     
    158158  arg.section = section;
    159159  arg.key = key;
    160  
     160
    161161  regArgs.push_back( arg );
     162  return true;
    162163}
    163164
  • trunk/src/lib/sound/ogg_player.cc

    r8293 r8316  
    163163  bool OggPlayer::play()
    164164  {
    165     /*if (!(this->state & OggPlayer::FileOpened))
     165    if (!(this->state & OggPlayer::FileOpened))
    166166      return false;
    167167
     
    173173    if (this->musicThreadID == NULL)
    174174      return ((this->musicThreadID = SDL_CreateThread(OggPlayer::musicThread, (void*)this)) != NULL);
    175     return true;*/
     175    return true;
    176176  }
    177177
  • trunk/src/lib/util/loading/dynamic_loader.cc

    r7355 r8316  
    6060  }
    6161  void *mkr = dlsym( this->handle, "maker");
     62  return (mkr != NULL);
    6263}
    6364
     
    7273  }
    7374//  void *mkr = dlsym("maker");
    74 
     75  return true;
    7576}
    7677
     
    7879BaseObject* DynamicLoader::fabricateObject(const TiXmlElement* root) const
    7980{
     81  /// FIXME
     82  return NULL;
    8083}
    8184#endif
  • trunk/src/lib/util/loading/load_param.cc

    r7721 r8316  
    2929 */
    3030CLoadParam::CLoadParam(const TiXmlElement* root, const std::string& paramName, BaseObject* object, Executor* executor, bool inLoadCycle)
    31   :  paramName(paramName), object(object)
     31  :  object(object), paramName(paramName)
    3232{
    3333  this->object = object;
  • trunk/src/lib/util/loading/load_param_description.cc

    r7221 r8316  
    275275
    276276  return retVal;*/
    277 }
     277  std::list<std::string> a;
     278  return a;
     279}
  • trunk/src/lib/util/loading/resource_manager.cc

    r7676 r8316  
    557557bool ResourceManager::unloadAllByPriority(ResourcePriority prio)
    558558{
     559  bool removedAll = true;
    559560  unsigned int removeCount;
    560561  for (unsigned int round = 0; round < 3; round++)
     
    571572        {
    572573          if (round == 3)
     574          {
    573575            PRINTF(2)("unable to unload %s because there are still %d references to it\n",
    574576                      this->resourceList[index]->name.c_str(), this->resourceList[index]->count);
     577            removedAll = false;
     578          }
    575579          removeCount++;
    576580        }
     
    580584    if (removeCount == 0) break;
    581585  }
     586  return removedAll;
    582587}
    583588
     
    711716  }
    712717  return tmp;*/
     718  return "";
    713719}
    714720
     
    733739    return this->cache(splits[1], ResourceManager::stringToResourceType(splits[0]),
    734740                RP_LEVEL, splits[2], splits[3], splits[4]);*/
     741  return false;
    735742}
    736743
  • trunk/src/lib/util/multi_type.cc

    r8035 r8316  
    160160    case MT_STRING:
    161161      return (this->storedString == mt.storedString);
     162    default:
     163      return false;
    162164  }
    163165}
     
    190192      this->setString(this->getString());
    191193      break;
     194    default:
     195      this->type = type;
    192196  }
    193197}
     
    477481    case MT_STRING:
    478482      return MultiType::typeNames[5];
    479   }
    480   return MultiType::typeNames[0];
     483    default:
     484      return MultiType::typeNames[0];
     485  }
    481486}
    482487
  • trunk/src/orxonox.cc

    r8145 r8316  
    203203
    204204  PRINTF(3)("Parsed Config File: '%s'\n", this->configFileName.c_str());
     205  return this->configFileName;
    205206}
    206207
     
    459460
    460461  return startOrxonox(argc, argv, "", -1);
    461   return 0;
    462462}
    463463
     
    497497    startOrxonox(argc, argv, "", port);
    498498  }
     499  return 1;
    499500}
    500501
     
    546547  delete orx;
    547548  File("~/.orxonox/orxonox.lock").remove();
    548 }
     549  return 1;
     550}
  • trunk/src/world_entities/playable.cc

    r8147 r8316  
    7979  // this->setPlayer(NULL);
    8080  // IN ITS DESTRUCTOR.
    81  
     81
    8282  assert(this->currentPlayer == NULL);
    8383}
     
    118118        this->increaseHealthMax(ppu->getValue());
    119119        return true;
     120      default:
     121        /// EVERYTHING THAT IS NOT HANDLED
     122        /// FIXME
     123        return false;
    120124    }
    121125  }
  • trunk/src/world_entities/player.cc

    r8147 r8316  
    8181      return true;
    8282  }
    83  
     83
    8484  if ( playable == NULL )
    8585    this->playable = NULL;
     
    9090bool Player::eject()
    9191 {
    92    this->setPlayable(NULL);
     92   return this->setPlayable(NULL);
    9393 }
    9494
  • trunk/src/world_entities/projectiles/bomb.cc

    r7368 r8316  
    3737    this->loadParams(root);
    3838
    39   float modelSize = 1.0;
    4039  this->loadModel("models/projectiles/RadioActiveBomb.obj", 1.0);
    4140
  • trunk/src/world_entities/projectiles/guided_missile.cc

    r7193 r8316  
    3535  this->setClassID(CL_GUIDED_MISSILE, "GuidedMissile");
    3636
    37   float modelSize = .3;
    3837  this->loadModel("models/projectiles/orx-rocket.obj", .3);
    3938  this->loadExplosionSound("sound/explosions/explosion_4.wav");
  • trunk/src/world_entities/projectiles/hyperblast.cc

    r7193 r8316  
    3636  this->setClassID(CL_HYPERBLAST, "Hyperblast");
    3737
    38   float modelSize = .3;
    3938  this->loadModel("models/projectiles/hyperblast.obj", 5);
    4039
  • trunk/src/world_entities/projectiles/rocket.cc

    r7193 r8316  
    3636  this->setClassID(CL_ROCKET, "Rocket");
    3737
    38   float modelSize = .3;
    3938  this->loadModel("models/projectiles/orx-rocket.obj", .3);
    4039
  • trunk/src/world_entities/projectiles/test_bullet.cc

    r7193 r8316  
    3535  this->setClassID(CL_TEST_BULLET, "TestBullet");
    3636
    37   float modelSize = .3;
    3837  this->loadModel("models/projectiles/orx-rocket.obj", .3);
    3938
  • trunk/src/world_entities/space_ships/hover.cc

    r7954 r8316  
    175175  this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
    176176  this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
    177  
     177
    178178  // NETWORK THINGS
    179  
     179
    180180  registerVar( new SynchronizeableBool( &bForward, &bForward, "bForward", PERMISSION_OWNER ) );
    181181  registerVar( new SynchronizeableBool( &bBackward, &bBackward, "bBackward", PERMISSION_OWNER ) );
     
    184184  registerVar( new SynchronizeableBool( &bAscend, &bAscend, "bAscend", PERMISSION_OWNER ) );
    185185  registerVar( new SynchronizeableBool( &bDescend, &bDescend, "bDescend", PERMISSION_OWNER ) );
    186  
     186
    187187  registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) );
    188188}
     
    262262{
    263263  Vector accel(0.0, 0.0, 0.0);
    264   float rotSpeed = .3;
    265264
    266265  if( this->bForward )
  • trunk/src/world_entities/space_ships/turbine_hover.cc

    r7868 r8316  
    297297{
    298298  Vector accel(0.0, 0.0, 0.0);
    299   float rotSpeed = .3;
    300299
    301300  if( this->bForward )
     
    416415    }
    417416    break;
     417    default:
     418      PRINTF(2)("Playmode %s Not Implemented\n", Playable::playmodeToString(this->getPlaymode()).c_str());
    418419  }
    419420}
  • trunk/src/world_entities/terrain.cc

    r8037 r8316  
    6363  this->init();
    6464
    65   if (fileName.rfind(".obj" ) != -1 || fileName.rfind(".OBJ") != -1 )
     65  if (fileName.rfind(".obj" ) != std::string::npos || fileName.rfind(".OBJ") != std::string::npos )
    6666  {
    6767    this->loadModel(fileName);
  • trunk/src/world_entities/test_entity.cc

    r7713 r8316  
    122122
    123123  this->bDeath = true;
    124   float anim;
    125124  int randi = (int)(5.0f * (float)rand()/(float)RAND_MAX);
    126125
  • trunk/src/world_entities/weapons/weapon.cc

    r7779 r8316  
    8686    }
    8787  }
     88  return NULL;
    8889}
    8990
     
    421422      return this->activateW();
    422423      break;
     424    default:
     425      PRINTF(2)("Action %s Not Implemented yet \n", Weapon::actionToChar(action));
     426      return false;
    423427  }
    424428}
     
    442446    this->enterState(WS_ACTIVATING);
    443447  }
     448  return true;
    444449}
    445450
     
    460465    this->enterState(WS_DEACTIVATING);
    461466  }
     467
     468  return true;
    462469}
    463470
     
    483490    this->requestAction(WA_RELOAD);
    484491  }
     492  return true;
    485493}
    486494
     
    509517    this->execute();
    510518  }
     519  return true;
    511520}
    512521
     
    539548  this->reload();
    540549  this->enterState(WS_RELOADING);
     550
     551  return true;
    541552}
    542553
  • trunk/src/world_entities/world_entity.cc

    r8190 r8316  
    401401    if( this->collisionHandles[i] != NULL)
    402402      this->collisionHandles[i]->registerCollisionEvent(c);
     403  return true;
    403404}
    404405
     
    424425    if( this->collisionHandles[i] != NULL)
    425426      this->collisionHandles[i]->registerCollisionEvent(c);
     427  return true;
    426428}
    427429
Note: See TracChangeset for help on using the changeset viewer.