Cube  Diff

{
	if ((vmenu = menu) >= 1)
		[Player.player1 resetMovement];
	if (vmenu == 1)
		menus[1].menusel = 0;
}

COMMAND(showmenu, ARG_1STR, ^(OFString *name) {
COMMAND(showmenu, ARG_1STR, ^ (OFString *name) {
	int i = 0;
	for (Menu *menu in menus) {
		if (i > 1 && [menu.name isEqual:name]) {
		if (i > 1 && [menu.name isEqual: name]) {
			menuset(i);
			return;
		}
		i++;
	}
})

	if (vmenu == 1)
		refreshservers();

	Menu *m = menus[vmenu];
	OFString *title;
	if (vmenu > 1)
		title = [OFString stringWithFormat:@"[ %@ menu ]", m.name];
		title = [OFString stringWithFormat: @"[ %@ menu ]", m.name];
	else
		title = m.name;
	int mdisp = m.items.count;
	int w = 0;
	for (int i = 0; i < mdisp; i++) {
		int x = text_width(m.items[i].text);
		if (x > w)

void
newmenu(OFString *name)
{
	if (menus == nil)
		menus = [[OFMutableArray alloc] init];

	[menus addObject:[Menu menuWithName:name]];
	[menus addObject: [Menu menuWithName: name]];
}

COMMAND(newmenu, ARG_1STR, ^(OFString *name) {
COMMAND(newmenu, ARG_1STR, ^ (OFString *name) {
	newmenu(name);
})

void
menumanual(int m, int n, OFString *text)
{
	if (n == 0)
		[menus[m].items removeAllObjects];

	MenuItem *item = [MenuItem itemWithText:text action:@""];
	[menus[m].items addObject:item];
	MenuItem *item = [MenuItem itemWithText: text action: @""];
	[menus[m].items addObject: item];
}

COMMAND(menuitem, ARG_2STR, ^(OFString *text, OFString *action) {
COMMAND(menuitem, ARG_2STR, ^ (OFString *text, OFString *action) {
	Menu *menu = menus.lastObject;

	MenuItem *item =
	    [MenuItem itemWithText:text
	                    action:(action.length > 0 ? action : text)];
	[menu.items addObject:item];
	MenuItem *item = [MenuItem
	    itemWithText: text
		  action: (action.length > 0 ? action : text)];
	[menu.items addObject: item];
})

bool
menukey(int code, bool isdown)
{
	if (vmenu <= 0)
		return false;

			OFString *action = menus[vmenu].items[menusel].action;
			if (vmenu == 1)
				connects(getservername(menusel));

			if (menuStack == nil)
				menuStack = [[OFMutableArray alloc] init];

			[menuStack addObject:@(vmenu)];
			[menuStack addObject: @(vmenu)];
			menuset(-1);

			execute(action, true);
		}
	}

	return true;
}