[Arianne-commits] stendhal/src/games/stendhal/client GameObjects.java, 1.132, 1.133

[ChadF <ch...@us...>]

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

Modified Files:
	GameObjects.java 
Log Message:
Replaced some legacy Entity calls with direct calls to views.
Removed Text object from Entity hierarchy.


Index: GameObjects.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/GameObjects.java,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** GameObjects.java	29 Apr 2007 13:30:02 -0000	1.132
--- GameObjects.java	1 May 2007 00:31:43 -0000	1.133
***************
*** 216,220 ****
  			Entity entity = it.previous();
  
! 			if (entity.getDrawedArea().contains(x, y)) {
  				return entity;
  			}
--- 216,220 ----
  			Entity entity = it.previous();
  
! 			if (entity.getView().getDrawnArea().contains(x, y)) {
  				return entity;
  			}
***************
*** 230,234 ****
  
  			if (entity.getArea().contains(x, y)) {
! 				if (entity.getType().compareTo("creature") == 0) {
  					continue;
  				}
--- 230,234 ----
  
  			if (entity.getArea().contains(x, y)) {
! 				if (entity.getType().equals("creature")) {
  					continue;
  				}
***************
*** 242,247 ****
  			Entity entity = it.previous();
  
! 			if (entity.getDrawedArea().contains(x, y)) {
! 				if (entity.getType().compareTo("creature") == 0) {
  					continue;
  				}
--- 242,247 ----
  			Entity entity = it.previous();
  
! 			if (entity.getView().getDrawnArea().contains(x, y)) {
! 				if (entity.getType().equals("creature")) {
  					continue;
  				}
***************
*** 331,334 ****
--- 331,339 ----
  
  		if(object.getRPClass().subclassOf("entity")) {
+ 			if(!object.has("type")) {
+ 				logger.error("Entity without type: " + object);
+ 				return;
+ 			}
+ 
  			if (!object.has("server-only")) {
  				Entity entity = add(object);