1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 10-fix_menudef.h_includes.dpatch by <fuddl@localhost.localdomain>
4
## All lines beginning with `## DP:' are a description of the patch.
8
diff -urNad openarena-0.7.0~/code/cgame/cg_event.c openarena-0.7.0/code/cgame/cg_event.c
9
--- openarena-0.7.0~/code/cgame/cg_event.c 2006-05-12 12:23:34.000000000 +0200
10
+++ openarena-0.7.0/code/cgame/cg_event.c 2007-08-10 21:22:24.900683552 +0200
13
-===========================================================================
14
+==========================================================================
15
Copyright (C) 1999-2005 Id Software, Inc.
17
This file is part of Quake III Arena source code.
20
// for the voice chats
21
#ifdef MISSIONPACK // bk001205
22
-#include "../../ui/menudef.h"
23
+#include "../ui/menudef.h"
25
//==========================================================================
27
diff -urNad openarena-0.7.0~/code/cgame/cg_servercmds.c openarena-0.7.0/code/cgame/cg_servercmds.c
28
--- openarena-0.7.0~/code/cgame/cg_servercmds.c 2006-05-12 12:23:34.000000000 +0200
29
+++ openarena-0.7.0/code/cgame/cg_servercmds.c 2007-08-10 21:22:16.224189107 +0200
31
// be a valid snapshot this frame
34
-#include "../../ui/menudef.h" // bk001205 - for Q3_ui as well
35
+#include "../ui/menudef.h" // bk001205 - for Q3_ui as well
39
diff -urNad openarena-0.7.0~/code/game/ai_chat.c openarena-0.7.0/code/game/ai_chat.c
40
--- openarena-0.7.0~/code/game/ai_chat.c 2006-05-12 12:21:22.000000000 +0200
41
+++ openarena-0.7.0/code/game/ai_chat.c 2007-08-10 21:22:48.250014154 +0200
44
// for the voice chats
45
#ifdef MISSIONPACK // bk001205
46
-#include "../../ui/menudef.h"
47
+#include "../ui/menudef.h"
50
#define TIME_BETWEENCHATTING 25
51
diff -urNad openarena-0.7.0~/code/game/ai_cmd.c openarena-0.7.0/code/game/ai_cmd.c
52
--- openarena-0.7.0~/code/game/ai_cmd.c 2006-05-12 12:21:22.000000000 +0200
53
+++ openarena-0.7.0/code/game/ai_cmd.c 2007-08-10 21:22:35.453284910 +0200
55
#include "match.h" //string matching types and vars
57
// for the voice chats
58
-#include "../../ui/menudef.h"
59
+#include "../ui/menudef.h"
61
int notleader[MAX_CLIENTS];
63
diff -urNad openarena-0.7.0~/code/game/ai_dmnet.c openarena-0.7.0/code/game/ai_dmnet.c
64
--- openarena-0.7.0~/code/game/ai_dmnet.c 2006-05-12 12:21:22.000000000 +0200
65
+++ openarena-0.7.0/code/game/ai_dmnet.c 2007-08-10 21:23:02.754840737 +0200
67
#include "match.h" //string matching types and vars
69
// for the voice chats
70
-#include "../../ui/menudef.h"
71
+#include "../ui/menudef.h"
73
//goal flag, see ../botlib/be_ai_goal.h for the other GFL_*
75
diff -urNad openarena-0.7.0~/code/game/ai_dmq3.c openarena-0.7.0/code/game/ai_dmq3.c
76
--- openarena-0.7.0~/code/game/ai_dmq3.c 2006-05-12 12:21:22.000000000 +0200
77
+++ openarena-0.7.0/code/game/ai_dmq3.c 2007-08-10 21:23:17.003652731 +0200
79
#include "match.h" //string matching types and vars
81
// for the voice chats
82
-#include "../../ui/menudef.h" // sos001205 - for q3_ui also
83
+#include "../ui/menudef.h" // sos001205 - for q3_ui also
86
#define AREACONTENTS_MOVER 1024
87
diff -urNad openarena-0.7.0~/code/game/ai_team.c openarena-0.7.0/code/game/ai_team.c
88
--- openarena-0.7.0~/code/game/ai_team.c 2006-05-12 12:21:22.000000000 +0200
89
+++ openarena-0.7.0/code/game/ai_team.c 2007-08-10 21:22:56.570488311 +0200
93
// for the voice chats
94
-#include "../../ui/menudef.h"
95
+#include "../ui/menudef.h"
97
//ctf task preferences for a client
98
typedef struct bot_ctftaskpreference_s
99
diff -urNad openarena-0.7.0~/code/game/ai_vcmd.c openarena-0.7.0/code/game/ai_vcmd.c
100
--- openarena-0.7.0~/code/game/ai_vcmd.c 2006-05-12 12:21:22.000000000 +0200
101
+++ openarena-0.7.0/code/game/ai_vcmd.c 2007-08-10 21:23:10.579286627 +0200
103
#include "match.h" //string matching types and vars
105
// for the voice chats
106
-#include "../../ui/menudef.h"
107
+#include "../ui/menudef.h"
110
typedef struct voiceCommand_s
111
diff -urNad openarena-0.7.0~/code/game/g_cmds.c openarena-0.7.0/code/game/g_cmds.c
112
--- openarena-0.7.0~/code/game/g_cmds.c 2006-05-12 12:21:22.000000000 +0200
113
+++ openarena-0.7.0/code/game/g_cmds.c 2007-08-10 21:23:23.832041859 +0200
118
-#include "../../ui/menudef.h" // for the voice chats
119
+#include "../ui/menudef.h" // for the voice chats
123
diff -urNad openarena-0.7.0~/code/ui/menudef.h openarena-0.7.0/code/ui/menudef.h
124
--- openarena-0.7.0~/code/ui/menudef.h 1970-01-01 01:00:00.000000000 +0100
125
+++ openarena-0.7.0/code/ui/menudef.h 2005-08-28 19:54:51.772100000 +0200
128
+===========================================================================
129
+Copyright (C) 1999-2005 Id Software, Inc.
131
+This file is part of Quake III Arena source code.
133
+Quake III Arena source code is free software; you can redistribute it
134
+and/or modify it under the terms of the GNU General Public License as
135
+published by the Free Software Foundation; either version 2 of the License,
136
+or (at your option) any later version.
138
+Quake III Arena source code is distributed in the hope that it will be
139
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
140
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
141
+GNU General Public License for more details.
143
+You should have received a copy of the GNU General Public License
144
+along with Foobar; if not, write to the Free Software
145
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
146
+===========================================================================
149
+#define ITEM_TYPE_TEXT 0 // simple text
150
+#define ITEM_TYPE_BUTTON 1 // button, basically text with a border
151
+#define ITEM_TYPE_RADIOBUTTON 2 // toggle button, may be grouped
152
+#define ITEM_TYPE_CHECKBOX 3 // check box
153
+#define ITEM_TYPE_EDITFIELD 4 // editable text, associated with a cvar
154
+#define ITEM_TYPE_COMBO 5 // drop down list
155
+#define ITEM_TYPE_LISTBOX 6 // scrollable list
156
+#define ITEM_TYPE_MODEL 7 // model
157
+#define ITEM_TYPE_OWNERDRAW 8 // owner draw, name specs what it is
158
+#define ITEM_TYPE_NUMERICFIELD 9 // editable text, associated with a cvar
159
+#define ITEM_TYPE_SLIDER 10 // mouse speed, volume, etc.
160
+#define ITEM_TYPE_YESNO 11 // yes no cvar setting
161
+#define ITEM_TYPE_MULTI 12 // multiple list setting, enumerated
162
+#define ITEM_TYPE_BIND 13 // multiple list setting, enumerated
164
+#define ITEM_ALIGN_LEFT 0 // left alignment
165
+#define ITEM_ALIGN_CENTER 1 // center alignment
166
+#define ITEM_ALIGN_RIGHT 2 // right alignment
168
+#define ITEM_TEXTSTYLE_NORMAL 0 // normal text
169
+#define ITEM_TEXTSTYLE_BLINK 1 // fast blinking
170
+#define ITEM_TEXTSTYLE_PULSE 2 // slow pulsing
171
+#define ITEM_TEXTSTYLE_SHADOWED 3 // drop shadow ( need a color for this )
172
+#define ITEM_TEXTSTYLE_OUTLINED 4 // drop shadow ( need a color for this )
173
+#define ITEM_TEXTSTYLE_OUTLINESHADOWED 5 // drop shadow ( need a color for this )
174
+#define ITEM_TEXTSTYLE_SHADOWEDMORE 6 // drop shadow ( need a color for this )
176
+#define WINDOW_BORDER_NONE 0 // no border
177
+#define WINDOW_BORDER_FULL 1 // full border based on border color ( single pixel )
178
+#define WINDOW_BORDER_HORZ 2 // horizontal borders only
179
+#define WINDOW_BORDER_VERT 3 // vertical borders only
180
+#define WINDOW_BORDER_KCGRADIENT 4 // horizontal border using the gradient bars
182
+#define WINDOW_STYLE_EMPTY 0 // no background
183
+#define WINDOW_STYLE_FILLED 1 // filled with background color
184
+#define WINDOW_STYLE_GRADIENT 2 // gradient bar based on background color
185
+#define WINDOW_STYLE_SHADER 3 // gradient bar based on background color
186
+#define WINDOW_STYLE_TEAMCOLOR 4 // team color
187
+#define WINDOW_STYLE_CINEMATIC 5 // cinematic
189
+#define MENU_TRUE 1 // uh.. true
190
+#define MENU_FALSE 0 // and false
192
+#define HUD_VERTICAL 0x00
193
+#define HUD_HORIZONTAL 0x01
195
+// list box element types
196
+#define LISTBOX_TEXT 0x00
197
+#define LISTBOX_IMAGE 0x01
200
+#define FEEDER_HEADS 0x00 // model heads
201
+#define FEEDER_MAPS 0x01 // text maps based on game type
202
+#define FEEDER_SERVERS 0x02 // servers
203
+#define FEEDER_CLANS 0x03 // clan names
204
+#define FEEDER_ALLMAPS 0x04 // all maps available, in graphic format
205
+#define FEEDER_REDTEAM_LIST 0x05 // red team members
206
+#define FEEDER_BLUETEAM_LIST 0x06 // blue team members
207
+#define FEEDER_PLAYER_LIST 0x07 // players
208
+#define FEEDER_TEAM_LIST 0x08 // team members for team voting
209
+#define FEEDER_MODS 0x09 // team members for team voting
210
+#define FEEDER_DEMOS 0x0a // team members for team voting
211
+#define FEEDER_SCOREBOARD 0x0b // team members for team voting
212
+#define FEEDER_Q3HEADS 0x0c // model heads
213
+#define FEEDER_SERVERSTATUS 0x0d // server status
214
+#define FEEDER_FINDPLAYER 0x0e // find player
215
+#define FEEDER_CINEMATICS 0x0f // cinematics
218
+#define CG_SHOW_BLUE_TEAM_HAS_REDFLAG 0x00000001
219
+#define CG_SHOW_RED_TEAM_HAS_BLUEFLAG 0x00000002
220
+#define CG_SHOW_ANYTEAMGAME 0x00000004
221
+#define CG_SHOW_HARVESTER 0x00000008
222
+#define CG_SHOW_ONEFLAG 0x00000010
223
+#define CG_SHOW_CTF 0x00000020
224
+#define CG_SHOW_OBELISK 0x00000040
225
+#define CG_SHOW_HEALTHCRITICAL 0x00000080
226
+#define CG_SHOW_SINGLEPLAYER 0x00000100
227
+#define CG_SHOW_TOURNAMENT 0x00000200
228
+#define CG_SHOW_DURINGINCOMINGVOICE 0x00000400
229
+#define CG_SHOW_IF_PLAYER_HAS_FLAG 0x00000800
230
+#define CG_SHOW_LANPLAYONLY 0x00001000
231
+#define CG_SHOW_MINED 0x00002000
232
+#define CG_SHOW_HEALTHOK 0x00004000
233
+#define CG_SHOW_TEAMINFO 0x00008000
234
+#define CG_SHOW_NOTEAMINFO 0x00010000
235
+#define CG_SHOW_OTHERTEAMHASFLAG 0x00020000
236
+#define CG_SHOW_YOURTEAMHASENEMYFLAG 0x00040000
237
+#define CG_SHOW_ANYNONTEAMGAME 0x00080000
238
+#define CG_SHOW_2DONLY 0x10000000
241
+#define UI_SHOW_LEADER 0x00000001
242
+#define UI_SHOW_NOTLEADER 0x00000002
243
+#define UI_SHOW_FAVORITESERVERS 0x00000004
244
+#define UI_SHOW_ANYNONTEAMGAME 0x00000008
245
+#define UI_SHOW_ANYTEAMGAME 0x00000010
246
+#define UI_SHOW_NEWHIGHSCORE 0x00000020
247
+#define UI_SHOW_DEMOAVAILABLE 0x00000040
248
+#define UI_SHOW_NEWBESTTIME 0x00000080
249
+#define UI_SHOW_FFA 0x00000100
250
+#define UI_SHOW_NOTFFA 0x00000200
251
+#define UI_SHOW_NETANYNONTEAMGAME 0x00000400
252
+#define UI_SHOW_NETANYTEAMGAME 0x00000800
253
+#define UI_SHOW_NOTFAVORITESERVERS 0x00001000
259
+// ideally these should be done outside of this file but
260
+// this makes it much easier for the macro expansion to
261
+// convert them for the designers ( from the .menu files )
262
+#define CG_OWNERDRAW_BASE 1
263
+#define CG_PLAYER_ARMOR_ICON 1
264
+#define CG_PLAYER_ARMOR_VALUE 2
265
+#define CG_PLAYER_HEAD 3
266
+#define CG_PLAYER_HEALTH 4
267
+#define CG_PLAYER_AMMO_ICON 5
268
+#define CG_PLAYER_AMMO_VALUE 6
269
+#define CG_SELECTEDPLAYER_HEAD 7
270
+#define CG_SELECTEDPLAYER_NAME 8
271
+#define CG_SELECTEDPLAYER_LOCATION 9
272
+#define CG_SELECTEDPLAYER_STATUS 10
273
+#define CG_SELECTEDPLAYER_WEAPON 11
274
+#define CG_SELECTEDPLAYER_POWERUP 12
276
+#define CG_FLAGCARRIER_HEAD 13
277
+#define CG_FLAGCARRIER_NAME 14
278
+#define CG_FLAGCARRIER_LOCATION 15
279
+#define CG_FLAGCARRIER_STATUS 16
280
+#define CG_FLAGCARRIER_WEAPON 17
281
+#define CG_FLAGCARRIER_POWERUP 18
283
+#define CG_PLAYER_ITEM 19
284
+#define CG_PLAYER_SCORE 20
286
+#define CG_BLUE_FLAGHEAD 21
287
+#define CG_BLUE_FLAGSTATUS 22
288
+#define CG_BLUE_FLAGNAME 23
289
+#define CG_RED_FLAGHEAD 24
290
+#define CG_RED_FLAGSTATUS 25
291
+#define CG_RED_FLAGNAME 26
293
+#define CG_BLUE_SCORE 27
294
+#define CG_RED_SCORE 28
295
+#define CG_RED_NAME 29
296
+#define CG_BLUE_NAME 30
297
+#define CG_HARVESTER_SKULLS 31 // only shows in harvester
298
+#define CG_ONEFLAG_STATUS 32 // only shows in one flag
299
+#define CG_PLAYER_LOCATION 33
300
+#define CG_TEAM_COLOR 34
301
+#define CG_CTF_POWERUP 35
303
+#define CG_AREA_POWERUP 36
304
+#define CG_AREA_LAGOMETER 37 // painted with old system
305
+#define CG_PLAYER_HASFLAG 38
306
+#define CG_GAME_TYPE 39 // not done
308
+#define CG_SELECTEDPLAYER_ARMOR 40
309
+#define CG_SELECTEDPLAYER_HEALTH 41
310
+#define CG_PLAYER_STATUS 42
311
+#define CG_FRAGGED_MSG 43 // painted with old system
312
+#define CG_PROXMINED_MSG 44 // painted with old system
313
+#define CG_AREA_FPSINFO 45 // painted with old system
314
+#define CG_AREA_SYSTEMCHAT 46 // painted with old system
315
+#define CG_AREA_TEAMCHAT 47 // painted with old system
316
+#define CG_AREA_CHAT 48 // painted with old system
317
+#define CG_GAME_STATUS 49
318
+#define CG_KILLER 50
319
+#define CG_PLAYER_ARMOR_ICON2D 51
320
+#define CG_PLAYER_AMMO_ICON2D 52
321
+#define CG_ACCURACY 53
322
+#define CG_ASSISTS 54
323
+#define CG_DEFEND 55
324
+#define CG_EXCELLENT 56
325
+#define CG_IMPRESSIVE 57
326
+#define CG_PERFECT 58
327
+#define CG_GAUNTLET 59
328
+#define CG_SPECTATORS 60
329
+#define CG_TEAMINFO 61
330
+#define CG_VOICE_HEAD 62
331
+#define CG_VOICE_NAME 63
332
+#define CG_PLAYER_HASFLAG2D 64
333
+#define CG_HARVESTER_SKULLS2D 65 // only shows in harvester
334
+#define CG_CAPFRAGLIMIT 66
335
+#define CG_1STPLACE 67
336
+#define CG_2NDPLACE 68
337
+#define CG_CAPTURES 69
342
+#define UI_OWNERDRAW_BASE 200
343
+#define UI_HANDICAP 200
344
+#define UI_EFFECTS 201
345
+#define UI_PLAYERMODEL 202
346
+#define UI_CLANNAME 203
347
+#define UI_CLANLOGO 204
348
+#define UI_GAMETYPE 205
349
+#define UI_MAPPREVIEW 206
350
+#define UI_SKILL 207
351
+#define UI_BLUETEAMNAME 208
352
+#define UI_REDTEAMNAME 209
353
+#define UI_BLUETEAM1 210
354
+#define UI_BLUETEAM2 211
355
+#define UI_BLUETEAM3 212
356
+#define UI_BLUETEAM4 213
357
+#define UI_BLUETEAM5 214
358
+#define UI_REDTEAM1 215
359
+#define UI_REDTEAM2 216
360
+#define UI_REDTEAM3 217
361
+#define UI_REDTEAM4 218
362
+#define UI_REDTEAM5 219
363
+#define UI_NETSOURCE 220
364
+#define UI_NETMAPPREVIEW 221
365
+#define UI_NETFILTER 222
367
+#define UI_OPPONENTMODEL 224
368
+#define UI_TIERMAP1 225
369
+#define UI_TIERMAP2 226
370
+#define UI_TIERMAP3 227
371
+#define UI_PLAYERLOGO 228
372
+#define UI_OPPONENTLOGO 229
373
+#define UI_PLAYERLOGO_METAL 230
374
+#define UI_OPPONENTLOGO_METAL 231
375
+#define UI_PLAYERLOGO_NAME 232
376
+#define UI_OPPONENTLOGO_NAME 233
377
+#define UI_TIER_MAPNAME 234
378
+#define UI_TIER_GAMETYPE 235
379
+#define UI_ALLMAPS_SELECTION 236
380
+#define UI_OPPONENT_NAME 237
381
+#define UI_VOTE_KICK 238
382
+#define UI_BOTNAME 239
383
+#define UI_BOTSKILL 240
384
+#define UI_REDBLUE 241
385
+#define UI_CROSSHAIR 242
386
+#define UI_SELECTEDPLAYER 243
387
+#define UI_MAPCINEMATIC 244
388
+#define UI_NETGAMETYPE 245
389
+#define UI_NETMAPCINEMATIC 246
390
+#define UI_SERVERREFRESHDATE 247
391
+#define UI_SERVERMOTD 248
392
+#define UI_GLINFO 249
393
+#define UI_KEYBINDSTATUS 250
394
+#define UI_CLANCINEMATIC 251
395
+#define UI_MAP_TIMETOBEAT 252
396
+#define UI_JOINGAMETYPE 253
397
+#define UI_PREVIEWCINEMATIC 254
398
+#define UI_STARTMAPCINEMATIC 255
399
+#define UI_MAPS_SELECTION 256
401
+#define VOICECHAT_GETFLAG "getflag" // command someone to get the flag
402
+#define VOICECHAT_OFFENSE "offense" // command someone to go on offense
403
+#define VOICECHAT_DEFEND "defend" // command someone to go on defense
404
+#define VOICECHAT_DEFENDFLAG "defendflag" // command someone to defend the flag
405
+#define VOICECHAT_PATROL "patrol" // command someone to go on patrol (roam)
406
+#define VOICECHAT_CAMP "camp" // command someone to camp (we don't have sounds for this one)
407
+#define VOICECHAT_FOLLOWME "followme" // command someone to follow you
408
+#define VOICECHAT_RETURNFLAG "returnflag" // command someone to return our flag
409
+#define VOICECHAT_FOLLOWFLAGCARRIER "followflagcarrier" // command someone to follow the flag carrier
410
+#define VOICECHAT_YES "yes" // yes, affirmative, etc.
411
+#define VOICECHAT_NO "no" // no, negative, etc.
412
+#define VOICECHAT_ONGETFLAG "ongetflag" // I'm getting the flag
413
+#define VOICECHAT_ONOFFENSE "onoffense" // I'm on offense
414
+#define VOICECHAT_ONDEFENSE "ondefense" // I'm on defense
415
+#define VOICECHAT_ONPATROL "onpatrol" // I'm on patrol (roaming)
416
+#define VOICECHAT_ONCAMPING "oncamp" // I'm camping somewhere
417
+#define VOICECHAT_ONFOLLOW "onfollow" // I'm following
418
+#define VOICECHAT_ONFOLLOWCARRIER "onfollowcarrier" // I'm following the flag carrier
419
+#define VOICECHAT_ONRETURNFLAG "onreturnflag" // I'm returning our flag
420
+#define VOICECHAT_INPOSITION "inposition" // I'm in position
421
+#define VOICECHAT_IHAVEFLAG "ihaveflag" // I have the flag
422
+#define VOICECHAT_BASEATTACK "baseattack" // the base is under attack
423
+#define VOICECHAT_ENEMYHASFLAG "enemyhasflag" // the enemy has our flag (CTF)
424
+#define VOICECHAT_STARTLEADER "startleader" // I'm the leader
425
+#define VOICECHAT_STOPLEADER "stopleader" // I resign leadership
426
+#define VOICECHAT_TRASH "trash" // lots of trash talk
427
+#define VOICECHAT_WHOISLEADER "whoisleader" // who is the team leader
428
+#define VOICECHAT_WANTONDEFENSE "wantondefense" // I want to be on defense
429
+#define VOICECHAT_WANTONOFFENSE "wantonoffense" // I want to be on offense
430
+#define VOICECHAT_KILLINSULT "kill_insult" // I just killed you
431
+#define VOICECHAT_TAUNT "taunt" // I want to taunt you
432
+#define VOICECHAT_DEATHINSULT "death_insult" // you just killed me
433
+#define VOICECHAT_KILLGAUNTLET "kill_gauntlet" // I just killed you with the gauntlet
434
+#define VOICECHAT_PRAISE "praise" // you did something good
435
diff -urNad openarena-0.7.0~/code/ui/ui_shared.h openarena-0.7.0/code/ui/ui_shared.h
436
--- openarena-0.7.0~/code/ui/ui_shared.h 2006-05-12 12:24:11.000000000 +0200
437
+++ openarena-0.7.0/code/ui/ui_shared.h 2007-08-10 21:21:56.311054322 +0200
439
#include "../renderer/tr_types.h"
440
#include "../client/keycodes.h"
442
-#include "../../ui/menudef.h"
443
+#include "menudef.h"
445
#define MAX_MENUNAME 32
446
#define MAX_ITEMTEXT 64
added
removed
debian/patches/10-fix_menudef.h_includes.dpatch
