kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

menu item cleanup fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2542 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2008-09-12 06:13:47 +00:00
parent ee595c6fb0
commit 53bf136f01
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/menus.cpp
+15 -10
View File
@@ -133,17 +133,11 @@ color mitem::whitepulse(1.0f, 1.0f, 1.0f);
// text item
struct mitemtext : mitem
struct mitemmanual : mitem
{
char *text, *action, *hoveraction;
mitemtext(gmenu *parent, char *text, char *action, char *hoveraction, color *bgcolor) : mitem(parent, bgcolor), text(text), action(action), hoveraction(hoveraction) {}
virtual ~mitemtext()
{
DELETEA(text);
DELETEA(action);
DELETEA(hoveraction);
}
mitemmanual(gmenu *parent, char *text, char *action, char *hoveraction, color *bgcolor) : mitem(parent, bgcolor), text(text), action(action), hoveraction(hoveraction) {}
virtual int width() { return text_width(text); }
@@ -171,6 +165,17 @@ struct mitemtext : mitem
}
};
struct mitemtext : mitemmanual
{
mitemtext(gmenu *parent, char *text, char *action, char *hoveraction, color *bgcolor) : mitemmanual(parent, text, action, hoveraction, bgcolor) {}
virtual ~mitemtext()
{
DELETEA(text);
DELETEA(action);
DELETEA(hoveraction);
}
};
// text input item
struct mitemtextinput : mitemtext
@@ -475,7 +480,7 @@ void menumanual(void *menu, int n, char *text, char *action, color *bgcolor)
{
gmenu &m = *(gmenu *)menu;
if(!n) m.items.deletecontentsp();
m.items.add(new mitemtext(&m, text, action, NULL, bgcolor));
m.items.add(new mitemmanual(&m, text, action, NULL, bgcolor));
}
void menuheader(void *menu, char *header, char *footer)
@@ -715,7 +720,7 @@ void gmenu::init()
{
char *f = files[i];
if(!f || !f[0]) continue;
items.add(new mitemtext(this, f, dirlist->action, NULL, NULL));
items.add(new mitemtext(this, f, newstring(dirlist->action), NULL, NULL));
}
}
loopv(items) items[i]->init();