[Arianne-commits] stendhal/src/games/stendhal/client/gui j2DClient.java, 1.348.2.1, 1.348.2.2

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

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

Modified Files:
      Tag: VERSION_00_RELEASE_87
	j2DClient.java 
Log Message:
Reverted the previous fix attempt because it made problems with map changes


Index: j2DClient.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2DClient.java,v
retrieving revision 1.348.2.1
retrieving revision 1.348.2.2
diff -C2 -d -r1.348.2.1 -r1.348.2.2
*** j2DClient.java	14 Sep 2010 10:49:10 -0000	1.348.2.1
--- j2DClient.java	14 Sep 2010 13:07:58 -0000	1.348.2.2
***************
*** 519,540 ****
  				gameObjects.update(delta);
  	
! 				if (gameLayers.isAreaChanged() && !client.isInBatchUpdate()) {
! 					/*
! 					 * Update the screen
! 					 */
! 					screen.setMaxWorldSize(gameLayers.getWidth(), gameLayers.getHeight());
! 					screen.center();
! 
! 					// [Re]create the map
! 
! 					final CollisionDetection cd = gameLayers.getCollisionDetection();
! 					final CollisionDetection pd = gameLayers.getProtectionDetection();
  
! 					if (cd != null) {
! 						minimap.update(cd, pd,
! 								screen.getGraphicsConfiguration(),
! 								gameLayers.getArea());
  					}
- 					gameLayers.resetChangedArea();
  				}
  	
--- 519,544 ----
  				gameObjects.update(delta);
  	
! 				if (gameLayers.isAreaChanged() && client.tryAcquireDrawingSemaphore()) {
! 					try {
! 						/*
! 						 * Update the screen
! 						 */
! 						screen.setMaxWorldSize(gameLayers.getWidth(), gameLayers.getHeight());
! 						screen.center();
! 	
! 						// [Re]create the map
! 		
! 						final CollisionDetection cd = gameLayers.getCollisionDetection();
! 						final CollisionDetection pd = gameLayers.getProtectionDetection();
  
! 						if (cd != null) {
! 							minimap.update(cd, pd,
! 									screen.getGraphicsConfiguration(),
! 									gameLayers.getArea());
! 						} 
! 						gameLayers.resetChangedArea();
! 					} finally {
! 						client.releaseDrawingSemaphore();
  					}
  				}
  	
***************
*** 552,561 ****
  					}
  				}
! 				
! 				if (mainFrame.getMainFrame().getState() != Frame.ICONIFIED) {
! 					logger.debug("Draw screen");
! 					screen.draw();
! 					minimap.refresh();
! 					containerPanel.repaintChildren();
  				}
  	
--- 556,570 ----
  					}
  				}
! 				if (client.tryAcquireDrawingSemaphore()) {
! 					try {
! 						if (mainFrame.getMainFrame().getState() != Frame.ICONIFIED) {
! 							logger.debug("Draw screen");
! 							screen.draw();
! 							minimap.refresh();
! 							containerPanel.repaintChildren();
! 						}
! 					} finally {
! 						client.releaseDrawingSemaphore();
! 					}
  				}