Merge branch 'master' into sysmgrtooltip_syschaninfo
This commit is contained in:
commit
c6dfd4f10b
309 changed files with 93453 additions and 72703 deletions
|
|
@ -43,9 +43,17 @@ enum FurnaceGUIChanTypes {
|
|||
struct FurnaceGUIActionDef {
|
||||
const char* name;
|
||||
const char* friendlyName;
|
||||
int defaultBind;
|
||||
FurnaceGUIActionDef(const char* n, const char* fn, int db):
|
||||
name(n), friendlyName(fn), defaultBind(db) {}
|
||||
std::vector<int> defaultBind;
|
||||
bool isNotABind() const { return defaultBind.size()==1 && defaultBind[0]==-1; }
|
||||
FurnaceGUIActionDef(const char* n, const char* fn, int db) :
|
||||
name(n), friendlyName(fn) {
|
||||
if (db!=0) defaultBind.push_back(db);
|
||||
}
|
||||
FurnaceGUIActionDef(const char* n, const char* fn, int db, int db2):
|
||||
name(n), friendlyName(fn) {
|
||||
if (db!=0) defaultBind.push_back(db);
|
||||
if (db2!=0) defaultBind.push_back(db);
|
||||
}
|
||||
};
|
||||
|
||||
struct FurnaceGUIColorDef {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue