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

Check the number of shared commands before trying to click from a hotkey

This commit is contained in:
Rampoina 2022-07-18 19:09:07 +02:00
parent e9b771241f
commit 5783db3033
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,7 @@ Gui::Gui(){
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] START\n",__FILE__,__FUNCTION__);
lastGroupRecall = -1;
commonCommands=0;
posObjWorld= Vec2i(54, 14);
validPosObjWorld= false;
activeCommandType= NULL;
@ -453,8 +454,10 @@ void Gui::hotKey(SDL_KeyboardEvent key) {
if(isKeyPressed(configKeys.getSDLKey(name.c_str()),key) == true) {
if(activeCommandType != NULL && activeCommandType->getClass() == ccBuild) {
mouseDownDisplayUnitBuild(i);
break;
} else {
mouseDownDisplayUnitSkills(i);
if (i < commonCommands) mouseDownDisplayUnitSkills(i);
break;
}
}
}
@ -1056,6 +1059,7 @@ void Gui::computeDisplay(){
lastCommand++;
}
}
commonCommands = lastCommand;
}
}
else if (activeCommandType != NULL && activeCommandType->getClass() == ccBuild) {

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

@ -124,6 +124,7 @@ private:
CommandClass activeCommandClass;
int activePos;
int lastPosDisplay;
int commonCommands;
//composite
Display display;