[Jake2-commits] jake2/src/jake2/client Menu.java,1.11,1.12 M.java,1.5,1.6

[Holger Z. <hz...@us...>]

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

Modified Files:
	Menu.java M.java 
Log Message:
remove some unreferenced functions

Index: Menu.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Menu.java	4 Oct 2004 12:50:37 -0000	1.11
--- Menu.java	7 Oct 2004 14:13:00 -0000	1.12
***************
*** 3730,3735 ****
      static boolean IconOfSkinExists(String skin, String pcxfiles[],
              int npcxfiles) {
!         int i;
!         //char scratch[1024];
          String scratch;
  
--- 3730,3734 ----
      static boolean IconOfSkinExists(String skin, String pcxfiles[],
              int npcxfiles) {
!  
          String scratch;
  
***************
*** 3743,3748 ****
              scratch += "_i.pcx";
  
!         for (i = 0; i < npcxfiles; i++) {
!             if (Lib.strcmp(pcxfiles[i], scratch) == 0)
                  return true;
          }
--- 3742,3747 ----
              scratch += "_i.pcx";
  
!         for (int i = 0; i < npcxfiles; i++) {
!             if (pcxfiles[i].equals(scratch))
                  return true;
          }
***************
*** 3900,3914 ****
           * * sort by male, female, then alphabetical
           */
!         if (Lib.strcmp(a.directory, "male") == 0)
              return -1;
!         else if (Lib.strcmp(b.directory, "male") == 0)
              return 1;
  
!         if (Lib.strcmp(a.directory, "female") == 0)
              return -1;
!         else if (Lib.strcmp(b.directory, "female") == 0)
              return 1;
  
!         return Lib.strcmp(a.directory, b.directory);
      }
  
--- 3899,3913 ----
           * * sort by male, female, then alphabetical
           */
!         if (a.directory.equals("male"))
              return -1;
!         else if (b.directory.equals("male"))
              return 1;
  
!         if (a.directory.equals("female"))
              return -1;
!         else if (b.directory.equals("female"))
              return 1;
  
!         return a.directory.compareTo(b.directory);
      }
  

Index: M.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/M.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** M.java	22 Sep 2004 19:22:07 -0000	1.5
--- M.java	7 Oct 2004 14:13:07 -0000	1.6
***************
*** 492,500 ****
          // (they spray too much), get mad at them
          if (((targ.flags & (Defines.FL_FLY | Defines.FL_SWIM)) == (attacker.flags & (Defines.FL_FLY | Defines.FL_SWIM)))
!                 && (Lib.strcmp(targ.classname, attacker.classname) != 0)
!                 && (Lib.strcmp(attacker.classname, "monster_tank") != 0)
!                 && (Lib.strcmp(attacker.classname, "monster_supertank") != 0)
!                 && (Lib.strcmp(attacker.classname, "monster_makron") != 0)
!                 && (Lib.strcmp(attacker.classname, "monster_jorg") != 0)) {
              if (targ.enemy != null && targ.enemy.client != null)
                  targ.oldenemy = targ.enemy;
--- 492,500 ----
          // (they spray too much), get mad at them
          if (((targ.flags & (Defines.FL_FLY | Defines.FL_SWIM)) == (attacker.flags & (Defines.FL_FLY | Defines.FL_SWIM)))
!                 && (!(targ.classname.equals(attacker.classname)))
!                 && (!(attacker.classname.equals("monster_tank")))
!                 && (!(attacker.classname.equals("monster_supertank")))
!                 && (!(attacker.classname.equals("monster_makron")))
!                 && (!(attacker.classname.equals("monster_jorg")))) {
              if (targ.enemy != null && targ.enemy.client != null)
                  targ.oldenemy = targ.enemy;