Merge branch 'master' from Windows

This commit is contained in:
2015-02-20 12:21:04 -05:00
19 changed files with 44 additions and 589 deletions

View File

@@ -242,7 +242,7 @@ void display_alchemy(bool allowEdit) {
if(!allowEdit)
showAlch->getControl(id).attachClickHandler(&cLed::noAction);
cLed& led = dynamic_cast<cLed&>(showAlch->getControl(id));
if(univ.party.alchemy[i] > 0)
if(univ.party.alchemy[i])
led.setState(led_red);
else led.setState(led_off);
}