[Arianne-commits] stendhal/src/games/stendhal/client/gui/wt CommandList.java, 1.12, 1.13 EntitySlot.java, 1.44, 1.45 GroundContainer.java, 1.37, 1.38

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

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

Modified Files:
	CommandList.java EntitySlot.java GroundContainer.java 
Log Message:
Replaced old action call code with direct view calls.


Index: CommandList.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/wt/CommandList.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CommandList.java	29 Apr 2007 13:53:21 -0000	1.12
--- CommandList.java	7 Jul 2007 03:41:39 -0000	1.13
***************
*** 82,90 ****
  	protected void doAction(String command) {
  		// tell the entity what happened
! 		if (contained) {
! 			entity.onAction(ActionType.getbyRep(command), baseObject, baseSlot);
! 		} else {
! 			entity.onAction(ActionType.getbyRep(command));
! 		}
  	}
  
--- 82,86 ----
  	protected void doAction(String command) {
  		// tell the entity what happened
! 		entity.getView().onAction(ActionType.getbyRep(command));
  	}
  

Index: GroundContainer.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/wt/GroundContainer.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** GroundContainer.java	23 Jun 2007 21:20:24 -0000	1.37
--- GroundContainer.java	7 Jul 2007 03:41:39 -0000	1.38
***************
*** 116,125 ****
  		EntityView view = screen.getEntityViewAt(point.getX(), point.getY());
  		if (view != null) {
- 			Entity entity = view.getEntity();
- 
  			if (ui.isCtrlDown()) {
! 				entity.onAction(entity.defaultAction());
  			} else if (ui.isShiftDown()) {
! 				entity.onAction(ActionType.LOOK);
  			}
  		}
--- 116,123 ----
  		EntityView view = screen.getEntityViewAt(point.getX(), point.getY());
  		if (view != null) {
  			if (ui.isCtrlDown()) {
! 				view.onAction();
  			} else if (ui.isShiftDown()) {
! 				view.onAction(ActionType.LOOK);
  			}
  		}
***************
*** 147,155 ****
  
  		if (view != null) {
- 			Entity entity = view.getEntity();
- 
  			// ... do the default action
! 			// String action = entity.defaultAction();
! 			entity.onAction(entity.defaultAction());
  		} else {
  			// moveto action
--- 145,150 ----
  
  		if (view != null) {
  			// ... do the default action
! 			view.onAction();
  		} else {
  			// moveto action

Index: EntitySlot.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/wt/EntitySlot.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** EntitySlot.java	23 Jun 2007 21:20:24 -0000	1.44
--- EntitySlot.java	7 Jul 2007 03:41:39 -0000	1.45
***************
*** 263,267 ****
  		// moveto events are not the default for items in a bag
  		if (parent instanceof Player) {
! 			entity.onAction(entity.defaultAction(), Integer.toString(parent.getID().getObjectID()), getName());
  			return true;
  		}
--- 263,267 ----
  		// moveto events are not the default for items in a bag
  		if (parent instanceof Player) {
! 			entity.getView().onAction();
  			return true;
  		}