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

Merge branch 'feat/command-priority' into play

This commit is contained in:
pavanvo 2022-09-07 02:12:56 +04:00
parent db66662a8b 204bac403e
commit 92cdcca576
No known key found for this signature in database
GPG Key ID: 34C1C36681B4AD84
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1009,7 +1009,7 @@ void Gui::computeDisplay(){
display.setCommandType(displayPos, ct);
display.setCommandClass(displayPos, ct->getClass());
bool reqOk=u->getFaction()->reqsOk(ct);
display.setDownLighted(displayPos, reqOk && !(!ct->isQueueAppendable() && isKeyDown(queueCommandKey)));
display.setDownLighted(displayPos, reqOk && !(ct->isQueuable()==qNever && isKeyDown(queueCommandKey)));
if (reqOk && produced != NULL) {
if (possibleAmount == 0) {

2
source/glest_game/types/command_type.h
View File

@ -442,7 +442,7 @@ public:
virtual string toString(bool translatedValue) const;
virtual string getReqDesc(bool translatedValue) const;
virtual const ProducibleType *getProduced() const;
Queueability isQueuable() const {return qAlways;} //After morph anything can happen
Queueability isQueuable() const {return qOnRequest;}
//get
const MorphSkillType *getMorphSkillType() const {return morphSkillType;}