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

Use the cancel icon for the unused grid locations

This commit is contained in:
Rampoina 2022-08-11 17:26:59 +02:00
parent e277c47583
commit a5438f6a93
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -993,7 +993,12 @@ void Gui::computeDisplay(){
for(int i= 0; i < ut->getCommandTypeSortedCount(); ++i){ for(int i= 0; i < ut->getCommandTypeSortedCount(); ++i){
int displayPos= i; int displayPos= i;
const CommandType *ct= ut->getCommandTypeSorted(i); const CommandType *ct= ut->getCommandTypeSorted(i);
if(ct == NULL) continue; if(ct == NULL) {
display.setDownImage(displayPos, ut->getCancelImage());
display.setCommandType(displayPos, ct);
display.setDownLighted(displayPos,false);
continue;
}
if(ct->getClass() == ccMorph) { if(ct->getClass() == ccMorph) {
displayPos= morphPos++; displayPos= morphPos++;
} }
@ -1042,7 +1047,15 @@ void Gui::computeDisplay(){
else{ else{
//printf("selection.isUniform() == FALSE\n"); //printf("selection.isUniform() == FALSE\n");
//non uniform selection //non uniform selection
int basicPos= CommandHelper::getRowPos(crBasics); int basicPos = CommandHelper::getRowPos(crBasics);
// First row is always empty
for (int i = 0; i < 5; i++) {
display.setDownImage(i, ut->getCancelImage());
display.setCommandType(i, NULL);
display.setDownLighted(i,false);
}
// only basics can be shared // only basics can be shared
for(auto &&cc : CommandHelper::getBasicsCC()){ for(auto &&cc : CommandHelper::getBasicsCC()){
@ -1064,8 +1077,10 @@ void Gui::computeDisplay(){
display.setDownImage(basicPos + ccPos, ut->getFirstCtOfClass(cc)->getImage()); display.setDownImage(basicPos + ccPos, ut->getFirstCtOfClass(cc)->getImage());
} }
display.setCommandClass(basicPos + ccPos, cc); display.setCommandClass(basicPos + ccPos, cc);
display.setCommandClass(lastCommand, cc); } else {
lastCommand++; display.setDownImage(basicPos+ccPos, ut->getCancelImage());
display.setCommandType(basicPos+ccPos, NULL);
display.setDownLighted(basicPos+ccPos,false);
} }
} }
} }