[Attal-cvs-notify] CVS: src/client game.h,1.11,1.12 game.cpp,1.28,1.29

[Audoux <au...@us...>]

Update of /cvsroot/attal/src/client
In directory usw-pr-cvs1:/tmp/cvs-serv5199

Modified Files:
	game.h game.cpp 
Log Message:
using GameInfo (instead of a QLabel)


Index: game.h
===================================================================
RCS file: /cvsroot/attal/src/client/game.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** game.h	2001/01/02 23:33:20	1.11
--- game.h	2001/01/03 00:32:15	1.12
***************
*** 44,47 ****
--- 44,48 ----
  
  class DisplayLord;
+ class GameInfo;
  
  /*              ------------------------------
***************
*** 89,92 ****
--- 90,94 ----
  	Map * _map;
  	GameControl * _control;	
+ 	GameInfo * _gameInfo;
  	DisplayLord * _dispLord;
  	MiniMap * _miniMap;

Index: game.cpp
===================================================================
RCS file: /cvsroot/attal/src/client/game.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** game.cpp	2001/01/02 23:33:20	1.28
--- game.cpp	2001/01/03 00:32:15	1.29
***************
*** 46,49 ****
--- 46,50 ----
  #include "client/mapView.h"
  #include "client/fightUnit.h"
+ #include "client/gameInfo.h"
  
  extern SpellList spellList;
***************
*** 78,84 ****
  	_miniMap = new MiniMap( this );
  	
! 	QLabel * gameInfo = new QLabel( this );
! 	gameInfo->setFixedSize( 200, 200 );
! 	gameInfo->setPixmap( QPixmap( IMAGE_PATH +"misc/logo.xpm" ) );
  
  	_control = new GameControl( this );
--- 79,83 ----
  	_miniMap = new MiniMap( this );
  	
! 	_gameInfo = new GameInfo( this );
  
  	_control = new GameControl( this );
***************
*** 89,93 ****
  	vlayout2->addWidget( _control );
  	vlayout2->addStretch( 1 );
! 	vlayout2->addWidget( gameInfo );	
  	
  	
--- 88,92 ----
  	vlayout2->addWidget( _control );
  	vlayout2->addStretch( 1 );
! 	vlayout2->addWidget( _gameInfo );