Cube  Diff

Differences From Artifact [1d03f1ff21]:

To Artifact [27b088d99d]:


1
2
3
4
5
6
7
8
9
10
11
12
13
// menus.cpp: ingame menu system (also used for scores and serverlist)

#include "cube.h"

#include <memory>

#import "Menu.h"
#import "MenuItem.h"

static OFMutableArray<OFNumber *> *menuStack;
static OFMutableArray<Menu *> *menus;
static int vmenu = -1;





<
<







1
2
3
4


5
6
7
8
9
10
11
// menus.cpp: ingame menu system (also used for scores and serverlist)

#include "cube.h"



#import "Menu.h"
#import "MenuItem.h"

static OFMutableArray<OFNumber *> *menuStack;
static OFMutableArray<Menu *> *menus;
static int vmenu = -1;

164
165
166
167
168
169
170
171
172
173
174
175
176
177

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

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

			std::unique_ptr<char> copy(strdup(action.UTF8String));
			execute(copy.get(), true);
		}
	}

	return true;
}







<
|





162
163
164
165
166
167
168

169
170
171
172
173
174

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

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


			execute(action, true);
		}
	}

	return true;
}