FMOD: Cleanup

skyjake · Dec 12, 2011 · eae5323 · eae5323
1 parent 42e15e9
commit eae5323
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/doomsday/plugins/fmod/include/fmod_util.h b/doomsday/plugins/fmod/include/fmod_util.h
@@ -33,15 +33,17 @@
 #  define strnicmp strncasecmp
 #endif
 
-class FMODVector : public FMOD_VECTOR
-{
+#ifdef WIN32
+#  define strnicmp _strnicmp
+#endif
+
+class FMODVector : public FMOD_VECTOR {
 public:
     FMODVector(float _x = 0, float _y = 0, float _z = 0) {
         x = _x;
         y = _y;
         z = _z;
     }
-
     void set(const float* values) {
         x = values[0];
         y = values[1];

diff --git a/doomsday/plugins/fmod/src/fmod_music.cpp b/doomsday/plugins/fmod/src/fmod_music.cpp
@@ -50,7 +50,8 @@ static FMOD_RESULT F_CALLBACK musicCallback(FMOD_CHANNEL* chanPtr,
                                             void* /*commanddata1*/,
                                             void* /*commanddata2*/)
 {
-    assert(reinterpret_cast<FMOD::Channel*>(chanPtr) == music);
+    if(reinterpret_cast<FMOD::Channel*>(chanPtr) != music)
+        return FMOD_OK; // Safety check.
 
     switch(type)
     {