mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Merged "Enhanced IMP Creation" (by Sandro)
- For code changes search for // SANDRO - Tooltips can now be toggled on/off in the options screen instead of "Random IMP Personality" option - Updated Version Number for new Release Build (2949) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2949 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+12
-9
@@ -464,14 +464,15 @@ void CreateIMPMainPageButtons( void )
|
||||
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPMainPageVoiceCallback);
|
||||
*/
|
||||
|
||||
if( iCurrentProfileMode != IMP__VOICE && iCurrentProfileMode != IMP__PORTRAIT )
|
||||
{
|
||||
swprintf( sString, pImpButtonText[ 5 ], GetVoiceCountFromVoiceSlot(iCurrentVoice) );
|
||||
}
|
||||
else
|
||||
{
|
||||
swprintf( sString, pImpButtonText[ 25 ] );
|
||||
}
|
||||
// Changed to display "Character" instead of "Voice" - SANDRO
|
||||
//if( iCurrentProfileMode != IMP__VOICE && iCurrentProfileMode != IMP__PORTRAIT )
|
||||
//{
|
||||
// swprintf( sString, pImpButtonText[ 5 ], GetVoiceCountFromVoiceSlot(iCurrentVoice) );
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
swprintf( sString, pImpButtonText[ 25 ] ); // "Character"
|
||||
//}
|
||||
|
||||
//Voice
|
||||
giIMPMainPageButton[5] = CreateIconAndTextButton( giIMPMainPageButtonImage[ 5 ], sString, FONT12ARIAL,
|
||||
@@ -740,7 +741,9 @@ void BtnIMPMainPageVoiceCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
iCurrentImpPage = IMP_VOICE;
|
||||
// changed to go to character analysis - SANDRO
|
||||
iCurrentImpPage = IMP_CHARACTER_AND_DISABILITY_ENTRANCE;
|
||||
//iCurrentImpPage = IMP_VOICE;
|
||||
fButtonPendingFlag = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user