zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fix warnings warned by GCC. 

SVN r3552 (trunk)
This commit is contained in:
Randy Heit 2012-04-11 04:44:12 +00:00
parent 06de818059
commit a85b751f7a
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/p_map.cpp
View File

@ -177,7 +177,7 @@ void P_GetFloorCeilingZ(FCheckPosition &tmf, int flags)
sector_t *sec; sector_t *sec;
if (!(flags & FFCF_ONLYSPAWNPOS)) if (!(flags & FFCF_ONLYSPAWNPOS))
{ {
sec = !(flags & FFCF_SAMESECTOR) ? P_PointInSector (tmf.x, tmf.y) : sec = tmf.thing->Sector; sec = !(flags & FFCF_SAMESECTOR) ? P_PointInSector (tmf.x, tmf.y) : tmf.thing->Sector;
tmf.floorsector = sec; tmf.floorsector = sec;
tmf.ceilingsector = sec; tmf.ceilingsector = sec;
@ -3658,6 +3658,7 @@ void P_TraceBleed (int damage, fixed_t x, fixed_t y, fixed_t z, AActor *actor, a
int count; int count;
int noise; int noise;
if ((actor->flags & MF_NOBLOOD) || if ((actor->flags & MF_NOBLOOD) ||
(actor->flags5 & MF5_NOBLOODDECALS) || (actor->flags5 & MF5_NOBLOODDECALS) ||
(actor->flags2 & (MF2_INVULNERABLE|MF2_DORMANT)) || (actor->flags2 & (MF2_INVULNERABLE|MF2_DORMANT)) ||

2
src/sound/music_midistream.cpp
View File

@ -518,7 +518,7 @@ void MIDIStreamer::Stop()
bool MIDIStreamer::IsPlaying() bool MIDIStreamer::IsPlaying()
{ {
if (m_Status != STATE_Stopped && MIDI == NULL || (EndQueued != 0 && EndQueued < 4)) if (m_Status != STATE_Stopped && (MIDI == NULL || (EndQueued != 0 && EndQueued < 4)))
{ {
Stop(); Stop();
} }