[iortcw] 110/497: SP: Revert change to g_mover in r408 (Fix freezing spirits on end map)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 1d9a07f2c7fe6a16bcacf3c53a14600b39b4c919
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Wed May 7 01:35:21 2014 +0000

    SP: Revert change to g_mover in r408 (Fix freezing spirits on end map)
---
 SP/code/game/g_mover.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/SP/code/game/g_mover.c b/SP/code/game/g_mover.c
index 4af0b35..5b89ecf 100644
--- a/SP/code/game/g_mover.c
+++ b/SP/code/game/g_mover.c
@@ -3080,7 +3080,7 @@ target = (used for end map) distance check from this entity to enable spawning i
 delay = (end map) wait in seconds this long after player steps outside, before spawning spirits
 */
 void FuncBatsReached( gentity_t *self ) {
-	if ( !self->active ) {
+	if ( self->active == 2 ) {
 		self->nextthink = -1;
 		self->think = 0;
 		return;
@@ -3089,9 +3089,16 @@ void FuncBatsReached( gentity_t *self ) {
 	Reached_Train( self );
 
 	if ( !self->nextTrain || !self->nextTrain->target ) {
-		self->active = qfalse;   // remove the bats at next point
+		self->active = 2;   // remove the bats at next point
 		return;
 	}
+
+//	if(self->nextTrain) {
+//		if(Q_stricmp(self->nextTrain->classname, "path_corner")) {
+//			self->active = 2;
+//			return;
+//		}
+//	}
 }
 
 // each bat calls this every server frame, so it moves towards it's ideal position
@@ -3139,7 +3146,7 @@ void BatMoveThink( gentity_t *bat ) {
 			}
 		}
 */
-	} else if ( !owner->active || !owner->inuse ) {
+	} else if ( owner->active == 2 || !owner->inuse ) {
 		// owner has finished
 		G_FreeEntity( bat );
 		return;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git