Skip to content

Commit dcef01f

Browse files
committed
Bump Command Keys to 12
Otherwise some units in the game don't have enough hotkeys like the ballista. Moves the hotkey for attacking units to , Moves the hotkey for font cOlor to O
1 parent cafafe1 commit dcef01f

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

mk/shared/glestkeys.ini

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CameraModeRight=right
1111
CameraModeUp=up
1212
CameraModeDown=down
1313
PauseGame=P
14-
ChangeFontColor=C
14+
ChangeFontColor=O
1515
GameSpeedIncrease='+'
1616
GameSpeedDecrease='-'
1717
ExitKey=escape
@@ -40,6 +40,8 @@ CommandKey7=D
4040
CommandKey8=F
4141
CommandKey9=Z
4242
CommandKey10=X
43+
CommandKey11=C
44+
CommandKey12=V
4345
HotKeyCenterCameraOnSelection=G
4446
HotKeySelectIdleHarvesterUnit=I
4547
HotKeySelectBuiltBuilding=B
@@ -48,7 +50,7 @@ HotKeyDumpWorldToLog=\
4850
HotKeyRotateUnitDuringPlacement=R
4951
HotKeySelectDamagedUnit=U
5052
HotKeySelectStoreUnit=T
51-
HotKeySelectedUnitsAttack=V
53+
HotKeySelectedUnitsAttack=,
5254
HotKeySelectedUnitsStop=;
5355
HotKeyToggleOSMouseEnabled=/
5456
ChatTeamMode=H

source/glest_game/gui/gui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ void Gui::hotKey(SDL_KeyboardEvent key) {
449449
clickCommonCommand(ccStop);
450450
}
451451

452-
for (int i=0; i<10; i++) {
452+
for (int i=0; i<commandKeys; i++) {
453453
string name = "CommandKey" + intToStr(i+1);
454454
if(isKeyPressed(configKeys.getSDLKey(name.c_str()),key) == true) {
455455
if(activeCommandType != NULL && activeCommandType->getClass() == ccBuild) {
@@ -800,7 +800,7 @@ void Gui::computeInfoString(int posDisplay){
800800

801801
if(posDisplay!=invalidPos && selection.isCommandable()){
802802
string hotkey = "";
803-
if (posDisplay < 10) { // there's 10 configurable command hotkeys
803+
if (posDisplay < commandKeys) {
804804
hotkey=lang.getString("HotKey")+": "+SDL_GetKeyName(configKeys.getSDLKey(commandKeyName.c_str())) +"\n\n";
805805
}
806806
if(!selectingBuilding){

0 commit comments

Comments
 (0)