zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 16:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed GCC compilation.

Browse source 
SVN r3028 (trunk)
This commit is contained in:
Christoph Oelckers 2010-12-12 07:59:38 +00:00
parent 24ab37613a
commit d851040ad6
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/CMakeLists.txt
View file

@ -707,7 +707,6 @@ add_executable( zdoom WIN32
p_xlat.cpp p_xlat.cpp
parsecontext.cpp parsecontext.cpp
po_man.cpp po_man.cpp
r_anim.cpp
r_bsp.cpp r_bsp.cpp
r_data.cpp r_data.cpp
r_draw.cpp r_draw.cpp
@ -840,6 +839,8 @@ add_executable( zdoom WIN32
sound/music_timidity_mididevice.cpp sound/music_timidity_mididevice.cpp
sound/music_win_mididevice.cpp sound/music_win_mididevice.cpp
sound/music_pseudo_mididevice.cpp sound/music_pseudo_mididevice.cpp
textures/animations.cpp
textures/anim_switches.cpp
textures/automaptexture.cpp textures/automaptexture.cpp
textures/bitmap.cpp textures/bitmap.cpp
textures/buildtexture.cpp textures/buildtexture.cpp

2
src/p_switch.cpp
View file

@ -346,7 +346,7 @@ void DActiveButton::Tick ()
def = TexMan.GetSwitch(def->PairIndex); def = TexMan.GetSwitch(def->PairIndex);
m_Frame = 65535; m_Frame = 65535;
S_Sound (m_X, m_Y, 0, CHAN_VOICE|CHAN_LISTENERZ, S_Sound (m_X, m_Y, 0, CHAN_VOICE|CHAN_LISTENERZ,
def->Sound != 0 ? def->Sound : FSoundID("switches/normbutn"), def->Sound != 0 ? FSoundID(def->Sound) : FSoundID("switches/normbutn"),
1, ATTN_STATIC); 1, ATTN_STATIC);
bFlippable = false; bFlippable = false;
} }