Skip to content

Commit ba695f8

Browse files
SupSuperSupSuper
committed
Keyboard shortcuts for Basescape.
1 parent 7202d84 commit ba695f8

32 files changed

Lines changed: 75 additions & 6 deletions

‎src/Basescape/BaseInfoState.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "../Resource/ResourcePack.h"
2424
#include "../Engine/Language.h"
2525
#include "../Engine/Palette.h"
26+
#include "../Engine/Options.h"
2627
#include "../Interface/Bar.h"
2728
#include "../Interface/TextButton.h"
2829
#include "../Interface/Text.h"
@@ -35,7 +36,6 @@
3536
#include "TransfersState.h"
3637
#include "StoresState.h"
3738
#include "BasescapeState.h"
38-
#include "../Engine/Options.h"
3939

4040
namespace OpenXcom
4141
{
@@ -178,6 +178,7 @@ BaseInfoState::BaseInfoState(Game *game, Base *base, BasescapeState *state) : St
178178
_btnOk->setColor(Palette::blockOffset(15)+6);
179179
_btnOk->setText(_game->getLanguage()->getString("STR_OK"));
180180
_btnOk->onMouseClick((ActionHandler)&BaseInfoState::btnOkClick);
181+
_btnOk->onKeyboardPress((ActionHandler)&BaseInfoState::btnOkClick, (SDLKey)Options::getInt("keyCancel"));
181182

182183
_btnTransfers->setColor(Palette::blockOffset(15)+6);
183184
_btnTransfers->setText(_game->getLanguage()->getString("STR_TRANSFERS_UC"));

‎src/Basescape/BasescapeState.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "../Resource/ResourcePack.h"
2323
#include "../Engine/Language.h"
2424
#include "../Engine/Palette.h"
25+
#include "../Engine/Options.h"
2526
#include "../Interface/TextButton.h"
2627
#include "../Interface/Text.h"
2728
#include "../Interface/TextEdit.h"
@@ -174,6 +175,7 @@ BasescapeState::BasescapeState(Game *game, Base *base, Globe *globe) : State(gam
174175
_btnGeoscape->setColor(Palette::blockOffset(13)+5);
175176
_btnGeoscape->setText(_game->getLanguage()->getString("STR_GEOSCAPE_UC"));
176177
_btnGeoscape->onMouseClick((ActionHandler)&BasescapeState::btnGeoscapeClick);
178+
_btnGeoscape->onKeyboardPress((ActionHandler)&BasescapeState::btnGeoscapeClick, (SDLKey)Options::getInt("keyCancel"));
177179
}
178180

179181
/**

‎src/Basescape/BuildFacilitiesState.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "../Resource/ResourcePack.h"
2222
#include "../Engine/Language.h"
2323
#include "../Engine/Palette.h"
24+
#include "../Engine/Options.h"
2425
#include "../Interface/TextButton.h"
2526
#include "../Interface/Window.h"
2627
#include "../Interface/Text.h"
@@ -38,6 +39,7 @@ namespace OpenXcom
3839
* @param game Pointer to the core game.
3940
* @param base Pointer to the base to get info from.
4041
* @param state Pointer to the base state to refresh.
42+
* @param cancellable Is there a Cancel button?
4143
*/
4244
BuildFacilitiesState::BuildFacilitiesState(Game *game, Base *base, State *state, bool cancellable) : State(game), _base(base), _state(state), _facilities()
4345
{
@@ -71,6 +73,7 @@ BuildFacilitiesState::BuildFacilitiesState(Game *game, Base *base, State *state,
7173
_btnOk->setColor(Palette::blockOffset(13)+5);
7274
_btnOk->setText(_game->getLanguage()->getString("STR_OK"));
7375
_btnOk->onMouseClick((ActionHandler)&BuildFacilitiesState::btnOkClick);
76+
_btnOk->onKeyboardPress((ActionHandler)&BuildFacilitiesState::btnOkClick, (SDLKey)Options::getInt("keyCancel"));
7477
_btnOk->setVisible(cancellable);
7578

7679
_txtTitle->setColor(Palette::blockOffset(13));

‎src/Basescape/CraftArmorState.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "../Resource/ResourcePack.h"
2323
#include "../Engine/Language.h"
2424
#include "../Engine/Palette.h"
25+
#include "../Engine/Options.h"
2526
#include "../Interface/TextButton.h"
2627
#include "../Interface/Window.h"
2728
#include "../Interface/Text.h"
@@ -71,6 +72,7 @@ CraftArmorState::CraftArmorState(Game *game, Base *base, size_t craft) : State(g
7172
_btnOk->setColor(Palette::blockOffset(13)+10);
7273
_btnOk->setText(_game->getLanguage()->getString("STR_OK"));
7374
_btnOk->onMouseClick((ActionHandler)&CraftArmorState::btnOkClick);
75+
_btnOk->onKeyboardPress((ActionHandler)&CraftArmorState::btnOkClick, (SDLKey)Options::getInt("keyCancel"));
7476

7577
_txtTitle->setColor(Palette::blockOffset(13)+10);
7678
_txtTitle->setBig();

‎src/Basescape/CraftEquipmentState.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "../Resource/ResourcePack.h"
2727
#include "../Engine/Language.h"
2828
#include "../Engine/Palette.h"
29+
#include "../Engine/Options.h"
2930
#include "../Interface/TextButton.h"
3031
#include "../Interface/Window.h"
3132
#include "../Interface/Text.h"
@@ -87,6 +88,7 @@ CraftEquipmentState::CraftEquipmentState(Game *game, Base *base, size_t craft) :
8788
_btnOk->setColor(Palette::blockOffset(15)+1);
8889
_btnOk->setText(_game->getLanguage()->getString("STR_OK"));
8990
_btnOk->onMouseClick((ActionHandler)&CraftEquipmentState::btnOkClick);
91+
_btnOk->onKeyboardPress((ActionHandler)&CraftEquipmentState::btnOkClick, (SDLKey)Options::getInt("keyCancel"));
9092

9193
_txtTitle->setColor(Palette::blockOffset(15)+1);
9294
_txtTitle->setBig();
@@ -366,6 +368,7 @@ void CraftEquipmentState::moveLeft()
366368

367369
/**
368370
* Moves the given number of items (selected) to the base.
371+
* @param change Item difference.
369372
*/
370373
void CraftEquipmentState::moveLeft(int change)
371374
{
@@ -435,6 +438,7 @@ void CraftEquipmentState::moveRight()
435438

436439
/**
437440
* Moves the given number of items (selected) to the craft.
441+
* @param change Item difference.
438442
*/
439443
void CraftEquipmentState::moveRight(int change)
440444
{

‎src/Basescape/CraftInfoState.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "../Resource/ResourcePack.h"
2323
#include "../Engine/Language.h"
2424
#include "../Engine/Palette.h"
25+
#include "../Engine/Options.h"
2526
#include "../Interface/TextButton.h"
2627
#include "../Interface/Window.h"
2728
#include "../Interface/Text.h"
@@ -105,6 +106,7 @@ CraftInfoState::CraftInfoState(Game *game, Base *base, size_t craft) : State(gam
105106
_btnOk->setColor(Palette::blockOffset(13)+10);
106107
_btnOk->setText(_game->getLanguage()->getString("STR_OK"));
107108
_btnOk->onMouseClick((ActionHandler)&CraftInfoState::btnOkClick);
109+
_btnOk->onKeyboardPress((ActionHandler)&CraftInfoState::btnOkClick, (SDLKey)Options::getInt("keyCancel"));
108110

109111
_btnW1->setColor(Palette::blockOffset(13)+10);
110112
_btnW1->setText(L"1");

‎src/Basescape/CraftSoldiersState.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "../Resource/ResourcePack.h"
2525
#include "../Engine/Language.h"
2626
#include "../Engine/Palette.h"
27+
#include "../Engine/Options.h"
2728
#include "../Interface/TextButton.h"
2829
#include "../Interface/Window.h"
2930
#include "../Interface/Text.h"
@@ -76,6 +77,7 @@ CraftSoldiersState::CraftSoldiersState(Game *game, Base *base, size_t craft) : S
7677
_btnOk->setColor(Palette::blockOffset(13)+10);
7778
_btnOk->setText(_game->getLanguage()->getString("STR_OK"));
7879
_btnOk->onMouseClick((ActionHandler)&CraftSoldiersState::btnOkClick);
80+
_btnOk->onKeyboardPress((ActionHandler)&CraftSoldiersState::btnOkClick, (SDLKey)Options::getInt("keyCancel"));
7981

8082
_txtTitle->setColor(Palette::blockOffset(15)+6);
8183
_txtTitle->setBig();

‎src/Basescape/CraftWeaponsState.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "../Resource/ResourcePack.h"
2424
#include "../Engine/Language.h"
2525
#include "../Engine/Palette.h"
26+
#include "../Engine/Options.h"
2627
#include "../Interface/TextButton.h"
2728
#include "../Interface/Window.h"
2829
#include "../Interface/Text.h"
@@ -77,6 +78,7 @@ CraftWeaponsState::CraftWeaponsState(Game *game, Base *base, size_t craft, size_
7778
_btnCancel->setColor(Palette::blockOffset(15)+6);
7879
_btnCancel->setText(_game->getLanguage()->getString("STR_CANCEL_UC"));
7980
_btnCancel->onMouseClick((ActionHandler)&CraftWeaponsState::btnCancelClick);
81+
_btnCancel->onKeyboardPress((ActionHandler)&CraftWeaponsState::btnCancelClick, (SDLKey)Options::getInt("keyCancel"));
8082

8183
_txtTitle->setColor(Palette::blockOffset(15)+6);
8284
_txtTitle->setBig();

‎src/Basescape/CraftsState.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "../Resource/ResourcePack.h"
2323
#include "../Engine/Language.h"
2424
#include "../Engine/Palette.h"
25+
#include "../Engine/Options.h"
2526
#include "../Interface/TextButton.h"
2627
#include "../Interface/Window.h"
2728
#include "../Interface/Text.h"
@@ -74,6 +75,7 @@ CraftsState::CraftsState(Game *game, Base *base) : State(game), _base(base)
7475
_btnOk->setColor(Palette::blockOffset(13)+10);
7576
_btnOk->setText(_game->getLanguage()->getString("STR_OK"));
7677
_btnOk->onMouseClick((ActionHandler)&CraftsState::btnOkClick);
78+
_btnOk->onKeyboardPress((ActionHandler)&CraftsState::btnOkClick, (SDLKey)Options::getInt("keyCancel"));
7779

7880
_txtTitle->setColor(Palette::blockOffset(15)+1);
7981
_txtTitle->setBig();

‎src/Basescape/DismantleFacilityState.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "../Resource/ResourcePack.h"
2222
#include "../Engine/Language.h"
2323
#include "../Engine/Palette.h"
24+
#include "../Engine/Options.h"
2425
#include "../Interface/TextButton.h"
2526
#include "../Interface/Window.h"
2627
#include "../Interface/Text.h"
@@ -38,6 +39,7 @@ namespace OpenXcom
3839
* Initializes all the elements in a Dismantle Facility window.
3940
* @param game Pointer to the core game.
4041
* @param base Pointer to the base to get info from.
42+
* @param view Pointer to the baseview to update.
4143
* @param fac Pointer to the facility to dismantle.
4244
*/
4345
DismantleFacilityState::DismantleFacilityState(Game *game, Base *base, BaseView *view, BaseFacility *fac) : State(game), _base(base), _view(view), _fac(fac)
@@ -67,10 +69,12 @@ DismantleFacilityState::DismantleFacilityState(Game *game, Base *base, BaseView
6769
_btnOk->setColor(Palette::blockOffset(15)+6);
6870
_btnOk->setText(_game->getLanguage()->getString("STR_OK"));
6971
_btnOk->onMouseClick((ActionHandler)&DismantleFacilityState::btnOkClick);
70-
72+
_btnOk->onKeyboardPress((ActionHandler)&DismantleFacilityState::btnOkClick, (SDLKey)Options::getInt("keyCancel"));
73+
7174
_btnCancel->setColor(Palette::blockOffset(15)+6);
7275
_btnCancel->setText(_game->getLanguage()->getString("STR_CANCEL_UC"));
7376
_btnCancel->onMouseClick((ActionHandler)&DismantleFacilityState::btnCancelClick);
77+
_btnCancel->onKeyboardPress((ActionHandler)&DismantleFacilityState::btnCancelClick, (SDLKey)Options::getInt("keyCancel"));
7478

7579
_txtTitle->setColor(Palette::blockOffset(13)+10);
7680
_txtTitle->setAlign(ALIGN_CENTER);

0 commit comments

Comments
 (0)