[Arianne-commits] stendhal/src/games/stendhal/client/gui InGameGUI.java, 1.103, 1.104 j2DClient.java, 1.122, 1.123

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

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

Modified Files:
	InGameGUI.java j2DClient.java 
Log Message:
Changed several other classes to use StendhalUI.


Index: InGameGUI.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/InGameGUI.java,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** InGameGUI.java	26 Mar 2007 00:03:58 -0000	1.103
--- InGameGUI.java	28 Mar 2007 01:46:42 -0000	1.104
***************
*** 60,69 ****
  	private boolean altDown;
  
! 	public InGameGUI(StendhalClient client) {
! 		this.client = client;
  
  		offlineIcon = SpriteStore.get().getSprite("data/gui/offline.png");
  
! 		GameScreen screen = GameScreen.get();
  		// create the frame
  		frame = new WtBaseframe(screen);
--- 60,69 ----
  	private boolean altDown;
  
! 	public InGameGUI(StendhalUI ui) {
! 		this.client = ui.getClient();
  
  		offlineIcon = SpriteStore.get().getSprite("data/gui/offline.png");
  
! 		GameScreen screen = ui.getScreen();
  		// create the frame
  		frame = new WtBaseframe(screen);
***************
*** 72,80 ****
  		screen.getComponent().addMouseMotionListener(frame);
  		// create ground
! 		ground = new GroundContainer(client, screen.getWidthInPixels(), screen.getHeightInPixels());
  
  		frame.addChild(ground);
  		// the settings panel creates all other
! 		settings = new SettingsPanel(client, ground);
  		ground.addChild(settings);
  
--- 72,80 ----
  		screen.getComponent().addMouseMotionListener(frame);
  		// create ground
! 		ground = new GroundContainer(ui);
  
  		frame.addChild(ground);
  		// the settings panel creates all other
! 		settings = new SettingsPanel(ui, ground);
  		ground.addChild(settings);
  

Index: j2DClient.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2DClient.java,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** j2DClient.java	28 Mar 2007 00:57:37 -0000	1.122
--- j2DClient.java	28 Mar 2007 01:46:42 -0000	1.123
***************
*** 378,382 ****
  //		fx = new FXLayer(SCREEN_WIDTH, SCREEN_HEIGHT);
  
! 		inGameGUI = new InGameGUI(client);
  		client.setGameGUI(inGameGUI);
  
--- 378,382 ----
  //		fx = new FXLayer(SCREEN_WIDTH, SCREEN_HEIGHT);
  
! 		inGameGUI = new InGameGUI(this);
  		client.setGameGUI(inGameGUI);