Cube  Diff

Differences From Artifact [4af2503e4b]:

To Artifact [ae67c88d5e]:


1
2
3
4
5



6
7

8
9
10
11
12




13
14
15
16
17
18
19
20

21

22

23
24



25
26

27

28
29
30
31
32
33





34
35

36

37
38
39
40
41
42







43
44

45

46
47


48
49
50
51

52

53

54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74



























75
76
77
78
79
80
81
82
83
84










85
86

87

88
89
90
91



92
93

94

95

96
97
98
99




100
101

102

103
104
105
106
107




108
109
110
111
112
113

114

115

116
117
118



119
120

121
122
123
124




125
126
127
128
129
130
131










132
133

134
135

136
137
138
139
140
141
142
143
144









145
1
2
3
4

5
6
7
8

9





10
11
12
13
14
15
16
17
18
19
20
21
22

23
24
25


26
27
28
29
30
31

32
33





34
35
36
37
38
39
40
41

42
43





44
45
46
47
48
49
50
51
52
53

54
55

56
57
58
59
60
61
62

63
64
65





















66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92










93
94
95
96
97
98
99
100
101
102
103
104
105

106
107



108
109
110
111
112
113

114
115
116




117
118
119
120
121
122
123

124
125




126
127
128
129
130
131
132
133
134
135
136

137
138
139



140
141
142


143




144
145
146
147







148
149
150
151
152
153
154
155
156
157


158


159









160
161
162
163
164
165
166
167
168
169




-
+
+
+

-
+
-
-
-
-
-
+
+
+
+








+
-
+

+
-
-
+
+
+


+
-
+

-
-
-
-
-
+
+
+
+
+


+
-
+

-
-
-
-
-
+
+
+
+
+
+
+


+
-
+

-
+
+




+
-
+

+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+


+
-
+

-
-
-
+
+
+


+
-
+

+
-
-
-
-
+
+
+
+


+
-
+

-
-
-
-
+
+
+
+






+
-
+

+
-
-
-
+
+
+
-
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+

// menus.cpp: ingame menu system (also used for scores and serverlist)

#include "cube.h"

struct mitem { char *text, *action; };
struct mitem {
	char *text, *action;
};

