1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

MERGED FEATURE FROM DEVELOPMENT TRUNK: Enlarging Strategy Map (Revision: 4527 - 4534)

Browse Source 
- This feature enlarges the strategy map in 800x600 and 1024x768 (like in Wildfire 6.0)
- You also have to update the GameDir folder from the official SVN GameDir folder with the latest graphics

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4551 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-06-30 14:53:16 +00:00
parent 88e98b5023
commit f65f029305
5 changed files with 500 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Map.h
+33 -16
View File
@@ -15,6 +15,8 @@ void GetScreenXYFromMapXY( INT16 sMapX, INT16 sMapY, INT16 *psX, INT16 *psY );
void GetScreenXYFromMapXYStationary( INT16 sMapX, INT16 sMapY, INT16 *psX, INT16 *psY );
BOOLEAN InitializePalettesForMap( void );
void InitializeMilitiaPopup(void);
void ShutDownPalettesForMap( void );
// plot path for helicopter
@@ -145,9 +147,7 @@ enum {
};
// size of squares on the map
#define MAP_GRID_X 21
#define MAP_GRID_Y 18
// scroll bounds
@@ -160,28 +160,45 @@ enum {
#define MAP_BORDER_X 261
#define MAP_BORDER_Y 0
// size of squares on the map
extern UINT16 MAP_GRID_X;
extern UINT16 MAP_GRID_Y;
// WANNE: The offset of the map border
#define MAP_BORDER_X_OFFSET (((SCREEN_WIDTH - 261) - 380) / 2)
#define MAP_BORDER_Y_OFFSET (((SCREEN_HEIGHT - 121) - 360) / 2)
extern UINT16 MAP_BORDER_X_OFFSET;
extern UINT16 MAP_BORDER_Y_OFFSET;
// WANNE: The map view region (map image pcx)
#define MAP_VIEW_START_X (MAP_BORDER_X + MAP_BORDER_X_OFFSET + 9)
#define MAP_VIEW_START_Y (MAP_BORDER_Y + MAP_BORDER_Y_OFFSET + 10)
#define MAP_VIEW_WIDTH 336
#define MAP_VIEW_HEIGHT 298
extern UINT16 MAP_VIEW_START_X;
extern UINT16 MAP_VIEW_START_Y;
extern UINT16 MAP_VIEW_WIDTH;
extern UINT16 MAP_VIEW_HEIGHT;
extern INT32 MAP_FONT;
extern UINT16 MAP_HORT_INDEX_X;
extern UINT16 MAP_HORT_INDEX_Y;
extern UINT16 MAP_HORT_HEIGHT;
extern UINT16 MAP_VERT_INDEX_X;
extern UINT16 MAP_VERT_INDEX_Y;
extern UINT16 MAP_VERT_WIDTH;
// Helicopter eta popup position
extern UINT16 MAP_HELICOPTER_ETA_POPUP_X;
extern UINT16 MAP_HELICOPTER_ETA_POPUP_Y;
extern UINT16 MAP_HELICOPTER_UPPER_ETA_POPUP_Y;
extern UINT16 MAP_HELICOPTER_ETA_POPUP_WIDTH;
extern UINT16 MAP_HELICOPTER_ETA_POPUP_HEIGHT;
// sublevel text string position
extern UINT16 MAP_LEVEL_STRING_X;
extern UINT16 MAP_LEVEL_STRING_Y;
//#define MAP_VIEW_START_X 270
//#define MAP_VIEW_START_Y 10
//#define MAP_VIEW_WIDTH 336
//#define MAP_VIEW_HEIGHT 298
// zoomed in grid sizes
#define MAP_GRID_ZOOM_X MAP_GRID_X*2
#define MAP_GRID_ZOOM_Y MAP_GRID_Y*2
// number of units wide
#define WORLD_MAP_X 18
#define WORLD_MAP_X 18 // WANNE: 18 darf nicht geändert werden!
// dirty regions for the map
#define DMAP_GRID_X ( MAP_GRID_X + 1 )