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

Fix:

Browse Source 
- when USE_XML_SQUADNAMES was TRUE, the squad box was shifted upwards over the column headers, causing clipping issues
- when READ_PROFILE_DATA_FROM_XML was TRUE, the game would still read profile data from prof.dat, if the old inventory system was used

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2020-07-17 11:22:29 +00:00
parent ce61a0b85b
commit 7931497b9c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+2 -2
View File
@@ -55,8 +55,8 @@
#endif
CHAR8 czVersionNumber[16] = { "Build 20.06.25" }; //YY.MM.DD
CHAR8 czVersionNumber[16] = { "Build 20.07.17" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" };
CHAR16 zRevisionNumber[16] = { L"Revision 8828" };
CHAR16 zRevisionNumber[16] = { L"Revision 8868" };
// SAVE_GAME_VERSION is defined in header, change it there
Strategic/Assignments.cpp
+4 -2
View File
@@ -14422,10 +14422,12 @@ void CreateSquadBox( void )
GetBoxPosition( ghSquadBox, &pPoint);
GetBoxSize( ghSquadBox, &pDimensions );
if( giBoxY + pDimensions.iBottom > 479 )
// silversurfer: This doesn't make sense. Even at 800x600 the squad box can be displayed without this adjustment.
// The adjustment causes issues when USE_XML_SQUADNAMES is TRUE, because it will move the squad box up over the column header, which looks bad and causes clipping issues. Disabled.
/*if( giBoxY + pDimensions.iBottom > 479 )
{
pPoint.iY = SquadPosition.iY = 479 - pDimensions.iBottom;
}
}*/
SetBoxPosition( ghSquadBox, pPoint );
}
Tactical/Soldier Profile.cpp
+3 -2
View File
@@ -687,11 +687,12 @@ BOOLEAN LoadMercProfiles(void)
gMercProfiles[uiLoop].sPreCombatGridNo = gMercProfiles[uiLoop]._old_sGridNo;
//</SB>
/* CHRISL: For now, we should only overwrite prof.dat in the new inventory system. Old system should still use
/* silversurfer: READ_PROFILE_DATA_FROM_XML from JA2.Options.ini should always take precedence.
CHRISL: For now, we should only overwrite prof.dat in the new inventory system. Old system should still use
prof.dat until we're sure we want to replace it with the xml file.
Because the new WF mercs don't have entries in the prof*.dat files, we need to always load their equipment from
MercStaringGear.xml, regardless of the inventory system we're going to use.*/
if(UsingNewInventorySystem() == true || uiLoop >= 170 )
if( gGameExternalOptions.fReadProfileDataFromXML || UsingNewInventorySystem() == true || uiLoop >= 170 )
{
// Start by resetting all profile inventory values to 0
gMercProfiles[uiLoop].clearInventory();