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

- bugfix: When loading an I.M.P by nickname or 90210 the voice was not set correct

Browse Source 
- feature: Now it is possible to load an I.M.P. even if it has multiple blanks (spaces) in the nickname. E.g. "Mr D 2", "Jack 1", ...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@559 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2006-09-25 07:55:58 +00:00
parent 236e26fe8a
commit 0aa610ac40
7 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/IMP MainPage.cpp
+32 -17
View File
@@ -839,36 +839,51 @@ INT32 GetFilledIMPSlots( INT8 iSex )
}
// WANNE NEW
INT32 GetFreeIMPSlot(INT32 iIMPId)
INT32 GetFreeIMPSlot(INT32 iIMPId, INT32 iDefaultIMPId)
{
INT32 iStart;
INT32 iEnd;
INT32 i;
INT32 iFreeSlot = -1;
BOOLEAN bFoundDefaultIMP = FALSE;
if (iIMPId != -1)
{
// Female
if (iIMPId >= PLAYER_GENERATED_CHARACTER_ID + 3)
// We have a default imp id (90210 or nickname)
if (iDefaultIMPId != -1)
{
iStart = PLAYER_GENERATED_CHARACTER_ID + 3;
iEnd = PLAYER_GENERATED_CHARACTER_ID + 6;
}
// Male
else
{
iStart = PLAYER_GENERATED_CHARACTER_ID;
iEnd = PLAYER_GENERATED_CHARACTER_ID + 3;
if (wcscmp(gMercProfiles[iDefaultIMPId].zName, L"") == 0)
{
iFreeSlot = iDefaultIMPId;
return iFreeSlot;
}
}
// Find a free imp slot
for (i = iStart; i < iEnd; i++)
// The default IMP id is already used, find next free imp id
if (bFoundDefaultIMP == FALSE)
{
// Found a free imp slot
if (wcscmp(gMercProfiles[i].zName, L"") == 0)
// Female
if (iIMPId >= PLAYER_GENERATED_CHARACTER_ID + 3)
{
iFreeSlot = i;
break;
iStart = PLAYER_GENERATED_CHARACTER_ID + 3;
iEnd = PLAYER_GENERATED_CHARACTER_ID + 6;
}
// Male
else
{
iStart = PLAYER_GENERATED_CHARACTER_ID;
iEnd = PLAYER_GENERATED_CHARACTER_ID + 3;
}
// Find a free imp slot
for (i = iStart; i < iEnd; i++)
{
// Found a free imp slot
if (wcscmp(gMercProfiles[i].zName, L"") == 0)
{
iFreeSlot = i;
break;
}
}
}