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

Merged from revision: 7182

Browse Source 
Fixes (by Buggler)
- Show map gridno with hotkey 'F' in release build as well for more informative map-related bug reports
- Fixed skipping of bloodcat battles using hotkey 'Esc' in prebattle interface when battle initiated at strategic screen 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7183 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-05-02 13:40:18 +00:00
parent c137c76bb3
commit aef0182ae8
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+1 -1
View File
@@ -2542,7 +2542,7 @@ void LoadSkillTraitsExternalSettings()
// anv: SNITCH // anv: SNITCH
gSkillTraitValues.ubSNTBaseChance = iniReader.ReadInteger("Snitch","BASE_CHANCE", 50, 0, 100); 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.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.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.bSNTSociableMercBonus = iniReader.ReadInteger("Snitch","SOCIABLE_MERC_BONUS", 10, -100, 100);
gSkillTraitValues.bSNTLonerMercBonus = iniReader.ReadInteger("Snitch","LONER_MERC_BONUS", -10, -100, 100); gSkillTraitValues.bSNTLonerMercBonus = iniReader.ReadInteger("Snitch","LONER_MERC_BONUS", -10, -100, 100);
Tactical/Dialogue Control.cpp
+1 -1
View File
@@ -1074,7 +1074,7 @@ void HandleDialogue( )
if( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_TRIGGERPREBATTLEINTERFACE ) if( QItem->uiSpecialEventFlag & DIALOGUE_SPECIAL_EVENT_TRIGGERPREBATTLEINTERFACE )
{ {
UnLockPauseState(); UnLockPauseState();
InitPreBattleInterface( (GROUP*)QItem->uiSpecialEventData, FALSE ); InitPreBattleInterface( (GROUP*)QItem->uiSpecialEventData, TRUE );
} }
if( QItem->uiSpecialEventFlag & DIALOGUE_ADD_EVENT_FOR_SOLDIER_UPDATE_BOX ) if( QItem->uiSpecialEventFlag & DIALOGUE_ADD_EVENT_FOR_SOLDIER_UPDATE_BOX )
{ {
Tactical/Turn Based Input.cpp
+5 -7
View File
@@ -3252,11 +3252,9 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
DisplayRangeToTarget( MercPtrs[ gusSelectedSoldier ], usGridNo ); DisplayRangeToTarget( MercPtrs[ gusSelectedSoldier ], usGridNo );
} }
#ifdef JA2TESTVERSION CHAR16 zOutputString[512];
CHAR16 zOutputString[512]; swprintf( zOutputString, L"%s: %d", pUpdateMapInfoText[19], usGridNo);
swprintf( zOutputString, L"gridno: %d", usGridNo); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, zOutputString );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, zOutputString );
#endif
} }
} }
break; break;
@@ -3265,7 +3263,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
if( fCtrl && UsingNewInventorySystem() == true ) if( fCtrl && UsingNewInventorySystem() == true )
{ {
HandleTBPickUpBackpacks(); HandleTBPickUpBackpacks();
} }
SeperateItems(); SeperateItems();
if( fCtrl ) if( fCtrl )
StackAndSort( TRUE ); StackAndSort( TRUE );
@@ -3327,7 +3325,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
if( fCtrl ) if( fCtrl )
{ {
HandleTBToggleFormation(); HandleTBToggleFormation();
} }
else if ( gGameSettings.fOptions[TOPTION_GL_BURST_CURSOR] ) else if ( gGameSettings.fOptions[TOPTION_GL_BURST_CURSOR] )
{ {
gGameSettings.fOptions[TOPTION_GL_BURST_CURSOR] = FALSE; gGameSettings.fOptions[TOPTION_GL_BURST_CURSOR] = FALSE;