bot menu fixed

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@405 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-09-17 20:21:16 +00:00
parent 96a3a4a298
commit ed6feb0c1d
15 changed files with 44 additions and 54 deletions
+4 -3
View File
@@ -156,6 +156,7 @@ void menumanual(int m, int n, char *text)
mitem &mitem = menus[m].items.add();
mitem.text = text;
mitem.action = "";
mitem.hoveraction = NULL;
}
void menuitem(char *text, char *action, char *hoveraction)
@@ -164,8 +165,7 @@ void menuitem(char *text, char *action, char *hoveraction)
mitem &mi = menu.items.add();
mi.text = newstring(text);
mi.action = action[0] ? newstring(action) : mi.text;
if(hoveraction) mi.hoveraction = newstring(hoveraction);
else mi.hoveraction = NULL;
mi.hoveraction = hoveraction[0] ? newstring(hoveraction) : NULL;
};
void menumdl(char *mdl, char *frame, char *range, char *rotspeed, char *scale)
@@ -226,7 +226,8 @@ bool menukey(int code, bool isdown)
if(menusel<0) menusel = n>0 ? n-1 : 0;
else if(menusel>=n) menusel = 0;
menus[vmenu].menusel = menusel;
if(menusel != oldmenusel)execute(menus[vmenu].items[menusel].hoveraction, true);
char *haction = menus[vmenu].items[menusel].hoveraction;
if(menusel != oldmenusel && haction) execute(haction, true);
}
else
{