From: ChadF <ch...@us...> - 2007-08-30 01:22:36
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/wt In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv27167/src/games/stendhal/client/gui/wt Modified Files: EntitySlot.java MoveableEntityContainer.java Log Message: Removed view reference from entity model. Index: MoveableEntityContainer.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/wt/MoveableEntityContainer.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** MoveableEntityContainer.java 8 Jul 2007 01:59:12 -0000 1.21 --- MoveableEntityContainer.java 30 Aug 2007 01:22:30 -0000 1.22 *************** *** 13,20 **** --- 13,24 ---- package games.stendhal.client.gui.wt; + import games.stendhal.client.GameScreen; import games.stendhal.client.entity.Entity; + import games.stendhal.client.gui.j2d.entity.Entity2DView; + import games.stendhal.client.gui.j2d.entity.StackableItem2DView; import games.stendhal.client.gui.wt.core.WtDraggable; import java.awt.Graphics; + import java.awt.Graphics2D; import java.awt.Point; *************** *** 34,37 **** --- 38,46 ---- private Entity entity; + /** + * The entity view. + */ + private Entity2DView view; + /** *************** *** 89,92 **** --- 98,117 ---- /** drag started */ public boolean dragStarted() { + view = GameScreen.get().createView(entity); + + if(view != null) { + view.setContained(true); + + /* + * Hide quantity until it can be made context + * sensitive to drag modifiers. + * + * TODO: Find a better way + */ + if(view instanceof StackableItem2DView) { + ((StackableItem2DView) view).setShowQuantity(false); + } + } + return true; } *************** *** 94,97 **** --- 119,127 ---- /** drag finished */ public boolean dragFinished(Point p) { + if(view != null) { + view.release(); + view = null; + } + return true; } *************** *** 108,112 **** */ public void drawDragged(Graphics g) { ! entity.getView().getSprite().draw(g, x, y); } } --- 138,148 ---- */ public void drawDragged(Graphics g) { ! if(view != null) { ! Graphics2D cg = (Graphics2D) g.create(); ! ! cg.translate(x, y); ! view.draw(cg); ! cg.dispose(); ! } } } Index: EntitySlot.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/wt/EntitySlot.java,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** EntitySlot.java 11 Aug 2007 19:42:05 -0000 1.55 --- EntitySlot.java 30 Aug 2007 01:22:30 -0000 1.56 *************** *** 148,153 **** if(entity != null) { ! view = entity.getView(); ! view.setContained(true); } else { view = null; --- 148,156 ---- if(entity != null) { ! view = GameScreen.get().createView(entity); ! ! if(view != null) { ! view.setContained(true); ! } } else { view = null; |