- fixed: The release build still linked to the old FMOD version.

- fixed: SPCSong only works for Win32 so its definition must be excluded for Linux.



SVN r790 (trunk)

docs/rh-log.txt

@@ -1,3 +1,7 @@
+March 9, 2008 (Changes by Graf Zahl)
+- fixed: The release build still linked to the old FMOD version.
+- fixed: SPCSong only works for Win32 so its definition must be excluded for Linux.
+
 March 8, 2008
 - Fixed: If you wanted to make cleandep with MinGW, you had to specifically
   specify Makefile.mingw as the makefile to use.
@@ -65,7 +69,7 @@ March 3, 2008
 
 March 1, 2008 (Changes by Graf Zahl)
 - fixed: A_CountdownArg used 0 based indices although all uses of it assumed
-  1-based.
+  it is 1-based.
 - added MF5_DONTRIP flag.
 - added CheckActorFloorTexture, CheckActorCeilingTexture and
   GetActorLightLevel ACS functions.

src/sound/fmodsound.cpp

@@ -952,7 +952,7 @@ void FMODSoundRenderer::StopSound(long handle)
 	{
 		ChannelMap[handle].channelID->stop();
 		UncheckSound(&S_sfx[ChannelMap[handle].soundID], ChannelMap[handle].bIsLooping);
-		ChannelMap[handle].soundID = NULL;
+		ChannelMap[handle].soundID = 0;
 	}
 }
 

src/sound/i_musicinterns.h

@@ -250,6 +250,7 @@ protected:
 	int m_LastPos;
 };
 
+#ifdef _WIN32
 // SPC file, rendered with SNESAPU.DLL and streamed through FMOD ------------
 
 typedef void (__stdcall *SNESAPUInfo_TYPE) (DWORD*, DWORD*, DWORD*);
@@ -296,6 +297,8 @@ protected:
 	EmuAPU_TYPE EmuAPU;
 };
 
+#endif
+
 // MIDI file played with Timidity and possibly streamed through FMOD --------
 
 class TimiditySong : public StreamSong