[Arianne-commits] stendhal/src/games/stendhal/server StendhalRPAction.java, 1.199, 1.200 StendhalRPWorld.java, 1.214, 1.215 StendhalRPZone.java, 1.184, 1.185

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

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

Modified Files:
	StendhalRPAction.java StendhalRPWorld.java StendhalRPZone.java 
Log Message:
Replaced set(), setX(), and setY() with setPosition().
Replaced setWidth() and setHeight() with setSize().


Index: StendhalRPAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPAction.java,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** StendhalRPAction.java	18 Aug 2007 18:39:30 -0000	1.199
--- StendhalRPAction.java	25 Aug 2007 01:20:14 -0000	1.200
***************
*** 496,501 ****
  
  		if (zone != null) {
! 			entity.setX(entity_x - zone.getX());
! 			entity.setY(entity_y - zone.getY());
  
  			logger.debug(entity.getTitle() + " pos would be (" + entity.getX()
--- 496,500 ----
  
  		if (zone != null) {
! 			entity.setPosition(entity_x - zone.getX(), entity_y - zone.getY());
  
  			logger.debug(entity.getTitle() + " pos would be (" + entity.getX()
***************
*** 605,610 ****
  
  									// We found a place!
! 									entity.setX(nx);
! 									entity.setY(ny);
  
  									found = true;
--- 604,608 ----
  
  									// We found a place!
! 									entity.setPosition(nx, ny);
  
  									found = true;
***************
*** 622,627 ****
  			}
  		} else {
! 			entity.setX(x);
! 			entity.setY(y);
  
  			found = true;
--- 620,624 ----
  			}
  		} else {
! 			entity.setPosition(x, y);
  
  			found = true;

Index: StendhalRPWorld.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPWorld.java,v
retrieving revision 1.214
retrieving revision 1.215
diff -C2 -d -r1.214 -r1.215
*** StendhalRPWorld.java	15 Aug 2007 08:14:14 -0000	1.214
--- StendhalRPWorld.java	25 Aug 2007 01:20:14 -0000	1.215
***************
*** 342,347 ****
  	public void createHouse(StendhalRPZone zone, int x, int y) throws Exception {
  		Portal door = new Portal();
! 		door.setX(x);
! 		door.setY(y);
  		Object dest = zone.assignPortalID(door);
  
--- 342,346 ----
  	public void createHouse(StendhalRPZone zone, int x, int y) throws Exception {
  		Portal door = new Portal();
! 		door.setPosition(x, y);
  		Object dest = zone.assignPortalID(door);
  
***************
*** 355,360 ****
  		Portal portal = new Portal();
  		portal.setDestination(zone.getID().getID(), dest);
! 		portal.setX(7);
! 		portal.setY(14);
  		portal.setIdentifier(Integer.valueOf(0));
  		house.assignRPObjectID(portal);
--- 354,358 ----
  		Portal portal = new Portal();
  		portal.setDestination(zone.getID().getID(), dest);
! 		portal.setPosition(7, 14);
  		portal.setIdentifier(Integer.valueOf(0));
  		house.assignRPObjectID(portal);

Index: StendhalRPZone.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPZone.java,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -d -r1.184 -r1.185
*** StendhalRPZone.java	15 Aug 2007 08:14:07 -0000	1.184
--- StendhalRPZone.java	25 Aug 2007 01:20:15 -0000	1.185
***************
*** 282,287 ****
  	public void placeObjectAtEntryPoint(Entity object) {
  		if (entryPoint != null) {
! 			object.setX(entryPoint.x);
! 			object.setY(entryPoint.y);
  		}
  	}
--- 282,286 ----
  	public void placeObjectAtEntryPoint(Entity object) {
  		if (entryPoint != null) {
! 			object.setPosition(entryPoint.x, entryPoint.y);
  		}
  	}
***************
*** 451,456 ****
  				Sheep sheep = new Sheep();
  				assignRPObjectID(sheep);
! 				sheep.setX(x);
! 				sheep.setY(y);
  				add(sheep);
  			} else if (clazz.contains("logic/creature")) {
--- 450,454 ----
  				Sheep sheep = new Sheep();
  				assignRPObjectID(sheep);
! 				sheep.setPosition(x, y);
  				add(sheep);
  			} else if (clazz.contains("logic/creature")) {
***************
*** 569,574 ****
  
  				assignRPObjectID(plantGrower);
! 				plantGrower.setX(x);
! 				plantGrower.setY(y);
  				add(plantGrower);
  
--- 567,571 ----
  
  				assignRPObjectID(plantGrower);
! 				plantGrower.setPosition(x, y);
  				add(plantGrower);
  
***************
*** 602,607 ****
  
  		assignRPObjectID(portal);
! 		portal.setX(x);
! 		portal.setY(y);
  		assignPortalID(portal);
  		add(portal);
--- 599,603 ----
  
  		assignRPObjectID(portal);
! 		portal.setPosition(x, y);
  		assignPortalID(portal);
  		add(portal);