[Jake2-commits] jake2/src/jake2/game edict_t.java,1.6,1.7 GameSpawn.java,1.11,1.12

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

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

Modified Files:
	edict_t.java GameSpawn.java 
Log Message:
fixed bug in ent.setFields() when spawning an edict_t

Index: GameSpawn.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSpawn.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** GameSpawn.java	6 Feb 2005 19:02:34 -0000	1.11
--- GameSpawn.java	19 Feb 2005 21:17:44 -0000	1.12
***************
*** 354,358 ****
              Com.Println("nextmap: " + value);
          if (!GameBase.st.set(key, value))
!             if (!ent.set(key, value))
                  GameBase.gi.dprintf("??? The key [" + key
                          + "] is not a field\n");
--- 354,358 ----
              Com.Println("nextmap: " + value);
          if (!GameBase.st.set(key, value))
!             if (!ent.setField(key, value))
                  GameBase.gi.dprintf("??? The key [" + key
                          + "] is not a field\n");
***************
*** 402,406 ****
                  continue;
  
!             ED_ParseField(keyname, com_token, ent);
  
          }
--- 402,406 ----
                  continue;
  
!             ED_ParseField(keyname.toLowerCase(), com_token, ent);
  
          }
***************
*** 472,475 ****
--- 472,477 ----
      public static void SpawnEntities(String mapname, String entities,
              String spawnpoint) {
+         
+         Com.dprintln("SpawnEntities(), mapname=" + mapname);
          edict_t ent;
          int inhibit;
***************
*** 553,558 ****
--- 555,563 ----
                              || ((GameBase.skill.value == 1) && (ent.spawnflags & Defines.SPAWNFLAG_NOT_MEDIUM) != 0)
                              || (((GameBase.skill.value == 2) || (GameBase.skill.value == 3)) && (ent.spawnflags & Defines.SPAWNFLAG_NOT_HARD) != 0)) {
+                         
+                         Com.DPrintf("->inhibited.\n");
                          GameUtil.G_FreeEdict(ent);
                          inhibit++;
+                         
                          continue;
                      }

Index: edict_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/edict_t.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** edict_t.java	22 Sep 2004 19:22:01 -0000	1.6
--- edict_t.java	19 Feb 2005 21:17:44 -0000	1.7
***************
*** 27,30 ****
--- 27,31 ----
  
  import jake2.*;
+ import jake2.qcommon.Com;
  import jake2.util.*;
  
***************
*** 281,285 ****
      /////////////////////////////////////////////////
  
!     public boolean set(String key, String value) {
  
          if (key.equals("classname")) {
--- 282,286 ----
      /////////////////////////////////////////////////
  
!     public boolean setField(String key, String value) {
  
          if (key.equals("classname")) {
***************
*** 349,352 ****
--- 350,354 ----
          if (key.equals("team")) {
              team = GameSpawn.ED_NewString(value);
+             Com.dprintln("Monster Team:" + team);
              return true;
          } // F_LSTRING),