Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

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

Location:
trunk/src/world_entities
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • 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.