From 99d99ce5e574f4bd97edc3a0cb1775504434204a Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sat, 1 Aug 2009 01:56:16 +0000 Subject: [PATCH] - Changed A_SpawnFly to do nothing if reactiontime is 0. Reactiontime was originally a counter, so if it started at 0, A_SpawnFly would effectively never spawn anything. Fixes Dehacked patches that use A_SpawnSound to play a sound, since it calls A_SpawnFly. SVN r1741 (trunk) --- docs/rh-log.txt | 8 +++++++- src/g_doom/a_bossbrain.cpp | 5 ++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 4fda7c1cc0..ebf9cb6256 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,10 @@ -July 25, 2009 +July 31, 2009 +- Changed A_SpawnFly to do nothing if reactiontime is 0. Reactiontime was + originally a counter, so if it started at 0, A_SpawnFly would effectively + never spawn anything. Fixes Dehacked patches that use A_SpawnSound to + play a sound without shooting boss cubes, since it also calls A_SpawnFly. + +July 25, 2009 - Joystick devices now send key up events for any buttons that are held down when they are destroyed. - Changed the joystick enable-y menu items to be nonrepeatable so that you diff --git a/src/g_doom/a_bossbrain.cpp b/src/g_doom/a_bossbrain.cpp index 2833f891bb..a763e3cbfc 100644 --- a/src/g_doom/a_bossbrain.cpp +++ b/src/g_doom/a_bossbrain.cpp @@ -144,13 +144,12 @@ static void SpawnFly(AActor *self, const PClass *spawntype, FSoundID sound) AActor *targ; int r; - // [GZ] Should be more fiable than a countdown... - if (self->reactiontime > level.maptime) + // [GZ] Should be more viable than a countdown... + if (self->reactiontime == 0 || self->reactiontime > level.maptime) return; // still flying targ = self->target; - if (spawntype != NULL) { fog = Spawn (spawntype, targ->x, targ->y, targ->z, ALLOW_REPLACE);