[Jake2-commits] jake2/src/jake2/game GameTrigger.java,1.6,1.7

[Rene S. <sa...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/game
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22748/src/jake2/game

Modified Files:
	GameTrigger.java 
Log Message:
bugfix in trigger counter use, sequence was completed too early, some cosmetic done.

Index: GameTrigger.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTrigger.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GameTrigger.java	20 Nov 2005 22:18:33 -0000	1.6
--- GameTrigger.java	14 Dec 2005 21:08:03 -0000	1.7
***************
*** 394,406 ****
      };
  
!     /*
!      * ==============================================================================
!      * 
!      * trigger_counter
!      * 
!      * ==============================================================================
!      */
! 
!     /*
       * QUAKED trigger_counter (.5 .5 .5) ? nomessage Acts as an intermediary for
       * an action that takes multiple inputs.
--- 394,398 ----
      };
  
!     /**
       * QUAKED trigger_counter (.5 .5 .5) ? nomessage Acts as an intermediary for
       * an action that takes multiple inputs.
***************
*** 421,425 ****
              self.count--;
  
!             if (self.count == 0) {
                  if (0 == (self.spawnflags & 1)) {
                      GameBase.gi.centerprintf(activator, self.count
--- 413,417 ----
              self.count--;
  
!             if (self.count != 0) {
                  if (0 == (self.spawnflags & 1)) {
                      GameBase.gi.centerprintf(activator, self.count
***************
*** 480,492 ****
      };
  
-     /*
-      * ==============================================================================
-      * 
-      * trigger_hurt
-      * 
-      * ==============================================================================
-      */
  
!     /*
       * QUAKED trigger_hurt (.5 .5 .5) ? START_OFF TOGGLE SILENT NO_PROTECTION
       * SLOW Any entity that touches this will be hurt.
--- 472,477 ----
      };
  
  
!     /**
       * QUAKED trigger_hurt (.5 .5 .5) ? START_OFF TOGGLE SILENT NO_PROTECTION
       * SLOW Any entity that touches this will be hurt.