mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-26 22:11:43 +00:00
- Added NULL check to S_StopSound
- Removed XLATCC references from wadsrc/makefile.mgw. SVN r827 (trunk)
This commit is contained in:
parent
10920ffe75
commit
d3e34d1edd
2 changed files with 4 additions and 5 deletions
|
@ -1024,7 +1024,7 @@ void S_StopSound (fixed_t *pt, int channel)
|
|||
void S_StopSound (AActor *ent, int channel)
|
||||
{
|
||||
// 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);
|
||||
}
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
MAKEWAD=../tools/makewad/makewad
|
||||
XLATCC=../tools/xlatcc/xlatcc
|
||||
DEHSUPP=../tools/dehsupp/dehsupp
|
||||
|
||||
ifneq ($(MAKECMDGOALS),clean)
|
||||
|
@ -9,14 +8,14 @@ ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
|
|||
export OSTYPE=msys
|
||||
endif
|
||||
|
||||
wadmake: zdoom.lst $(MAKEWAD).exe $(XLATCC).exe $(DEHSUPP).exe
|
||||
wadmake: zdoom.lst $(MAKEWAD).exe $(DEHSUPP).exe
|
||||
$(MAKEWAD) -make wadmake zdoom.lst
|
||||
|
||||
clean:
|
||||
ifeq ($(OSTYPE),msys)
|
||||
rm -f wadmake zdoom.pk3 xlat/*.x dehsupp.lmp
|
||||
rm -f wadmake zdoom.pk3 dehsupp.lmp
|
||||
else
|
||||
del /q /f wadmake zdoom.pk3 xlat\*.x dehsupp.lmp 2>nul
|
||||
del /q /f wadmake zdoom.pk3 dehsupp.lmp 2>nul
|
||||
endif
|
||||
|
||||
../tools/makewad/makewad.exe:
|
||||
|
|
Loading…
Reference in a new issue