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

************************************************************

Browse Source 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/IMP HomePage.cpp
+3 -3
View File
@@ -414,7 +414,7 @@ void ProcessPlayerInputActivationString( void )
return;
}
if (CountFilledIMPSlots(-1) < gGameExternalOptions.iMaxIMPCharacters)
if (CountFilledIMPSlots(-1) < gGameOptions.ubMaxIMPCharacters)
{
// Kaiden: Need to reset skills, attributes and personalities with the new UB Method.
ResetSkillsAttributesAndPersonality( );
@@ -436,7 +436,7 @@ void ProcessPlayerInputActivationString( void )
return;
}
if (CountFilledIMPSlots(-1) < gGameExternalOptions.iMaxIMPCharacters)
if (CountFilledIMPSlots(-1) < gGameOptions.ubMaxIMPCharacters)
{
if (LoadImpCharacter( IMP_MERC_FILENAME ) == TRUE)
{
@@ -462,7 +462,7 @@ void ProcessPlayerInputActivationString( void )
return;
}
if (CountFilledIMPSlots(-1) < gGameExternalOptions.iMaxIMPCharacters)
if (CountFilledIMPSlots(-1) < gGameOptions.ubMaxIMPCharacters)
{
if (LoadImpCharacter( charPlayerActivationString ) == TRUE)
{