[Arianne-commits] stendhal/src/games/stendhal/client GameScreen.java, 1.138, 1.139

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15225/src/games/stendhal/client

Modified Files:
	GameScreen.java 
Log Message:
Draw entities to translated Graphics rather than to GameScreen


Index: GameScreen.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/GameScreen.java,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** GameScreen.java	13 Jan 2010 14:38:48 -0000	1.138
--- GameScreen.java	13 Jan 2010 21:17:05 -0000	1.139
***************
*** 533,537 ****
  		// An adjusted graphics object so that the drawn objects do not need to
  		// know about converting the position to screen
! 		Graphics graphics = g2d.create();
  		int xAdjust = -getScreenViewX();
  		int yAdjust = -getScreenViewY();
--- 533,538 ----
  		// An adjusted graphics object so that the drawn objects do not need to
  		// know about converting the position to screen
! 		Graphics2D graphics = (Graphics2D) g2d.create();
! 		graphics.setClip(0, 0, getScreenWidth(), getScreenHeight());
  		int xAdjust = -getScreenViewX();
  		int yAdjust = -getScreenViewY();
***************
*** 572,581 ****
  		gameLayers.draw(graphics, set, "2_object", xTemp, yTemp, layerWidth, layerHeight);
  		
! 		drawEntities(g2d);
  
  		gameLayers.draw(graphics, set, "3_roof", xTemp, yTemp, layerWidth, layerHeight);
  		gameLayers.draw(graphics, set, "4_roof_add", xTemp, yTemp, layerWidth, layerHeight);
  		
! 		drawTopEntities(g2d);
  		drawText(g2d);
  
--- 573,583 ----
  		gameLayers.draw(graphics, set, "2_object", xTemp, yTemp, layerWidth, layerHeight);
  		
! 		drawEntities(graphics);
  
  		gameLayers.draw(graphics, set, "3_roof", xTemp, yTemp, layerWidth, layerHeight);
  		gameLayers.draw(graphics, set, "4_roof_add", xTemp, yTemp, layerWidth, layerHeight);
  		
! 		drawTopEntities(graphics);
! 		
  		drawText(g2d);
  
***************
*** 614,618 ****
  	private void drawEntities(final Graphics2D g) {
  		for (final EntityView view : views) {
! 			view.draw(g, this);
  		}
  	}
--- 616,620 ----
  	private void drawEntities(final Graphics2D g) {
  		for (final EntityView view : views) {
! 			view.draw(g);
  		}
  	}
***************
*** 623,627 ****
  	private void drawTopEntities(final Graphics2D g) {
  		for (final EntityView view : views) {
! 			view.drawTop(g, this);
  		}
  	}
--- 625,629 ----
  	private void drawTopEntities(final Graphics2D g) {
  		for (final EntityView view : views) {
! 			view.drawTop(g);
  		}
  	}