struct gmenu
struct gmenu {
{
    char *name;
    vector<mitem> items;
    int mwidth;
    int menusel;
	char *name;
	vector<mitem> items;
	int mwidth;
	int menusel;
};

vector<gmenu> menus;

int vmenu = -1;

ivector menustack;

void
void menuset(int menu)
menuset(int menu)
{
	if ((vmenu = menu) >= 1)
    if((vmenu = menu)>=1) resetmovement(player1);
    if(vmenu==1) menus[1].menusel = 0;
		resetmovement(player1);
	if (vmenu == 1)
		menus[1].menusel = 0;
};

void
void showmenu(char *name)
showmenu(char *name)
{
    loopv(menus) if(i>1 && strcmp(menus[i].name, name)==0)
    {
        menuset(i);
        return;
    };
	loopv(menus) if (i > 1 && strcmp(menus[i].name, name) == 0)
	{
		menuset(i);
		return;
	};
};

int
int menucompare(mitem *a, mitem *b)
menucompare(mitem *a, mitem *b)
{
    int x = atoi(a->text);
    int y = atoi(b->text);
    if(x>y) return -1;
    if(x<y) return 1;
    return 0;
	int x = atoi(a->text);
	int y = atoi(b->text);
	if (x > y)
		return -1;
	if (x < y)
		return 1;
	return 0;
};

void
void sortmenu(int start, int num)
sortmenu(int start, int num)
{
    qsort(&menus[0].items[start], num, sizeof(mitem), (int (__cdecl *)(const void *,const void *))menucompare);
	qsort(&menus[0].items[start], num, sizeof(mitem),
	    (int(__cdecl *)(const void *, const void *))menucompare);
};

void refreshservers();

bool
bool rendermenu()
rendermenu()
{
	if (vmenu < 0) {
    if(vmenu<0) { menustack.setsize(0); return false; };
    if(vmenu==1) refreshservers();
    gmenu &m = menus[vmenu];
    sprintf_sd(title)(vmenu>1 ? "[ %s menu ]" : "%s", m.name);
    int mdisp = m.items.length();
    int w = 0;
    loopi(mdisp)
    {
        int x = text_width(m.items[i].text);
        if(x>w) w = x;
    };
    int tw = text_width(title);
    if(tw>w) w = tw;
    int step = FONTH/4*5;
    int h = (mdisp+2)*step;
    int y = (VIRTH-h)/2;
    int x = (VIRTW-w)/2;
    blendbox(x-FONTH/2*3, y-FONTH, x+w+FONTH/2*3, y+h+FONTH, true);
    draw_text(title, x, y,2);
    y += FONTH*2;
    if(vmenu)
		menustack.setsize(0);
		return false;
	};
	if (vmenu == 1)
		refreshservers();
	gmenu &m = menus[vmenu];
	sprintf_sd(title)(vmenu > 1 ? "[ %s menu ]" : "%s", m.name);
	int mdisp = m.items.length();
	int w = 0;
	loopi(mdisp)
	{
		int x = text_width(m.items[i].text);
		if (x > w)
			w = x;
	};
	int tw = text_width(title);
	if (tw > w)
		w = tw;
	int step = FONTH / 4 * 5;
	int h = (mdisp + 2) * step;
	int y = (VIRTH - h) / 2;
	int x = (VIRTW - w) / 2;
	blendbox(x - FONTH / 2 * 3, y - FONTH, x + w + FONTH / 2 * 3,
	    y + h + FONTH, true);
	draw_text(title, x, y, 2);
	y += FONTH * 2;
	if (vmenu) {
    {
        int bh = y+m.menusel*step;
        blendbox(x-FONTH, bh-10, x+w+FONTH, bh+FONTH+10, false);
    };
    loopj(mdisp)
    {
        draw_text(m.items[j].text, x, y, 2);
        y += step;
    };
    return true;
		int bh = y + m.menusel * step;
		blendbox(
		    x - FONTH, bh - 10, x + w + FONTH, bh + FONTH + 10, false);
	};
	loopj(mdisp)
	{
		draw_text(m.items[j].text, x, y, 2);
		y += step;
	};
	return true;
};

void
void newmenu(char *name)
newmenu(char *name)
{
    gmenu &menu = menus.add();
    menu.name = newstring(name);
    menu.menusel = 0;
	gmenu &menu = menus.add();
	menu.name = newstring(name);
	menu.menusel = 0;
};

void
void menumanual(int m, int n, char *text)
menumanual(int m, int n, char *text)
{
	if (!n)
    if(!n) menus[m].items.setsize(0);
    mitem &mitem = menus[m].items.add();
    mitem.text = text;
    mitem.action = "";
		menus[m].items.setsize(0);
	mitem &mitem = menus[m].items.add();
	mitem.text = text;
	mitem.action = "";
}

void
void menuitem(char *text, char *action)
menuitem(char *text, char *action)
{
    gmenu &menu = menus.last();
    mitem &mi = menu.items.add();
    mi.text = newstring(text);
    mi.action = action[0] ? newstring(action) : mi.text;
	gmenu &menu = menus.last();
	mitem &mi = menu.items.add();
	mi.text = newstring(text);
	mi.action = action[0] ? newstring(action) : mi.text;
};

COMMAND(menuitem, ARG_2STR);
COMMAND(showmenu, ARG_1STR);
COMMAND(newmenu, ARG_1STR);

bool
bool menukey(int code, bool isdown)
menukey(int code, bool isdown)
{
	if (vmenu <= 0)
    if(vmenu<=0) return false;
    int menusel = menus[vmenu].menusel;
    if(isdown)
		return false;
	int menusel = menus[vmenu].menusel;
	if (isdown) {
    {
        if(code==SDLK_ESCAPE)
		if (code == SDLK_ESCAPE) {
        {
            menuset(-1);
            if(!menustack.empty()) menuset(menustack.pop());
            return true;
			menuset(-1);
			if (!menustack.empty())
				menuset(menustack.pop());
			return true;
        }
        else if(code==SDLK_UP || code==-4) menusel--;
        else if(code==SDLK_DOWN || code==-5) menusel++;
        int n = menus[vmenu].items.length();
        if(menusel<0) menusel = n-1;
        else if(menusel>=n) menusel = 0;
        menus[vmenu].menusel = menusel;
		} else if (code == SDLK_UP || code == -4)
			menusel--;
		else if (code == SDLK_DOWN || code == -5)
			menusel++;
		int n = menus[vmenu].items.length();
		if (menusel < 0)
			menusel = n - 1;
		else if (menusel >= n)
			menusel = 0;
		menus[vmenu].menusel = menusel;
    }
    else
	} else {
    {
        if(code==SDLK_RETURN || code==-2)
		if (code == SDLK_RETURN || code == -2) {
        {
            char *action = menus[vmenu].items[menusel].action;
            if(vmenu==1) connects(getservername(menusel));
            menustack.add(vmenu);
            menuset(-1);
            execute(action, true);
        };
    };
    return true;
			char *action = menus[vmenu].items[menusel].action;
			if (vmenu == 1)
				connects(getservername(menusel));
			menustack.add(vmenu);
			menuset(-1);
			execute(action, true);
		};
	};
	return true;
};