zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added NULL check to S_StopSound

Browse source 
- Removed XLATCC references from wadsrc/makefile.mgw.


SVN r827 (trunk)
This commit is contained in:
Christoph Oelckers 2008-03-21 11:48:25 +00:00
parent 10920ffe75
commit d3e34d1edd
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/s_sound.cpp
View file

@ -1024,7 +1024,7 @@ void S_StopSound (fixed_t *pt, int channel)
void S_StopSound (AActor *ent, int channel) void S_StopSound (AActor *ent, int channel)
{ {
// No need to search every channel if we know it's not playing anything. // No need to search every channel if we know it's not playing anything.
if (ent->SoundChans & (1 << channel)) if (ent != NULL && ent->SoundChans & (1 << channel))
{ {
S_StopSound (&ent->x, channel); S_StopSound (&ent->x, channel);
} }

7
wadsrc/Makefile.mgw
View file

@ -1,5 +1,4 @@
MAKEWAD=../tools/makewad/makewad MAKEWAD=../tools/makewad/makewad
XLATCC=../tools/xlatcc/xlatcc
DEHSUPP=../tools/dehsupp/dehsupp DEHSUPP=../tools/dehsupp/dehsupp
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
@ -9,14 +8,14 @@ ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
export OSTYPE=msys export OSTYPE=msys
endif endif
wadmake: zdoom.lst $(MAKEWAD).exe $(XLATCC).exe $(DEHSUPP).exe wadmake: zdoom.lst $(MAKEWAD).exe $(DEHSUPP).exe
$(MAKEWAD) -make wadmake zdoom.lst $(MAKEWAD) -make wadmake zdoom.lst
clean: clean:
ifeq ($(OSTYPE),msys) ifeq ($(OSTYPE),msys)
rm -f wadmake zdoom.pk3 xlat/*.x dehsupp.lmp rm -f wadmake zdoom.pk3 dehsupp.lmp
else else
del /q /f wadmake zdoom.pk3 xlat\*.x dehsupp.lmp 2>nul del /q /f wadmake zdoom.pk3 dehsupp.lmp 2>nul
endif endif
../tools/makewad/makewad.exe: ../tools/makewad/makewad.exe: