qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-24 03:02:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Menu has been killed completely from qw. It's dead. I doubt anybody will

Browse source 
even notice, given that QW's menu was crippled to the point that it was
completely useless anyway.
This commit is contained in:
Joseph Carter 2001-03-03 09:42:35 +00:00
parent 82522a6fd1
commit c057c27d9a
12 changed files with 34 additions and 1835 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nq/source/Makefile.am
View file

@ -132,7 +132,7 @@ client_LIBS= -L. -L../../libs -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet -lqfutil $(S
client_LIB_DEPS= libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a ../../libs/libqfutil.a
client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_parse.c \
cl_tent.c console.c keys.c menu.c sbar.c r_part.c r_view.c \
cl_tent.c console.c keys.c sbar.c r_part.c r_view.c \
nonintel.c gib.c gib_instructions.c gib_vars.c \
gib_interpret.c gib_modules.c gib_parse.c gib_stack.c vid.c

2
qw/include/Makefile.am
View file

@ -8,7 +8,7 @@ EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h asm_i386.h block16.h \
config.h.in console.h context_x11.h crc.h cvar.h d_iface.h \
d_ifacea.h d_local.h dga_check.h draw.h fbset.h fractalnoise.h gcc_attr.h \
gl_warp_sin.h glquake.h hash.h host.h in_win.h info.h input.h joystick.h \
keys.h link.h locs.h mathlib.h mdfour.h menu.h model.h modelgen.h \
keys.h link.h locs.h mathlib.h mdfour.h model.h modelgen.h \
msg.h net.h pcx.h pmove.h pr_comp.h progdefs.h progs.h protocol.h \
qargs.h qdefs.h qendian.h qfgl_ext.h qtypes.h quakeasm.h quakefs.h \
quakeio.h r_dynamic.h r_local.h r_shared.h render.h sbar.h screen.h \

52
qw/include/menu.h
View file

@ -1,52 +0,0 @@
/*
menu.h
(description)
Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#ifndef _MENU_H
#define _MENU_H
#include "wad.h"
// the net drivers should just set the apropriate bits in m_activenet,
// instead of having the menu code look through their internal tables
#define MNET_IPX 1
#define MNET_TCP 2
extern int m_activenet;
// menus
void M_Init (void);
void M_Keydown (int key);
void M_Draw (void);
void M_ToggleMenu_f (void);
qpic_t *M_CachePic (char *path);
void M_DrawTextBox (int x, int y, int width, int lines);
void M_Menu_Quit_f (void);
#endif // _MENU_H

2
qw/source/Makefile.am
View file

@ -179,7 +179,7 @@ endif
client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
cl_main.c cl_misc.c cl_parse.c cl_pred.c cl_slist.c cl_tent.c \
console.c keys.c locs.c menu.c model_alias.c model_sprite.c nonintel.c \
console.c keys.c locs.c model_alias.c model_sprite.c nonintel.c \
pcx.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c vid.c $(client_ASM)
#

11
qw/source/cl_main.c
View file

@ -78,7 +78,6 @@
#include "host.h"
#include "input.h"
#include "keys.h"
#include "menu.h"
#include "model.h"
#include "msg.h"
#include "net.h"
@ -217,10 +216,11 @@ cvar_t *confirm_quit;
void
CL_Quit_f (void)
{
if (confirm_quit->int_val) {
M_Menu_Quit_f ();
return;
}
// FIXME: MENUCODE
// if (confirm_quit->int_val) {
// M_Menu_Quit_f ();
// return;
// }
CL_Disconnect ();
Sys_Quit ();
}
@ -1617,7 +1617,6 @@ Host_Init (void)
W_LoadWadFile ("gfx.wad");
Key_Init ();
Con_Init ();
M_Init ();
Mod_Init ();
// Con_Printf ("Exe: "__TIME__" "__DATE__"\n");

4
qw/source/gl_screen.c
View file

@ -45,7 +45,6 @@
#include "glquake.h"
#include "host.h"
#include "keys.h"
#include "menu.h"
#include "pcx.h"
#include "sbar.h"
#include "skin.h"
@ -1015,7 +1014,8 @@ SCR_UpdateScreen (void)
SCR_CheckDrawCenterString ();
Sbar_Draw ();
SCR_DrawConsole ();
M_Draw ();
// FIXME: MENUCODE
// M_Draw ();
}
// LordHavoc: adjustable brightness and contrast,

1
qw/source/in_sdl.c
View file

@ -41,7 +41,6 @@
#include "input.h"
#include "joystick.h"
#include "keys.h"
#include "menu.h"
#include "sys.h"
#include "qargs.h"
#include "qendian.h"

9
qw/source/keys.c
View file

@ -47,7 +47,6 @@
#include "console.h"
#include "cvar.h"
#include "keys.h"
#include "menu.h"
#include "screen.h"
#include "sys.h"
@ -810,11 +809,11 @@ Key_Event (int key, int alt_key, qboolean down)
Key_Message (key);
break;
case key_menu:
M_Keydown (key);
// M_Keydown (key);
break;
case key_game:
case key_console:
M_ToggleMenu_f ();
// M_ToggleMenu_f ();
break;
default:
Sys_Error ("Bad key_dest");
@ -849,7 +848,7 @@ Key_Event (int key, int alt_key, qboolean down)
if (cls.demoplayback && down && consolekeys[key] && key_dest == key_game
&& key != K_CTRL && key != K_DEL && key != K_HOME && key != K_END
&& key != K_TAB) {
M_ToggleMenu_f ();
// M_ToggleMenu_f ();
return;
}
//
@ -886,7 +885,7 @@ Key_Event (int key, int alt_key, qboolean down)
Key_Message (key);
break;
case key_menu:
M_Keydown (key);
// M_Keydown (key);
break;
case key_game:

1745
qw/source/menu.c
View file

File diff suppressed because it is too large Load diff

36
qw/source/r_misc.c
View file

@ -35,7 +35,6 @@
#include "cl_parse.h"
#include "draw.h"
#include "host.h"
#include "menu.h"
#include "r_local.h"
#include "sbar.h"
#include "sys.h"
@ -227,31 +226,32 @@ R_TimeGraph (void)
void
R_NetGraph (void)
{
int a, x, y, y2, w, i;
int a, x, y, i;
int lost;
char st[80];
if (vid.width - 16 <= NET_TIMINGS)
w = vid.width - 16;
else
w = NET_TIMINGS;
x = cl_hudswap->int_val ? vid.width - (NET_TIMINGS + 16): 0;
y = vid.height - sb_lines - 24 - r_graphheight->int_val - 1;
x = w - ((vid.width - 320) >> 1);
y = vid.height - sb_lines - 24 - r_graphheight->int_val * 2 - 2;
Draw_TextBox (x, y, NET_TIMINGS / 8, r_graphheight->int_val / 8 + 1);
//M_DrawTextBox (x, y, (w + 7) / 8, (r_graphheight->int_val * 2 + 7) / 8 + 1);
M_DrawTextBox (x-w, y, (w+7)/8, (r_graphheight->int_val*2+7)/8+1);
y2 = y + 8;
y = vid.height - sb_lines - 8 - 2;
y += 8;
x = 8;
lost = CL_CalcNet ();
for (a = NET_TIMINGS - w; a < w; a++) {
i = (cls.netchan.outgoing_sequence - a) & NET_TIMINGSMASK;
R_LineGraph (x + w - 1 - a, y, packet_latency[i]);
}
snprintf (st, sizeof (st), "%3i%% packet loss", lost);
Draw_String8 (8, y2, st);
if (cl_hudswap->int_val) {
Draw_String8 (vid.width - ((strlen (st) * 8) + 8), y, st);
} else {
Draw_String8 (8, y, st);
}
x = cl_hudswap->int_val ? vid.width - (NET_TIMINGS + 8) : 8;
y += 8;
for (a = 0; a < NET_TIMINGS; a++) {
i = (cls.netchan.outgoing_sequence - a) & NET_TIMINGSMASK;
R_LineGraph (x + NET_TIMINGS - 1 - a, y, packet_latency[i]);
}
}
/*

4
qw/source/screen.c
View file

@ -46,7 +46,6 @@
#include "draw.h"
#include "host.h"
#include "keys.h"
#include "menu.h"
#include "pcx.h"
#include "sbar.h"
#include "skin.h"
@ -1002,7 +1001,8 @@ SCR_UpdateScreen (void)
SCR_CheckDrawCenterString ();
Sbar_Draw ();
SCR_DrawConsole ();
M_Draw ();
// FIXME: MENUCODE
// M_Draw ();
}

1
qw/source/vid_x11.c
View file

@ -74,7 +74,6 @@
#include "dga_check.h"
#include "draw.h"
#include "host.h"
#include "menu.h"
#include "qargs.h"
#include "qendian.h"
#include "screen.h"