Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6634 in orxonox.OLD for trunk/src/story_entities


Ignore:
Timestamp:
Jan 21, 2006, 1:18:19 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

Location:
trunk/src/story_entities
Files:
7 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/story_entities/Makefile.am

    r6600 r6634  
    1212                story_entities/multi_player_world.cc \
    1313                story_entities/multi_player_world_data.cc \
    14                 story_entities/movie_loader.cc
     14                story_entities/movie_loader.cc \
     15                story_entities/simple_game_menu.cc
    1516
    1617StoryEntities_HEADERS_ = \
    … …  
    2526                story_entities/multi_player_world.h \
    2627                story_entities/multi_player_world_data.h \
    27                 story_entities/movie_loader.h
     28                story_entities/movie_loader.h \
     29                story_entities/simple_game_menu.h

  • trunk/src/story_entities/campaign_data.cc

    r6424 r6634  
    7676  LOAD_PARAM_START_CYCLE(root, element);
    7777  {
    78     StoryEntity* created = (StoryEntity*) Factory::fabricate(element);
     78    StoryEntity* created = dynamic_cast<StoryEntity*>(Factory::fabricate(element));
    7979    if( created != NULL)
    8080      this->addStoryEntity(created);

  • trunk/src/story_entities/game_world.cc

    r6619 r6634  
    114114  .describe("The Filename of this GameWorld (relative from the data-dir)");
    115115
     116//   LoadParam(root, "soundtrack", this->dataTank, GameWorldData, setSoundTrack);
     117
    116118  PRINTF(4)("Loaded GameWorld specific stuff\n");
    117119}
    … …  
    150152  if( getPath() == NULL)
    151153  {
    152     PRINTF(1)("GameWorld has no path specified for loading");
     154    PRINTF(1)("GameWorld has no path specified for loading\n");
    153155    return (ErrorMessage){213,"Path not specified","GameWorld::load()"};
    154156  }
    … …  
    241243void GameWorld::run()
    242244{
     245  /* start the music */
     246  if(this->dataTank->music != NULL)
     247    this->dataTank->music->playback();
     248
    243249  this->lastFrame = SDL_GetTicks ();
    244250  PRINTF(3)("GameWorld::mainLoop() - Entering main loop\n");

  • trunk/src/story_entities/game_world_data.cc

    r6626 r6634  
    7272  this->setClassID(CL_GAME_WORLD_DATA, "GameWorldData");
    7373
    74   this->localPlayer = NULL;
    75   this->localCamera = NULL;
    76 
    7774  this->glmis = NULL;
    7875
    … …  
    283280  if( this->sky != NULL)
    284281    this->localCamera->addChild(this->sky);
    285 
    286   /* sound loading */
    287   this->music = NULL;
    288   //(OggPlayer*)ResourceManager::getInstance()->load("sound/00-luke_grey_-_hypermode.ogg", OGG, RP_LEVEL);
    289   //music->playback();
    290282  SoundEngine::getInstance()->setListener(this->localCamera);
    291283}
    … …  
    310302}
    311303
     304
     305void GameWorldData::setSoundTrack(const char* name)
     306{
     307  PRINTF(3)("Setting Sound Track to %s\n", name);
     308  this->music = (OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);
     309}
     310
     311

  • trunk/src/story_entities/game_world_data.h

    r6424 r6634  
    4040    virtual ErrorMessage unloadData();
    4141
     42    /* interface functions */
     43    void setSoundTrack(const char* name);
    4244
    4345  protected:

  • trunk/src/story_entities/multi_player_world_data.cc

    r6498 r6634  
    263263
    264264
     265  Playable* pl = this->localPlayer->getControllable();
     266  PRINTF(0)("The current regisered playable is hid: %i\n", pl->getUniqueID());
     267
    265268
    266269  PNode* cam = State::getCameraTarget();

  • trunk/src/story_entities/story_entity.h

    r6512 r6634  
    2424
    2525//! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc...
    26 class StoryEntity : public BaseObject {
     26class StoryEntity : virtual public BaseObject {
    2727
    2828 public:
Note: See TracChangeset for help on using the changeset viewer.