Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4504 in orxonox.OLD for orxonox/trunk/src/story_entities/world.cc


Ignore:
Timestamp:
Jun 4, 2005, 12:38:30 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the SoundEngine into the Trunk.
merged file by file, but merged all the files in favor of the new trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/story_entities/world.cc

    r4502 r4504  
    6565#include "event_handler.h"
    6666
     67#include "sound_engine.h"
     68
    6769using namespace std;
    6870
     
    182184  delete this->particleEngine;
    183185  TextEngine::getInstance()->flush();
     186  SoundEngine::getInstance()->flushAllBuffers();
     187
    184188  delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
    185189  delete PhysicsEngine::getInstance();
     
    468472  this->spawn(terrain);
    469473
     474  SoundEngine::getInstance()->setListener(this->localCamera);
    470475
    471476
     
    10791084  this->garbageCollector->update();
    10801085  this->nullParent->update (this->dtS);
     1086
     1087  SoundEngine::getInstance()->update();
    10811088}
    10821089
Note: See TracChangeset for help on using the changeset viewer.