Sound now also global service

include/OpenRaider.h

@@ -57,8 +57,6 @@ public:
 
     //! \fixme should be private
 
-    Sound *mSound;
-
     bool mMapListFilled;
     std::vector<char *> mMapList;
 
@@ -88,7 +86,6 @@ private:
 
     void fillMapList();
 
-    bool mInit;
     bool mRunning;
     bool mFPS;
 

include/main.h

@@ -11,12 +11,14 @@
 #include "Game.h"
 #include "Menu.h"
 #include "OpenRaider.h"
+#include "Sound.h"
 #include "Window.h"
 
 Console    &getConsole();
 Game       &getGame();
 Menu       &getMenu();
 OpenRaider &getOpenRaider();
+Sound      &getSound();
 Window     &getWindow();
 
 /*!

src/Game.cpp

@@ -84,7 +84,7 @@ void Game::destroy() {
 
     mWorld.destroy();
     mRender->ClearWorld();
-    getOpenRaider().mSound->clear(); // Remove all previously loaded sounds
+    getSound().clear(); // Remove all previously loaded sounds
 }
 
 int Game::loadLevel(const char *level) {
@@ -265,7 +265,7 @@ int Game::command(std::vector<char *> *args) {
         }
     } else if (strcmp(cmd, "sound") == 0) {
         if (args->size() > 1) {
-            getOpenRaider().mSound->play(atoi(args->at(1)));
+            getSound().play(atoi(args->at(1)));
         } else {
             getConsole().print("Invalid use of sound command!");
             return -11;
@@ -390,7 +390,7 @@ void Game::processPakSounds()
     {
         mTombRaider.getSoundSample(i, &riffSz, &riff);
 
-        getOpenRaider().mSound->addWave(riff, riffSz, &id, getOpenRaider().mSound->SoundFlagsNone);
+        getSound().addWave(riff, riffSz, &id, getSound().SoundFlagsNone);
 
         //if (((i + 1) == TR_SOUND_F_PISTOL) && (id > 0))
         //{
@@ -404,7 +404,7 @@ void Game::processPakSounds()
         //pos[0] = sound[i].x;
         //pos[1] = sound[i].y;
         //pos[2] = sound[i].z;
-        //getOpenRaider().mSound->SourceAt(id, pos);
+        //getSound().SourceAt(id, pos);
 
         //printf(".");
         //fflush(stdout);

src/OpenRaider.cpp

@@ -25,7 +25,6 @@
 #include "OpenRaider.h"
 
 OpenRaider::OpenRaider() {
-    mInit = false;
     mRunning = false;
     mFPS = false;
     mBaseDir = NULL;
@@ -34,8 +33,6 @@ OpenRaider::OpenRaider() {
     mDataDir = NULL;
     mMapListFilled = false;
 
-    mSound = new Sound();
-
     for (int i = 0; i < ActionEventCount; i++)
         keyBindings[i] = unknown;
 
@@ -44,9 +41,6 @@ OpenRaider::OpenRaider() {
 }
 
 OpenRaider::~OpenRaider() {
-    if (mSound)
-        delete mSound;
-
     if (mBaseDir)
         delete mBaseDir;
 
@@ -307,14 +301,14 @@ int OpenRaider::set(const char *var, const char *value) {
             getConsole().print("set-audio-Error: Invalid value (%s)", value);
             return -4;
         }
-        mSound->setEnabled(audio);
+        getSound().setEnabled(audio);
     } else if (strcmp(var, "volume") == 0) {
         float vol = 1.0f;
         if (sscanf(value, "%f", &vol) != 1) {
             getConsole().print("set-volume-Error: Invalid value (%s)", value);
             return -5;
         }
-        mSound->setVolume(vol);
+        getSound().setVolume(vol);
     } else if (strcmp(var, "mouse_x") == 0) {
         float sense = 1.0f;
         if (sscanf(value, "%f", &sense) != 1) {
@@ -542,7 +536,6 @@ void OpenRaider::loadPakFolderRecursive(const char *dir) {
 
     assert(dir != NULL);
     assert(dir[0] != '\0');
-    assert(mInit == true);
     assert(mRunning == true);
 
     pakDir = opendir(dir);
@@ -589,7 +582,6 @@ void OpenRaider::loadPakFolderRecursive(const char *dir) {
 }
 
 void OpenRaider::fillMapList() {
-    assert(mInit == true);
     assert(mRunning == true);
 
     char *tmp = fullPath(mPakDir, '/');
@@ -598,21 +590,7 @@ void OpenRaider::fillMapList() {
     mMapListFilled = true;
 }
 
-int OpenRaider::initialize() {
-    assert(mInit == false);
-    assert(mRunning == false);
-
-    // Initialize sound
-    if (mSound->initialize() != 0)
-        return -1;
-
-    mInit = true;
-
-    return 0;
-}
-
 void OpenRaider::run() {
-    assert(mInit == true);
     assert(mRunning == false);
 
     static clock_t fpsSum = 0, fpsCount = 0;
@@ -665,7 +643,6 @@ void OpenRaider::run() {
 
 void OpenRaider::handleKeyboard(KeyboardButton key, bool pressed) {
     assert(key < unknown);
-    assert(mInit == true);
     assert(mRunning == true);
 
     if ((keyBindings[menuAction] == key) && pressed) {
@@ -692,7 +669,6 @@ void OpenRaider::handleKeyboard(KeyboardButton key, bool pressed) {
 void OpenRaider::handleText(char *text, bool notFinished) {
     assert(text != NULL);
     assert(text[0] != '\0');
-    assert(mInit == true);
     assert(mRunning == true);
 
     if ((getConsole().isVisible()) && (!getMenu().isVisible())) {
@@ -702,7 +678,6 @@ void OpenRaider::handleText(char *text, bool notFinished) {
 
 void OpenRaider::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released) {
     assert(button < unknown);
-    assert(mInit == true);
     assert(mRunning == true);
 
     if (getMenu().isVisible()) {
@@ -718,7 +693,6 @@ void OpenRaider::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton
 
 void OpenRaider::handleMouseMotion(int xrel, int yrel) {
     assert((xrel != 0) || (yrel != 0));
-    assert(mInit == true);
     assert(mRunning == true);
 
     if ((!getConsole().isVisible()) && (!getMenu().isVisible())) {
@@ -728,7 +702,6 @@ void OpenRaider::handleMouseMotion(int xrel, int yrel) {
 
 void OpenRaider::handleMouseScroll(int xrel, int yrel) {
     assert((xrel != 0) || (yrel != 0));
-    assert(mInit == true);
     assert(mRunning == true);
 
     if ((getConsole().isVisible()) && (!getMenu().isVisible())) {

src/main.cpp

@@ -18,6 +18,7 @@ Console *gConsole = NULL;
 Game *gGame = NULL;
 Menu *gMenu = NULL;
 OpenRaider *gOpenRaider = NULL;
+Sound *gSound = NULL;
 Window *gWindow = NULL;
 
 Console &getConsole() {
@@ -36,6 +37,10 @@ OpenRaider &getOpenRaider() {
     return *gOpenRaider;
 }
 
+Sound &getSound() {
+    return *gSound;
+}
+
 Window &getWindow() {
     return *gWindow;
 }
@@ -53,6 +58,9 @@ void cleanupHandler(void) {
     if (gOpenRaider)
         delete gOpenRaider;
 
+    if (gSound)
+        delete gSound;
+
     if (gWindow)
         delete gWindow;
 
@@ -101,6 +109,7 @@ int main(int argc, char *argv[]) {
     atexit(cleanupHandler);
     gOpenRaider = new OpenRaider();
     gWindow = new WindowSDL();
+    gSound = new Sound();
     gConsole = new Console();
     gMenu = new Menu();
     gGame = new Game();
@@ -135,17 +144,17 @@ int main(int argc, char *argv[]) {
         return 5;
     }
 
-    error = gOpenRaider->initialize();
+    error = gSound->initialize();
     if (error != 0) {
-        printf("Could not initialize OpenRaider (%d)!\n", error);
-        return 6;
+        printf("Could not initialize Sound (%d)!\n", error);
+        return 7;
     }
 
     // Initialize game engine
     error = gGame->initialize();
     if (error != 0) {
         printf("Could not initialize Game Engine (%d)!\n", error);
-        return 7;
+        return 8;
     }
 
     gMenu->setVisible(true);