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

IMP slots are now purely defined by <Type>6</Type> in MercProfiles.xml. Removed MAX_IMP_CHARACTERS and IMP_XXX settings.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8622 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-09-29 13:18:40 +00:00
parent 614d0c6c09
commit 0905d5aa47
4 changed files with 17 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/IMP MainPage.cpp
+10 -9
View File
@@ -83,7 +83,8 @@ INT32 iCurrentProfileMode = IMP__REGISTRY;
BOOLEAN IsIMPSlotFree(INT32 iIMPId)
{
if ((iIMPId >= 0) && (iIMPId < NUM_PROFILES) &&
if ((iIMPId >= 0) && (iIMPId < NUM_PROFILES) && (iIMPId != NO_PROFILE) &&
( gMercProfiles[iIMPId].Type == PROFILETYPE_IMP ) &&
((wcscmp(gMercProfiles[iIMPId].zName, L"") == 0) ||
(gMercProfiles[iIMPId].bMercStatus == MERC_IS_DEAD)))
{
@@ -750,10 +751,10 @@ INT32 CountFilledIMPSlots()
INT32 iCount = 0;
// Count the used slots
for ( INT32 i = 0; i < gGameExternalOptions.iMaxIMPCharacters; ++i)
for ( int i = 0; i < NUM_PROFILES; ++i )
{
if ((gGameExternalOptions.iaIMPSlots[i] != -1) &&
(!IsIMPSlotFree(gGameExternalOptions.iaIMPSlots[i])))
if ( (gMercProfiles[i].Type == PROFILETYPE_IMP ) && ( i != NO_PROFILE ) &&
!IsIMPSlotFree(i) )
{
++iCount;
}
@@ -768,9 +769,9 @@ INT32 CountEmptyIMPSlots()
INT32 iCount = 0;
// Count the free slots
for ( INT32 i = 0; i < gGameExternalOptions.iMaxIMPCharacters; ++i)
for ( int i = 0; i < NUM_PROFILES; ++i )
{
if (IsIMPSlotFree(gGameExternalOptions.iaIMPSlots[i]))
if (IsIMPSlotFree(i))
{
++iCount;
}
@@ -794,12 +795,12 @@ INT32 GetFreeIMPSlot(INT32 iDefaultIMPId)
// The default IMP id is already used, find next free imp id
// Find a free imp slot
for (INT32 i = 0; i < gGameExternalOptions.iMaxIMPCharacters; ++i)
for (int i = 0; i < NUM_PROFILES; ++i)
{
// Found a free imp slot
if (IsIMPSlotFree(gGameExternalOptions.iaIMPSlots[i]))
if (IsIMPSlotFree(i))
{
return gGameExternalOptions.iaIMPSlots[i];
return i;
}
}