Changeset 702

Timestamp:

Dec 27, 2007, 6:00:34 PM (16 years ago)

Author:

nicolasc

Message:

removed some deprecated alut stuff - plz test on windows

Location:

code/branches/FICN/src

Files:

• CMakeLists.txt (modified) (1 diff)
• audio/AudioBuffer.cc (modified) (1 diff)
• loader/LevelLoader.cc (modified) (1 diff)

code/branches/FICN/src/CMakeLists.txt

@@ -8 +8 @@
 ADD_SUBDIRECTORY(audio)
 ADD_SUBDIRECTORY(tinyxml)
-
-# xml gets handled by loader

code/branches/FICN/src/audio/AudioBuffer.cc

@@ -38 +38 @@
                         loaded=AL_FALSE;
 
-    //FIXME deprecated
-                alutLoadWAVFile((ALbyte*)fileName.c_str(), &format, &data, &size, &freq, &loop);
+    //FIXME deprecated; seems unneeded
+//              alutLoadWAVFile((ALbyte*)fileName.c_str(), &format, &data, &size, &freq, &loop);
                 alBufferData(buffer, format, data, size, freq);
-    //FIXME deprecated
-                alutUnloadWAV(format, data, size, freq);
+    //FIXME deprecated; seems unneeded
+//              alutUnloadWAV(format, data, size, freq);
 
                 // Do another error check and return.
                 if(alGetError() != AL_NO_ERROR)
                         loaded=AL_FALSE;
-
-                loaded=AL_TRUE;
+    else
+                  loaded=AL_TRUE;
         }
 

code/branches/FICN/src/loader/LevelLoader.cc

@@ -103 +103 @@
 
       Ogre::OverlayManager& omgr = Ogre::OverlayManager::getSingleton();
-      Ogre::Overlay* mLoadOverlay; // FIXME: mey be uninitialized
+      Ogre::Overlay* mLoadOverlay; // FIXME: may be uninitialized
 
       // Set loading screen