[Jake2-commits] jake2/src/jake2/game GameTarget.java,1.3,1.4

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

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

Modified Files:
	GameTarget.java 
Log Message:
lightramp bug and imroved laser think

Index: GameTarget.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTarget.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GameTarget.java	22 Sep 2004 19:22:03 -0000	1.3
--- GameTarget.java	19 Feb 2005 21:18:44 -0000	1.4
***************
*** 223,227 ****
          }
  
!         if (GameBase.deathmatch.value != 9) {
              GameUtil.G_FreeEdict(self);
              return;
--- 223,227 ----
          }
  
!         if (GameBase.deathmatch.value != 0) {
              GameUtil.G_FreeEdict(self);
              return;
***************
*** 701,711 ****
              if (null == self.enemy) {
                  if (self.target != null) {
!                     ent = GameBase.G_Find(null, GameBase.findByTarget,
!                             self.target).o;
!                     if (ent == null)
                          GameBase.gi.dprintf(self.classname + " at "
                                  + Lib.vtos(self.s.origin) + ": " + self.target
                                  + " is a bad target\n");
!                     self.enemy = ent;
                  } else {
                      GameBase.G_SetMovedir(self.s.angles, self.movedir);
--- 701,711 ----
              if (null == self.enemy) {
                  if (self.target != null) {
!                     EdictIterator edit = GameBase.G_Find(null, GameBase.findByTarget,
!                             self.target);
!                     if (edit == null)
                          GameBase.gi.dprintf(self.classname + " at "
                                  + Lib.vtos(self.s.origin) + ": " + self.target
                                  + " is a bad target\n");
!                     self.enemy = edit.o;
                  } else {
                      GameBase.G_SetMovedir(self.s.angles, self.movedir);
***************
*** 741,751 ****
          public boolean think(edict_t self) {
  
!             char style[] = { ' ', ' ' };
! 
!             style[0] = (char) ('a' + (int) (self.movedir[0] + (GameBase.level.time - self.timestamp)
!                     / Defines.FRAMETIME * self.movedir[2]));
!             style[1] = 0;
              GameBase.gi.configstring(Defines.CS_LIGHTS + self.enemy.style,
!                     new String(style));
  
              if ((GameBase.level.time - self.timestamp) < self.speed) {
--- 741,749 ----
          public boolean think(edict_t self) {
  
!             char tmp[] = {(char) ('a' + (int) (self.movedir[0] + (GameBase.level.time - self.timestamp)
!                     / Defines.FRAMETIME * self.movedir[2]))};
!             
              GameBase.gi.configstring(Defines.CS_LIGHTS + self.enemy.style,
!                     new String(tmp));
  
              if ((GameBase.level.time - self.timestamp) < self.speed) {
***************
*** 776,783 ****
                      es = GameBase
                              .G_Find(es, GameBase.findByTarget, self.target);
                      e = es.o;
  
-                     if (e == null)
-                         break;
                      if (Lib.strcmp(e.classname, "light") != 0) {
                          GameBase.gi.dprintf(self.classname + " at "
--- 774,783 ----
                      es = GameBase
                              .G_Find(es, GameBase.findByTarget, self.target);
+                     
+                     if (es == null)
+                         break;
+                     
                      e = es.o;
  
                      if (Lib.strcmp(e.classname, "light") != 0) {
                          GameBase.gi.dprintf(self.classname + " at "