Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Rampoina 2022-08-02 09:44:46 +02:00
parent e209dcbd35
commit 46d5904578
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mk/shared/glestkeys.ini
View File

@ -11,7 +11,7 @@ CameraModeRight=right
CameraModeUp=up CameraModeUp=up
CameraModeDown=down CameraModeDown=down
PauseGame=P PauseGame=P
ChangeFontColor=C ChangeFontColor=O
GameSpeedIncrease='+' GameSpeedIncrease='+'
GameSpeedDecrease='-' GameSpeedDecrease='-'
ExitKey=escape ExitKey=escape
@ -40,6 +40,8 @@ CommandKey7=D
CommandKey8=F CommandKey8=F
CommandKey9=Z CommandKey9=Z
CommandKey10=X CommandKey10=X
CommandKey11=C
CommandKey12=V
HotKeyCenterCameraOnSelection=G HotKeyCenterCameraOnSelection=G
HotKeySelectIdleHarvesterUnit=I HotKeySelectIdleHarvesterUnit=I
HotKeySelectBuiltBuilding=B HotKeySelectBuiltBuilding=B
@ -48,7 +50,7 @@ HotKeyDumpWorldToLog=\
HotKeyRotateUnitDuringPlacement=R HotKeyRotateUnitDuringPlacement=R
HotKeySelectDamagedUnit=U HotKeySelectDamagedUnit=U
HotKeySelectStoreUnit=T HotKeySelectStoreUnit=T
HotKeySelectedUnitsAttack=V HotKeySelectedUnitsAttack=,
HotKeySelectedUnitsStop=; HotKeySelectedUnitsStop=;
HotKeyToggleOSMouseEnabled=/ HotKeyToggleOSMouseEnabled=/
ChatTeamMode=H ChatTeamMode=H

4
source/glest_game/gui/gui.cpp
View File

@ -449,7 +449,7 @@ void Gui::hotKey(SDL_KeyboardEvent key) {
clickCommonCommand(ccStop); clickCommonCommand(ccStop);
} }
for (int i=0; i<10; i++) { for (int i=0; i<commandKeys; i++) {
string name = "CommandKey" + intToStr(i+1); string name = "CommandKey" + intToStr(i+1);
if(isKeyPressed(configKeys.getSDLKey(name.c_str()),key) == true) { if(isKeyPressed(configKeys.getSDLKey(name.c_str()),key) == true) {
if(activeCommandType != NULL && activeCommandType->getClass() == ccBuild) { if(activeCommandType != NULL && activeCommandType->getClass() == ccBuild) {
@ -807,7 +807,7 @@ void Gui::computeInfoString(int posDisplay){
if(posDisplay!=invalidPos && selection.isCommandable()){ if(posDisplay!=invalidPos && selection.isCommandable()){
string hotkey = ""; string hotkey = "";
if (posDisplay < 10) { // there's 10 configurable command hotkeys if (posDisplay < commandKeys) {
hotkey=lang.getString("HotKey")+": "+SDL_GetKeyName(configKeys.getSDLKey(commandKeyName.c_str())) +"\n\n"; hotkey=lang.getString("HotKey")+": "+SDL_GetKeyName(configKeys.getSDLKey(commandKeyName.c_str())) +"\n\n";
} }
if(!selectingBuilding){ if(!selectingBuilding){

1
source/glest_game/gui/gui.h
View File

@ -95,6 +95,7 @@ public:
class Gui { class Gui {
public: public:
static const int commandKeys= 12;
static const int maxSelBuff= 128*5; static const int maxSelBuff= 128*5;
static const int upgradeDisplayIndex= 8; static const int upgradeDisplayIndex= 8;