Merged the two parts of RenderItemDescriptionBox function (strategic and tactical) into a single function. Now any change automatically effects both version of the box.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2444 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
ChrisL
2008-12-04 22:00:29 +00:00
parent 1424b3c3d3
commit 276306c435
3 changed files with 326 additions and 873 deletions
+24 -17
View File
@@ -7,9 +7,9 @@
// DEFINES FOR ITEM SLOT SIZES IN PIXELS
#define BIG_INV_SLOT_WIDTH 61
#define BIG_INV_SLOT_HEIGHT 22
#define SM_INV_SLOT_WIDTH 30
#define SM_INV_SLOT_WIDTH 30
#define SM_INV_SLOT_HEIGHT 23
#define MAP_ATTACH_SLOT_WIDTH 32
#define ATTACH_SLOT_WIDTH 32
#define VEST_INV_SLOT_WIDTH 43
#define VEST_INV_SLOT_HEIGHT 24
#define LEGS_INV_SLOT_WIDTH 43
@@ -27,6 +27,16 @@ typedef struct
} INV_DESC_STATS;
typedef struct
{
INT16 sX;
INT16 sY;
INT16 sHeight;
INT16 sWidth;
INT16 sBarDx;
INT16 sBarDy;
} INV_ATTACHXY;
typedef struct
{
UINT32 uiTotalAmount;
UINT32 uiMoneyRemaining;
@@ -54,36 +64,33 @@ void ItemDescCallback( MOUSE_REGION * pRegion, INT32 iReason );
#define EXCEPTIONAL_REPAIR_EASE 2
#define EXCEPTIONAL_ACCURACY 4
#define ITEMDESC_FONTHIGHLIGHT FONT_MCOLOR_WHITE
#define MAP_ITEMDESC_NAME_X (7 + gsInvDescX)
#define MAP_ITEMDESC_NAME_Y (65 + gsInvDescY)
//CHRISL: extern'd for EDB project
extern INT16 gsInvDescX;
extern INT16 gsInvDescY;
extern INT16 ITEMDESC_CALIBER_X;
extern INT16 ITEMDESC_CALIBER_Y;
extern UINT8 gubItemDescStatusIndex;
extern INT16 BULLET_SING_X;
extern INT16 BULLET_SING_Y;
extern INT16 BULLET_BURST_X;
extern INT16 BULLET_BURST_Y;
extern INT16 MAP_BULLET_SING_X;
extern INT16 MAP_BULLET_SING_Y;
extern INT16 MAP_BULLET_BURST_X;
extern INT16 MAP_BULLET_BURST_Y;
extern INT16 ITEMDESC_CALIBER_X;
extern INT16 ITEMDESC_CALIBER_Y;
extern INT16 ITEMDESC_CALIBER_WIDTH;
extern INT16 ITEMDESC_NAME_X;
extern INT16 ITEMDESC_NAME_Y;
extern INT16 ITEMDESC_ITEM_X;
extern INT16 ITEMDESC_ITEM_Y;
extern INT16 ITEMDESC_DESC_START_X;
extern INT16 ITEMDESC_DESC_START_Y;
extern INT16 ITEMDESC_PROS_START_X;
extern INT16 ITEMDESC_PROS_START_Y;
extern INT16 ITEMDESC_CONS_START_X;
extern INT16 ITEMDESC_CONS_START_Y;
extern INT16 MAP_ITEMDESC_DESC_START_X;
extern INT16 MAP_ITEMDESC_DESC_START_Y;
extern INT16 MAP_ITEMDESC_PROS_START_X;
extern INT16 MAP_ITEMDESC_PROS_START_Y;
extern INT16 MAP_ITEMDESC_CONS_START_X;
extern INT16 MAP_ITEMDESC_CONS_START_Y;
extern INT16 ITEMDESC_DESC_WIDTH;
extern UINT8 gubItemDescStatusIndex;
extern INT16 ITEMDESC_ITEM_STATUS_X;
extern INT16 ITEMDESC_ITEM_STATUS_Y;
extern INT16 ITEMDESC_ITEM_STATUS_HEIGHT;
// A STRUCT USED INTERNALLY FOR INV SLOT REGIONS
typedef struct