zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-31 04:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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



SVN r790 (trunk)
This commit is contained in:
Christoph Oelckers 2008-03-09 11:05:25 +00:00
parent 2b721975dd
commit 4576022c8d
4 changed files with 637 additions and 630 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/rh-log.txt
View file

@ -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 March 8, 2008
- Fixed: If you wanted to make cleandep with MinGW, you had to specifically - Fixed: If you wanted to make cleandep with MinGW, you had to specifically
specify Makefile.mingw as the makefile to use. specify Makefile.mingw as the makefile to use.
@ -65,7 +69,7 @@ March 3, 2008
March 1, 2008 (Changes by Graf Zahl) March 1, 2008 (Changes by Graf Zahl)
- fixed: A_CountdownArg used 0 based indices although all uses of it assumed - fixed: A_CountdownArg used 0 based indices although all uses of it assumed
1-based. it is 1-based.
- added MF5_DONTRIP flag. - added MF5_DONTRIP flag.
- added CheckActorFloorTexture, CheckActorCeilingTexture and - added CheckActorFloorTexture, CheckActorCeilingTexture and
GetActorLightLevel ACS functions. GetActorLightLevel ACS functions.

2
src/sound/fmodsound.cpp
View file

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

3
src/sound/i_musicinterns.h
View file

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

1256
zdoom.vcproj
View file

File diff suppressed because it is too large Load diff