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

M.E.R.C Optional Gear (by Buggler)

Browse Source 
- Added MERC optional gear purchase
- Adopted Tais' gear cost format as previously gear cost uses MercProfiles.xml 'optional gear cost' value if hire without pressing any 'gear kit' button
- Added condition to settle bills first before hiring same merc from MERC
- Added MERC starting gear hotkey
- Fix for AIM starting gear hotkey when using old inventory
- Removed unused variable in fresh_header.h

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5780 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-01-11 20:24:36 +00:00
parent b08422ec1b
commit f914a1da77
13 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimMembers.cpp
+5 -5
View File
@@ -5174,7 +5174,7 @@ void HandleAimMemberKeyBoardInput()
break;
#endif
case '1':
if(gGameExternalOptions.gfUseNewStartingGearInterface)
if((gGameExternalOptions.gfUseNewStartingGearInterface) && (UsingNewInventorySystem() == true))
{
// kit 1
//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
@@ -5197,7 +5197,7 @@ void HandleAimMemberKeyBoardInput()
}
break;
case '2':
if(gGameExternalOptions.gfUseNewStartingGearInterface)
if((gGameExternalOptions.gfUseNewStartingGearInterface) && (UsingNewInventorySystem() == true))
{
// kit 2
//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
@@ -5220,7 +5220,7 @@ void HandleAimMemberKeyBoardInput()
}
break;
case '3':
if(gGameExternalOptions.gfUseNewStartingGearInterface)
if((gGameExternalOptions.gfUseNewStartingGearInterface) && (UsingNewInventorySystem() == true))
{
// kit 3
//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
@@ -5243,7 +5243,7 @@ void HandleAimMemberKeyBoardInput()
}
break;
case '4':
if(gGameExternalOptions.gfUseNewStartingGearInterface)
if((gGameExternalOptions.gfUseNewStartingGearInterface) && (UsingNewInventorySystem() == true))
{
// kit 4
//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
@@ -5266,7 +5266,7 @@ void HandleAimMemberKeyBoardInput()
}
break;
case '5':
if(gGameExternalOptions.gfUseNewStartingGearInterface)
if((gGameExternalOptions.gfUseNewStartingGearInterface) && (UsingNewInventorySystem() == true))
{
// kit 5
//gbCurrentSoldier = AimMercArray[gbCurrentIndex];