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 25a7fd8adbcb1a40b707c6381a769b2e59b58c01
Author: zturtle...@gmail.com 
<zturtle...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Sat May 31 00:52:00 2014 +0000

    All: Fix func_bats to work with Tequila's fast move case unsetting 
SVF_NOCLIENT
---
 MP/code/game/g_mover.c | 8 ++++----
 SP/code/game/g_mover.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/MP/code/game/g_mover.c b/MP/code/game/g_mover.c
index b8fe712..901534f 100644
--- a/MP/code/game/g_mover.c
+++ b/MP/code/game/g_mover.c
@@ -3071,6 +3071,10 @@ void FuncBatsReached( gentity_t *self ) {
 
        Reached_Train( self );
 
+       // disable this to debug path
+       self->r.svFlags |= SVF_NOCLIENT;
+       self->r.contents = 0;
+
        if ( !self->nextTrain || !self->nextTrain->target ) {
                self->active = qfalse;   // remove the bats at next point
                return;
@@ -3178,10 +3182,6 @@ void FuncBatsActivate( gentity_t *self, gentity_t * 
other, gentity_t * activator
                self->reached = FuncBatsReached;
                self->blocked = 0;
 
-               // disable this to debug path
-               self->r.svFlags |= SVF_NOCLIENT;
-               self->r.contents = 0;
-
                self->use = FuncBatsActivate;   // make sure this stays the same
 
        } else {    // second use kills bats
diff --git a/SP/code/game/g_mover.c b/SP/code/game/g_mover.c
index 5b89ecf..9e8ba89 100644
--- a/SP/code/game/g_mover.c
+++ b/SP/code/game/g_mover.c
@@ -3088,6 +3088,10 @@ void FuncBatsReached( gentity_t *self ) {
 
        Reached_Train( self );
 
+       // disable this to debug path
+       self->r.svFlags |= SVF_NOCLIENT;
+       self->r.contents = 0;
+
        if ( !self->nextTrain || !self->nextTrain->target ) {
                self->active = 2;   // remove the bats at next point
                return;
@@ -3205,10 +3209,6 @@ void FuncBatsActivate( gentity_t *self, gentity_t * 
other, gentity_t * activator
                self->reached = FuncBatsReached;
                self->blocked = 0;
 
-               // disable this to debug path
-               self->r.svFlags |= SVF_NOCLIENT;
-               self->r.contents = 0;
-
                self->use = FuncBatsActivate;   // make sure this stays the same
 
        } else {    // second use kills bats

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

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to