[Gcblue-commits] gcb_wx/include/sim Game.h,1.39,1.40 tcMapData.h,1.3,1.4

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26484/include/sim

Modified Files:
	Game.h tcMapData.h 
Log Message:


Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Game.h	14 Jun 2004 22:37:11 -0000	1.39
--- Game.h	19 Jun 2004 22:00:27 -0000	1.40
***************
*** 150,153 ****
--- 150,154 ----
      tcSoundConsole* briefingConsoleBottom; ///< to fill space at bottom for now
      tcTacticalMapView* tacticalMap; ///< tactical map object
+     tcWorldMapView* worldMap; ///< world map object
      tcEditControl* editControl;
      tcOptionsView* optionsView; 
***************
*** 273,276 ****
--- 274,278 ----
      void InitializeStartView();    
      void InitializeTacticalMap();
+ 	void InitializeWorldMap();
  
      static tcSoundConsole* messageConsole;

Index: tcMapData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapData.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcMapData.h	19 Nov 2003 01:36:14 -0000	1.3
--- tcMapData.h	19 Jun 2004 22:00:27 -0000	1.4
***************
*** 1,6 ****
! /*  
! **  tcMapData.h: interface for the tcMapData class.
  **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,8 ----
! /**  
! **  @file tcMapData.h
  **
! **  Header for the tcMapData class.
! **
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
***************
*** 46,49 ****
--- 48,53 ----
  #define M_TILE 60
  #define N_TILE 60
+ #define M_DEMTILE 1200
+ #define N_DEMTILE 1200
  #define NULL_TILE 0xFFFF
  #define TILE_AGEOUT (double)30.0
***************
*** 142,145 ****
--- 146,150 ----
      tsTileData* GetTile(unsigned mtile, unsigned ntile, double afStatusTime);
      tsTileData* LoadTile(unsigned mtile, unsigned ntile);
+ 	tsTileData* LoadTileB(unsigned mtile, unsigned ntile);
  
      void CreatePalettes(void);