Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6151 in orxonox.OLD


Ignore:
Timestamp:
Dec 17, 2005, 6:08:28 PM (18 years ago)
Author:
bensch
Message:

trunk: more world cleanup

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/collision_detection/cd_engine.cc

    r6142 r6151  
    142142  if( likely( this->terrain != NULL))
    143143  {
    144     Quadtree* q = this->terrain->ssp->getQuadtree();
     144    Quadtree* q = dynamic_cast<Terrain*>(this->terrain)->ssp->getQuadtree();
    145145
    146146//    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());

  • trunk/src/story_entities/world.cc

    r6150 r6151  
    2828#include "camera.h"
    2929#include "environment.h"
     30#include "terrain.h"
    3031
    3132#include "test_entity.h"
    … …  
    405406ErrorMessage World::start()
    406407{
    407   this->bQuitOrxonox = false;
    408   this->bQuitCurrentGame = false;
     408  this->bQuitWorld = false;
    409409  this->mainLoop();
    410410}
    … …  
    418418{
    419419  PRINTF(3)("World::stop() - got stop signal\n");
    420   this->bQuitCurrentGame = true;
     420  this->bQuitWorld= true;
    421421}
    422422
    … …  
    669669  PRINTF(3)("World::mainLoop() - Entering main loop\n");
    670670
    671   while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* @todo implement pause */
     671  while(!this->bQuitWorld) /* @todo implement pause */
    672672  {
    673673    ++this->cycle;
    … …  
    676676      // Process input
    677677    this->handleInput ();
    678     if( this->bQuitCurrentGame || this->bQuitOrxonox)
     678    if( this->bQuitWorld)
    679679      break;
    680680      // Process time

  • trunk/src/story_entities/world.h

    r6150 r6151  
    77#define _WORLD_H
    88
    9 #include "stdincl.h"
    10 #include "comincl.h"
     9#include "sdlincl.h"
    1110#include "story_entity.h"
    12 #include "p_node.h"
    1311#include "object_manager.h"
    14 
    1512
    1613class WorldEntity;
    … …  
    5249  virtual void releaseLoadScreen();
    5350
    54   /* command node functions */
    55   bool command (Command* cmd);
    56 
    5751  /* interface to world */
    5852  void spawn (WorldEntity* entity);
    … …  
    8478    char* path;                         //!< The file from which this world is loaded
    8579
    86     bool   showPNodes;                  //!< if the PNodes should be visible.
    87     bool   showBV;                      //!< if the Bounding Volumes should be visible.
     80    // FLAGS //
     81    bool bQuitWorld;                    //!< quit only the current game and return to menu
     82    bool bPause;                        //!< pause mode
    8883
     84    bool showPNodes;                    //!< if the PNodes should be visible.
     85    bool showBV;                        //!< if the Bounding Volumes should be visible.
     86
     87    // TIMING //
    8988    Uint32 lastFrame;                   //!< last time of frame
    9089    Uint32 cycle;                       //!< The cycle we are in (starts with 0 and rises with every frame)
    … …  
    9392    float speed;                        //!< how fast the game flows
    9493    double gameTime;                    //!< this is where the game time is saved
    95     bool bQuitOrxonox;                  //!< quit this application
    96     bool bQuitCurrentGame;              //!< quit only the current game and return to menu
    97     bool bPause;                        //!< pause mode
    9894
    99     ObjectManager      objectManager;   //!< The ObjectManager of this World.
     95    // INTERNAL ENGINES
     96    ObjectManager objectManager;        //!< The ObjectManager of this World.
     97    Shell*     shell;
     98    OggPlayer* music;
    10099
    101100    GLMenuImageScreen* glmis;           //!< The Level-Loader Display
    102101
    103     Shell*     shell;
    104     OggPlayer* music;
    105102
    106   // IMPORTANT WORLD-ENTITIES
     103    // IMPORTANT ENTITIES
    107104    Camera* localCamera;                //!< The current Camera
     105    Player* localPlayer;                //!< The Player, you fly through the level.
     106
    108107    WorldEntity* sky;                   //!< The Environmental Heaven of orxonox @todo insert this to environment insted
    109108    Terrain* terrain;                   //!< The Terrain of the World.
    110 
    111     Player* localPlayer;                //!< The Player, you fly through the level.
    112109};
    113110

  • trunk/src/util/loading/game_loader.cc

    r6150 r6151  
    151151    case DEBUG_CAMPAIGN_0:
    152152      {
    153         // FIXME
    154153/*        Campaign* debugCampaign = new Campaign();
    155154
Note: See TracChangeset for help on using the changeset viewer.