- The number of possible IMP voices is no lnger limited

- If no IMP voices could be read, IMP creation is not allowed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8368 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-01-17 20:32:31 +00:00
parent ec52ab30e5
commit 9a46c2a9fc
12 changed files with 24 additions and 12 deletions
+4 -4
View File
@@ -55,7 +55,7 @@ void IMPPortraitRegionButtonCallback(MOUSE_REGION * pRegion, INT32 iReason );
void EnterIMPVoices( void )
{
// Set the initial voice
for ( int i = 0; i < NUM_IMP_VOICESETS; ++i )
for ( int i = 0; i < gIMPVoice.size(); ++i )
{
// MALE is 0, FEMALE is 1, thus the negation
if ( gIMPVoice[i].exists && !fCharacterIsMale == gIMPVoice[i].bSex )
@@ -124,7 +124,7 @@ void IncrementVoice()
{
++iCurrentVoice;
for ( int i = iCurrentVoice; i < NUM_IMP_VOICESETS; ++i )
for ( int i = iCurrentVoice; i < gIMPVoice.size( ); ++i )
{
if ( gIMPVoice[i].exists && !fCharacterIsMale == gIMPVoice[i].bSex )
{
@@ -134,7 +134,7 @@ void IncrementVoice()
}
// still here? Start from the beginning then
for ( int i = 0; i < NUM_IMP_VOICESETS; ++i )
for ( int i = 0; i < gIMPVoice.size( ); ++i )
{
if ( gIMPVoice[i].exists && !fCharacterIsMale == gIMPVoice[i].bSex )
{
@@ -158,7 +158,7 @@ void DecrementVoice( void )
}
// still here? Start from the beginning then
for ( int i = NUM_IMP_VOICESETS - 1; i > 0; --i )
for ( int i = gIMPVoice.size( ) - 1; i > 0; --i )
{
if ( gIMPVoice[i].exists && !fCharacterIsMale == gIMPVoice[i].bSex )
{