diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index 68611a4f..0f530260 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -3364,8 +3364,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) case 'G': if( fCtrl ) - { - HandleTBToggleFormation(); + { } else if ( gGameSettings.fOptions[TOPTION_GL_BURST_CURSOR] ) { @@ -3379,8 +3378,11 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) } break; case 'g': - - if( fCtrl ) + if( fCtrl && fAlt ) + { + HandlePlayerTogglingLightEffects( TRUE ); + } + else if( fCtrl ) { #ifdef GERMAN if ( gubCheatLevel == 1 ) @@ -3414,7 +3416,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) } else { - HandlePlayerTogglingLightEffects( TRUE ); + HandleTBToggleFormation(); } break; @@ -3467,8 +3469,20 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) break; case 'i': - - if( fAlt ) + if ( fCtrl && fAlt ) + { + if ( gGameSettings.fOptions[ TOPTION_GLOW_ITEMS ] ) + { + gGameSettings.fOptions[ TOPTION_GLOW_ITEMS ] = FALSE; + ToggleItemGlow( FALSE ); + } + else + { + gGameSettings.fOptions[ TOPTION_GLOW_ITEMS ] = TRUE; + ToggleItemGlow( TRUE ); + } + } + else if( fAlt ) { if ( CHEATER_CHEAT_LEVEL( ) ) { @@ -3500,16 +3514,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) } else { - if ( gGameSettings.fOptions[ TOPTION_GLOW_ITEMS ] ) - { - gGameSettings.fOptions[ TOPTION_GLOW_ITEMS ] = FALSE; - ToggleItemGlow( FALSE ); - } - else - { - gGameSettings.fOptions[ TOPTION_GLOW_ITEMS ] = TRUE; - ToggleItemGlow( TRUE ); - } + // freed, use this only for a frequently-used new function } break; @@ -4060,6 +4065,8 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) { ReloadWeapon( MercPtrs[ gusSelectedSoldier ], MercPtrs[ gusSelectedSoldier ]->ubAttackingHand ); } + else + HandleTBReload(); } else if( fCtrl ) { @@ -4070,8 +4077,8 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) else { HandleTBSoldierRun(); - } - } + } + } break; case 'S': @@ -4173,7 +4180,16 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) TeleportSelectedSoldier(); } } - else if( fCtrl ) + else if( fCtrl && !is_networked)// ary-05/05/2009 : add forced turn mode + { + ToggleTurnMode(); + } + else + ToggleTreeTops(); + break; + + case 'T': + if ( fCtrl && fShift && fAlt ) { if ( CHEATER_CHEAT_LEVEL( ) ) { @@ -4182,15 +4198,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) //EnterCombatMode( gbPlayerNum ); } } - else - ToggleTreeTops(); - break; - - case 'T': - if ( fCtrl && fShift && fAlt && !is_networked)// ary-05/05/2009 : add forced turn mode - { - ToggleTurnMode(); - } else if ( fCtrl && fShift ) { //SaveGame( SAVE__TIMED_AUTOSAVE_SLOT1, L"Auto Save 1" ); @@ -4298,7 +4305,11 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) break; case 'w': - if( fAlt ) + if ( fCtrl && fAlt ) + { + ToggleWireFrame(); + } + else if( fAlt ) { if ( CHEATER_CHEAT_LEVEL( ) ) { @@ -4326,7 +4337,14 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) } } else - ToggleWireFrame(); + { + // nothing in hand and either not in SM panel, or the matching button is enabled if we are in SM panel + if ( ( gpItemPointer == NULL ) && + ( ( gsCurInterfacePanel != SM_PANEL ) || ( ButtonList[ iSMPanelButtons[ LOOK_BUTTON ] ]->uiFlags & BUTTON_ENABLED ) ) ) + { + *puiNewEvent = LC_CHANGE_TO_LOOK; + } + } break; case 'W': @@ -4361,6 +4379,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) { pSoldier1 = MercPtrs[ gusSelectedSoldier ]; + BOOLEAN fFoundGoodTarget = FALSE; if ( gfUIFullTargetFound ) { // Get soldier... @@ -4389,11 +4408,15 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) DeductPoints( pSoldier2, APBPConstants[AP_EXCHANGE_PLACES], 0 ); } } + fFoundGoodTarget = TRUE; } } } } - + if( !fFoundGoodTarget ) + { + HandleStanceChangeFromUIKeys( ANIM_PRONE ); + } } } else if ( fCtrl ) // The_Bob - real time sneaking, 01-06-09 diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index b13b88a7..1811fe71 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -3690,7 +3690,7 @@ STR16 pMapScreenInvenButtonHelpText[] = L"|L|e|f|t |C|l|i|c|k: 切换是否显示套装包\n|R|i|g|h|t |C|l|i|c|k: 只显示套装包", // HEADROCK HAM 5: Filter Button // 16 - 20 L"|L|e|f|t |C|l|i|c|k: 切换是否显示杂项物品\n|R|i|g|h|t |C|l|i|c|k: 只显示杂项物品", // HEADROCK HAM 5: Filter Button - L"|L|e|f|t |C|l|i|c|k: 切换搬运中的物品", // Flugente: move item display + L"切换搬运中的物品", // Flugente: move item display }; STR16 pMapScreenBottomFastHelp[] = diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 7bf7f668..3352e620 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -3690,7 +3690,7 @@ STR16 pMapScreenInvenButtonHelpText[] = L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button // 16 - 20 L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button - L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display // TODO.Translate + L"Toggle Move Item Display", // Flugente: move item display // TODO.Translate }; STR16 pMapScreenBottomFastHelp[] = diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index a3a39404..6f179030 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -3689,7 +3689,7 @@ STR16 pMapScreenInvenButtonHelpText[] = L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button // 16 - 20 L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button - L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display + L"Toggle Move Item Display", // Flugente: move item display }; STR16 pMapScreenBottomFastHelp[] = diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index b82f107a..08e1b3b8 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -3697,7 +3697,7 @@ STR16 pMapScreenInvenButtonHelpText[] = L"|C|l|i|c |G|. : Avec/sans kits\n|C|l|i|c |D|. : Voir que les kits", // HEADROCK HAM 5: Filter Button // 16 - 20 L"|C|l|i|c |G|. : Avec/sans objets divers\n|C|l|i|c |D|. : Voir que les objets divers", // HEADROCK HAM 5: Filter Button - L"|C|l|i|c |G|. : Pour afficher ou non les objets déplacés.", // Flugente: move item display + L"Pour afficher ou non les objets déplacés.", // Flugente: move item display }; STR16 pMapScreenBottomFastHelp[] = diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index cac23f61..e671e7ff 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3680,7 +3680,7 @@ STR16 pMapScreenInvenButtonHelpText[] = L"|L|i|n|k|e|r |K|l|i|c|k: Ein-/Ausblenden von Ausrüstung\n|R|e|c|h|t|e|r |K|l|i|c|k: Nur Ausrüstung anzeigen", // HEADROCK HAM 5: Filter Button // 16 - 20 L"|L|i|n|k|e|r |K|l|i|c|k: Ein-/Ausblenden von anderen Gegenständen\n|R|e|c|h|t|e|r |K|l|i|c|k: Nur andere Gegenstände anzeigen", // HEADROCK HAM 5: Filter Button - L"|L|i|n|k|e|r |K|l|i|c|k: Ein-/Ausblenden von zu bewegenden Gegenständen", // Flugente: move item display + L"Ein-/Ausblenden von zu bewegenden Gegenständen", // Flugente: move item display }; STR16 pMapScreenBottomFastHelp[] = diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 3d28f365..6d58933e 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -3686,7 +3686,7 @@ STR16 pMapScreenInvenButtonHelpText[] = L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button // 16 - 20 L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button - L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display // TODO.Translate + L"Toggle Move Item Display", // Flugente: move item display // TODO.Translate }; STR16 pMapScreenBottomFastHelp[] = diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 8dab8356..8ddb8627 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -3699,7 +3699,7 @@ STR16 pMapScreenInvenButtonHelpText[] = L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button // 16 - 20 L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button - L"|L|e|f|t |C|l|i|c|k: Toggle Move Item Display", // Flugente: move item display // TODO.Translate + L"Toggle Move Item Display", // Flugente: move item display // TODO.Translate }; STR16 pMapScreenBottomFastHelp[] = diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index e90816ab..eda4aa13 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -3686,7 +3686,7 @@ STR16 pMapScreenInvenButtonHelpText[] = L"|Л|е|в|ы|й| |щ|е|л|ч|о|к|: Скрыть наборы\n|П|р|а|в|ы|й| |щ|е|л|ч|о|к|: Показать наборы", // HEADROCK HAM 5: Filter Button // 16 - 20 L"|Л|е|в|ы|й| |щ|е|л|ч|о|к|: Скрыть прочие предметы\n|П|р|а|в|ы|й| |щ|е|л|ч|о|к|: Показать прочие предметы", // HEADROCK HAM 5: Filter Button - L"|Л|е|в|ы|й| |щ|е|л|ч|о|к|: Переключить отображение перемещения предметов", // Flugente: move item display + L"Переключить отображение перемещения предметов", // Flugente: move item display }; STR16 pMapScreenBottomFastHelp[] =