From a85b751f7a833dc853fb5dbfb744087b42e37fb3 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Wed, 11 Apr 2012 04:44:12 +0000 Subject: [PATCH] - Fix warnings warned by GCC. SVN r3552 (trunk) --- src/p_map.cpp | 3 ++- src/sound/music_midistream.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/p_map.cpp b/src/p_map.cpp index a7602b80f..8d1390591 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -177,7 +177,7 @@ void P_GetFloorCeilingZ(FCheckPosition &tmf, int flags) sector_t *sec; 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.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 noise; + if ((actor->flags & MF_NOBLOOD) || (actor->flags5 & MF5_NOBLOODDECALS) || (actor->flags2 & (MF2_INVULNERABLE|MF2_DORMANT)) || diff --git a/src/sound/music_midistream.cpp b/src/sound/music_midistream.cpp index d031caab5..30d8ba6f6 100644 --- a/src/sound/music_midistream.cpp +++ b/src/sound/music_midistream.cpp @@ -518,7 +518,7 @@ void MIDIStreamer::Stop() 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(); }