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

above head icon blending, voicecom menu

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1651 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-02-16 18:10:45 +00:00
parent 274724923c
commit 6e04c5a7a8
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/menus.cpp
+8 -7
View File
@@ -419,7 +419,7 @@ struct mitemcheckbox : mitem
// console iface
void *addmenu(const char *name, const char *title, bool allowinput, void (__cdecl *refreshfunc)(void *, bool), bool hotkeys)
void *addmenu(const char *name, const char *title, bool allowinput, void (__cdecl *refreshfunc)(void *, bool), bool hotkeys, bool forwardkeys)
{
name = newstring(name);
gmenu &menu = menus[name];
@@ -433,13 +433,14 @@ void *addmenu(const char *name, const char *title, bool allowinput, void (__cdec
menu.hotkeys = hotkeys;
menu.refreshfunc = refreshfunc;
menu.dirlist = NULL;
menu.forwardkeys = forwardkeys;
lastmenu = &menu;
return &menu;
}
void newmenu(char *name, char *hotkeys)
void newmenu(char *name, char *hotkeys, char *forwardkeys)
{
addmenu(name, NULL, true, NULL, atoi(hotkeys) > 0);
addmenu(name, NULL, true, NULL, atoi(hotkeys) > 0, atoi(forwardkeys) > 0);
}
void menumanual(void *menu, int n, char *text, char *action, color *bgcolor)
@@ -520,7 +521,7 @@ void chmenumdl(char *menu, char *mdl, char *anim, char *rotspeed, char *scale)
}
COMMAND(newmenu, ARG_2STR);
COMMAND(newmenu, ARG_3STR);
COMMAND(menumdl, ARG_5STR);
COMMAND(menudirlist, ARG_3STR);
COMMAND(chmenumdl, ARG_6STR);
@@ -586,7 +587,7 @@ bool menukey(int code, bool isdown, int unicode)
if(!curmenu->allowinput || !curmenu->items.inrange(menusel)) return false;
mitem &m = *curmenu->items[menusel];
m.key(code, isdown, unicode);
return true;
return !curmenu->forwardkeys;
}
}
@@ -651,8 +652,8 @@ void gmenu::refresh()
void gmenu::open()
{
inited = false;
if(allowinput) player1->stopmoving();
else menusel = 0;
if(!allowinput) menusel = 0;
if(!forwardkeys) player1->stopmoving();
if(items.inrange(menusel)) items[menusel]->focus(true);
init();
}