1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes (by Sevenfm):

Browse Source 
- incorrect sized array for secondary item stat regions
- incorrect check for secondary item stat display removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8248 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2016-06-05 13:23:26 +00:00
parent 90ff5d5626
commit 5307881cb7
5 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+9 -9
View File
@@ -15,9 +15,9 @@
#ifdef JA2EDITOR
#ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8247 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8248 (Development Build)" };
#else
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8247 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8248 (Development Build)" };
#endif
// ------------------------------
@@ -27,11 +27,11 @@
//DEBUG BUILD VERSION
#ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8247 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8248 (Development Build)" };
#elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8247 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8248 (Development Build)" };
#else
CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8247 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8248 (Development Build)" };
#endif
#elif defined CRIPPLED_VERSION
@@ -46,16 +46,16 @@
//RELEASE BUILD VERSION
#ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8247 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8248 (Development Build)" };
#elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8247 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8248 (Development Build)" };
#else
CHAR16 zVersionLabel[256] = { L"Release v1.13.8247 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Release v1.13.8248 (Development Build)" };
#endif
#endif
CHAR8 czVersionNumber[16] = { "Build 16.06.04" }; //YY.MM.DD
CHAR8 czVersionNumber[16] = { "Build 16.06.05" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" };
// SAVE_GAME_VERSION is defined in header, change it there
Standard Gaming Platform/mousesystem.cpp
+2
View File
@@ -1163,6 +1163,8 @@ void MSYS_RemoveRegion(MOUSE_REGION *region)
//
void MSYS_EnableRegion(MOUSE_REGION *region)
{
Assert( region );
region->uiFlags |= MSYS_REGION_ENABLED;
}
Tactical/Interface Enhanced.cpp
+1 -7
View File
@@ -2323,7 +2323,7 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
iFirstDataRegion = iRegionsCreated;
CHAR16 pStr[1000];
for (cnt = 0; cnt < 36; cnt++)
for (cnt = 0; cnt < GEN_SEC_REGION_ENTRIES; cnt++)
{
MSYS_DefineRegion( &gUDBFasthelpRegions[ iRegionsCreated ],
(INT16)(gItemDescGenSecondaryRegions[cnt].sLeft),
@@ -5885,12 +5885,6 @@ void DrawSecondaryStats( OBJECTTYPE * gpItemDescObject )
return;
}
if (Item[ gpItemDescObject->usItem ].usItemClass & (IC_WEAPON || IC_PUNCH))
{
// Weapons have no space on their UDB General page to show Secondary Stats anyway.
return;
}
INT32 cnt = 0;
INT32 sOffsetX = 0;
INT32 sOffsetY = 0;
Tactical/Interface Items.cpp
+1 -1
View File
@@ -575,7 +575,7 @@ INV_DESC_REGIONS gItemDescLBEBackground[4]; // Coordinates for displaying LBE ba
INV_DESC_REGIONS gItemDescGenHeaderRegions[3]; // Header text regions for various parts of the General Tab
INV_DESC_REGIONS gItemDescGenIndexRegions[3][4]; // Index text regions for various parts of the General Tab
INV_DESC_REGIONS gItemDescGenRegions[NUM_UDB_GEN_LINES * 2][4]; // Data regions, 4 sub-columns each
INV_DESC_REGIONS gItemDescGenSecondaryRegions[26]; // Secondary data regions, 3x5
INV_DESC_REGIONS gItemDescGenSecondaryRegions[GEN_SEC_REGION_ENTRIES]; // Secondary data regions, 6 lines x 4 icons
INV_DESC_REGIONS gItemDescTextRegions[9]; // Main description regions
INV_DESC_REGIONS gItemDescAdvIndexRegions[1][4];
INV_DESC_REGIONS gItemDescAdvRegions[NUM_UDB_ADV_LINES][4]; // Advanced data regions, 4 sub-columns each
Tactical/Interface Items.h
+2 -1
View File
@@ -21,6 +21,7 @@
#define NUM_UDB_GEN_LINES 12
#define NUM_UDB_ADV_LINES 13 // Flugente FTW 1.1: 12->13
#define GEN_SEC_REGION_ENTRIES 24 // 6 lines x 4 icons
// HEADROCK HAM 4: These rectangle definitions are used in UDB to determine locations for icons, data, and tooltip
// regions. They replace the plethora of region data provided in EDB.
@@ -36,7 +37,7 @@ extern INV_DESC_REGIONS gItemDescLBEBackground[4]; // Coordinates for displaying
extern INV_DESC_REGIONS gItemDescGenHeaderRegions[3]; // Header text regions for various parts of the General Tab
extern INV_DESC_REGIONS gItemDescGenIndexRegions[3][4]; // Index text regions for various parts of the General Tab
extern INV_DESC_REGIONS gItemDescGenRegions[NUM_UDB_GEN_LINES * 2][4]; // Data regions, 4 sub-columns each
extern INV_DESC_REGIONS gItemDescGenSecondaryRegions[26]; // Secondary data regions, 3x5 for now (possible 3x6?)
extern INV_DESC_REGIONS gItemDescGenSecondaryRegions[GEN_SEC_REGION_ENTRIES]; // Secondary data regions, 6 lines x 4 icons
extern INV_DESC_REGIONS gItemDescTextRegions[9]; // Main description regions
extern INV_DESC_REGIONS gItemDescAdvIndexRegions[1][4];
extern INV_DESC_REGIONS gItemDescAdvRegions[NUM_UDB_ADV_LINES][4]; // Advanced data regions, 4 sub-columns each