mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-27 00:41:08 +02:00
* improved "Split" button behavior. It can be used for calling hero meeting screen in town screen.
*fixed problems with underground switch button in higher resolutions * minor graphical fixes for Marketplace window * minor fixes
This commit is contained in:
@ -153,6 +153,14 @@ struct AddDefForButton
|
||||
currentButton->additionalDefs.push_back(str);
|
||||
}
|
||||
};
|
||||
struct ClearAdditionalDefs
|
||||
{
|
||||
template <typename Z>
|
||||
void operator()(const Z first, const Z last) const
|
||||
{
|
||||
currentButton->additionalDefs.clear();
|
||||
}
|
||||
};
|
||||
static void addGRes()
|
||||
{
|
||||
if(current)
|
||||
@ -248,7 +256,8 @@ struct SettingsGrammar : public grammar<SettingsGrammar>
|
||||
| "y=" >> uint_p[SetButtonProp_a(&ButtonInfo::y)]
|
||||
| "playerColoured=" >> uint_p[SetButtonProp_a(&ButtonInfo::playerColoured)]
|
||||
| "graphic=" >> fname[SetButtonStr(&ButtonInfo::defName)]
|
||||
| "additionalDefs=" >> ch_p('(') >> fname[AddDefForButton()]
|
||||
| str_p("additionalDefs=")[ClearAdditionalDefs()]
|
||||
>> ch_p('(') >> fname[AddDefForButton()]
|
||||
>> *(',' >> fname[AddDefForButton()]) >> ')'
|
||||
)
|
||||
)
|
||||
|
Reference in New Issue
Block a user