Some small changes.

Using namespace for file-scope declarations.
SoundNull now pretends to have even more functionality.
Mousegrab state can be queried. Should now grab more reliably.

ChangeLog.md

@@ -5,6 +5,7 @@
     [ 20140728 ]
     * Implemented binary file reading utility in preparation of
       TombRaider.cpp/h rewrite
+    * Added clibs/commander dependency used for command line argument parsing
 
     [ 20140714 ]
     * Fixed a bug where std::sort did not use the objects operator<

include/SoundNull.h

@@ -95,6 +95,9 @@ public:
      * \param source sound source to stop
      */
     virtual void stop(unsigned long source);
+
+private:
+    unsigned long sources;
 };
 
 #endif

include/Window.h

@@ -22,6 +22,8 @@ public:
 
     virtual void setMousegrab(bool grab) = 0;
 
+    virtual bool getMousegrab() = 0;
+
     virtual int initialize() = 0;
 
     virtual void eventHandling() = 0;

include/WindowSDL.h

@@ -34,6 +34,8 @@ public:
 
     virtual void setMousegrab(bool grab);
 
+    virtual bool getMousegrab();
+
     virtual int initialize();
 
     virtual void eventHandling();

src/OpenRaider.cpp

@@ -148,8 +148,8 @@ void OpenRaider::frame() {
     // Calculate FPS display value
     fpsCount++;
     fpsSum += (systemTimerGet() - startTime);
-    if (fpsSum >= 500) {
-        // Update every 500ms
+    if (fpsSum >= 250) {
+        // Update every 250ms
         fps = (int)((float)fpsCount * (1000.0f / (float)fpsSum));
         fpsCount = fpsSum = 0;
     }
@@ -177,9 +177,9 @@ void OpenRaider::handleKeyboard(KeyboardButton key, bool pressed) {
         getMenu().handleKeyboard(key, pressed);
     }
 
-    //! \fixme Menu/Console visibility could also change in other ways,
-    // that should still result in the correct mousegrab state
-    getWindow().setMousegrab(!(getMenu().isVisible() || getConsole().isVisible()));
+    bool mousegrab = !(getMenu().isVisible() || getConsole().isVisible());
+    if (mousegrab != getWindow().getMousegrab())
+        getWindow().setMousegrab(mousegrab);
 }
 
 void OpenRaider::handleText(char *text, bool notFinished) {
@@ -190,6 +190,10 @@ void OpenRaider::handleText(char *text, bool notFinished) {
     if ((getConsole().isVisible()) && (!getMenu().isVisible())) {
         getConsole().handleText(text, notFinished);
     }
+
+    bool mousegrab = !(getMenu().isVisible() || getConsole().isVisible());
+    if (mousegrab != getWindow().getMousegrab())
+        getWindow().setMousegrab(mousegrab);
 }
 
 void OpenRaider::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released) {
@@ -205,6 +209,10 @@ void OpenRaider::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton
             }
         }
     }
+
+    bool mousegrab = !(getMenu().isVisible() || getConsole().isVisible());
+    if (mousegrab != getWindow().getMousegrab())
+        getWindow().setMousegrab(mousegrab);
 }
 
 void OpenRaider::handleMouseMotion(int xrel, int yrel) {
@@ -214,6 +222,10 @@ void OpenRaider::handleMouseMotion(int xrel, int yrel) {
     if ((!getConsole().isVisible()) && (!getMenu().isVisible())) {
         getGame().handleMouseMotion(xrel, yrel);
     }
+
+    bool mousegrab = !(getMenu().isVisible() || getConsole().isVisible());
+    if (mousegrab != getWindow().getMousegrab())
+        getWindow().setMousegrab(mousegrab);
 }
 
 void OpenRaider::handleMouseScroll(int xrel, int yrel) {
@@ -223,5 +235,9 @@ void OpenRaider::handleMouseScroll(int xrel, int yrel) {
     if ((getConsole().isVisible()) && (!getMenu().isVisible())) {
         getConsole().handleMouseScroll(xrel, yrel);
     }
+
+    bool mousegrab = !(getMenu().isVisible() || getConsole().isVisible());
+    if (mousegrab != getWindow().getMousegrab())
+        getWindow().setMousegrab(mousegrab);
 }
 

src/SoundNull.cpp

@@ -9,6 +9,7 @@
 #include "SoundNull.h"
 
 SoundNull::SoundNull() {
+    sources = 0;
 }
 
 SoundNull::~SoundNull() {
@@ -25,29 +26,37 @@ void SoundNull::setVolume(float vol) {
 }
 
 unsigned long SoundNull::registeredSources() {
-    return 0;
+    return sources;
 }
 
 void SoundNull::clear() {
+    sources = 0;
 }
 
 void SoundNull::listenAt(float pos[3], float angle[3]) {
 }
 
 void SoundNull::sourceAt(unsigned long source, float pos[3]) {
+    assert(source < sources);
 }
 
 int SoundNull::addFile(const char *filename, unsigned long *source, unsigned int flags) {
+    *source = sources;
+    sources++;
     return 0;
 }
 
 int SoundNull::addWave(unsigned char *wav, unsigned int length, unsigned long *source, unsigned int flags) {
+    *source = sources;
+    sources++;
     return 0;
 }
 
 void SoundNull::play(unsigned long source) {
+    assert(source < sources);
 }
 
 void SoundNull::stop(unsigned long source) {
+    assert(source < sources);
 }
 

src/WindowSDL.cpp

@@ -70,6 +70,10 @@ void WindowSDL::setMousegrab(bool grab) {
     }
 }
 
+bool WindowSDL::getMousegrab() {
+    return mMousegrab;
+}
+
 int WindowSDL::initialize() {
     assert(mInit == false);
 

src/main.cpp

@@ -96,21 +96,24 @@ World &getWorld() {
     return gWorld;
 }
 
-static void cleanupHandler(void) {
+namespace {
+    bool configFileWasSpecified = false;
+
+    void configFileCallback(command_t *self) {
+        getOpenRaider().loadConfig(self->arg);
+        configFileWasSpecified = true;
+    }
+
+    void cleanupHandler(void) {
 #ifdef DEBUG
-    std::cout << std::endl;
-    std::cout << "Thanks for testing " << VERSION << std::endl;
-    std::cout << "Build date: " << __DATE__ << " @ " << __TIME__ << std::endl;
-    std::cout << "Build host: " << BUILD_HOST << std::endl;
-    std::cout << "Web site  : http://github.com/xythobuz/OpenRaider" << std::endl;
-    std::cout << "Contact   : xythobuz@xythobuz.de" << std::endl;
+        std::cout << std::endl;
+        std::cout << "Thanks for testing " << VERSION << std::endl;
+        std::cout << "Build date: " << __DATE__ << " @ " << __TIME__ << std::endl;
+        std::cout << "Build host: " << BUILD_HOST << std::endl;
+        std::cout << "Web site  : http://github.com/xythobuz/OpenRaider" << std::endl;
+        std::cout << "Contact   : xythobuz@xythobuz.de" << std::endl;
 #endif
-}
-
-static bool configFileWasSpecified = false;
-static void configFileCallback(command_t *self) {
-    getOpenRaider().loadConfig(self->arg);
-    configFileWasSpecified = true;
+    }
 }
 
 int main(int argc, char *argv[]) {