1
0
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:
Michał W. Urbańczyk
2009-09-09 06:04:42 +00:00
parent 08723ecf84
commit 9e7771272d
11 changed files with 109 additions and 59 deletions

View File

@ -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()]) >> ')'
)
)