diff --git a/GameSettings.cpp b/GameSettings.cpp index db9c76b3..486edfb8 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -2542,7 +2542,7 @@ void LoadSkillTraitsExternalSettings() // anv: SNITCH gSkillTraitValues.ubSNTBaseChance = iniReader.ReadInteger("Snitch","BASE_CHANCE", 50, 0, 100); gSkillTraitValues.fSNTMercOpinionAboutSnitchBonusModifier = iniReader.ReadFloat("Snitch","MERC_OPINION_ABOUT_SNITCH_MODIFIER", 0.5, 0.0, 10.0); - gSkillTraitValues.fSNTSnitchOpinionAboutMercBonusModifier = iniReader.ReadFloat("Snitch","SNITCH_OPINION_ABOUT_MERC_MODIFIER", 0.2, 0.0, 10.0); + gSkillTraitValues.fSNTSnitchOpinionAboutMercBonusModifier = iniReader.ReadFloat("Snitch","SNITCH_OPINION_ABOUT_MERC_MODIFIER", 0.2f, 0.0f, 10.0f); gSkillTraitValues.fSNTSnitchLeadershipBonusModifer = iniReader.ReadFloat("Snitch","SNITCH_LEADERSHIP_BONUS_MODIFIER", 0.5, 0.0, 10.0); gSkillTraitValues.bSNTSociableMercBonus = iniReader.ReadInteger("Snitch","SOCIABLE_MERC_BONUS", 10, -100, 100); gSkillTraitValues.bSNTLonerMercBonus = iniReader.ReadInteger("Snitch","LONER_MERC_BONUS", -10, -100, 100); diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp index 02932da3..3e4ec3e7 100644 --- a/Tactical/Dialogue Control.cpp +++ b/Tactical/Dialogue Control.cpp @@ -1074,7 +1074,7 @@ void HandleDialogue( ) if( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_TRIGGERPREBATTLEINTERFACE ) { UnLockPauseState(); - InitPreBattleInterface( (GROUP*)QItem->uiSpecialEventData, FALSE ); + InitPreBattleInterface( (GROUP*)QItem->uiSpecialEventData, TRUE ); } if( QItem->uiSpecialEventFlag & DIALOGUE_ADD_EVENT_FOR_SOLDIER_UPDATE_BOX ) { diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index d1f08f07..5beaf674 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -3252,11 +3252,9 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) DisplayRangeToTarget( MercPtrs[ gusSelectedSoldier ], usGridNo ); } - #ifdef JA2TESTVERSION - CHAR16 zOutputString[512]; - swprintf( zOutputString, L"gridno: %d", usGridNo); - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, zOutputString ); - #endif + CHAR16 zOutputString[512]; + swprintf( zOutputString, L"%s: %d", pUpdateMapInfoText[19], usGridNo); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, zOutputString ); } } break; @@ -3265,7 +3263,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) if( fCtrl && UsingNewInventorySystem() == true ) { HandleTBPickUpBackpacks(); - } + } SeperateItems(); if( fCtrl ) StackAndSort( TRUE ); @@ -3327,7 +3325,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) if( fCtrl ) { HandleTBToggleFormation(); - } + } else if ( gGameSettings.fOptions[TOPTION_GL_BURST_CURSOR] ) { gGameSettings.fOptions[TOPTION_GL_BURST_CURSOR] = FALSE;