[Arianne-commits] stendhal/src/games/stendhal/client GameObjects.java,1.66,1.67

[Miguel A. B. L. <ari...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13816/src/games/stendhal/client

Modified Files:
	GameObjects.java 
Log Message:
Adding ranged combat (1/3)

Index: GameObjects.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/GameObjects.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** GameObjects.java	30 Jan 2006 13:43:14 -0000	1.66
--- GameObjects.java	16 Feb 2006 14:07:53 -0000	1.67
***************
*** 58,104 ****
      
      register("npc",null,NPC.class);
-     register("npc","beggarnpc",NPC.class);
-     register("npc","buyernpc",NPC.class);
-     register("npc","butchernpc",NPC.class);
-     register("npc","journalistnpc",NPC.class);
-     register("npc","welcomernpc",NPC.class);
-     register("npc","orcbuyernpc",NPC.class);
-     register("npc","sellernpc",NPC.class);
-     register("npc","weaponsellernpc",NPC.class);
-     register("npc","tavernbarmaidnpc",NPC.class);
-     register("trainingdummy",null,TrainingDummy.class);
      
      register("food",null,Food.class);
      register("chest",null,Chest.class);
      
!     register("corpse","player",Corpse.class);
!     register("corpse","orc",Corpse.class);
!     register("corpse","troll",Corpse.class);
!     register("corpse","gargoyle",Corpse.class);
!     register("corpse","goblin",Corpse.class);
!     register("corpse","giant",Corpse.class);
!     register("corpse","kobold",Corpse.class);
!     register("corpse","animal",Corpse.class);
!     register("corpse","small_animal",Corpse.class);
!     register("corpse","giant_animal",Corpse.class);
!     register("corpse","dwarf",Corpse.class);
!     register("corpse","elf",Corpse.class);
!     register("corpse","skeleton",Corpse.class);
!     register("corpse","sheep",Corpse.class);
!     register("corpse","ratfolk",Corpse.class);
!     
      register("sign",null,Sign.class);
      
!     register("item","shield",Item.class);
!     register("item","club",Item.class);
!     register("item","sword",Item.class);
!     register("item","axe",Item.class);
!     register("item","armor",Item.class);
!     register("item","helmet",Item.class);
!     register("item","legs",Item.class);
!     register("item","boots",Item.class);
      register("item","food",StackableItem.class);
      register("item","drink",StackableItem.class);
      register("item","money",StackableItem.class);
  
      register("portal",null,Portal.class);
--- 58,74 ----
      
      register("npc",null,NPC.class);
      
      register("food",null,Food.class);
      register("chest",null,Chest.class);
      
!     register("corpse",null,Corpse.class);
! 
      register("sign",null,Sign.class);
      
!     register("item",null,Item.class);
      register("item","food",StackableItem.class);
      register("item","drink",StackableItem.class);
      register("item","money",StackableItem.class);
+     register("item","projectiles",StackableItem.class);
  
      register("portal",null,Portal.class);
***************
*** 151,154 ****
--- 121,131 ----
          
        Class entityClass=entityMap.get(new Pair<String,String>(type,eclass));
+       
+       if(entityClass==null)
+         {
+         // If there is no entity, let's try without using class.
+         entityClass=entityMap.get(new Pair<String,String>(type,null));
+         }
+         
        java.lang.reflect.Constructor constr=entityClass.getConstructor(GameObjects.class, RPObject.class);
        return (Entity)constr.newInstance(this,object);
***************
*** 165,178 ****
      try
        {
!       String type=object.get("type");
!       String eclass=null;
!       if(object.has("class"))
!         {
!         eclass=object.get("class");
!         }
!         
!       Class entityClass=entityMap.get(new Pair<String,String>(type,eclass));
!       java.lang.reflect.Constructor constr=entityClass.getConstructor(GameObjects.class, RPObject.class);
!       return ((Entity)constr.newInstance(this,object)).getSprite();
        }
      catch(Exception e)
--- 142,146 ----
      try
        {
!       return entityType(object).getSprite();
        }
      catch(Exception e)