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

NQ's menu is gone too, menu.c is laying around till I add more info to the

Browse source 
TODO file, then it dies too.
This commit is contained in:
Joseph Carter 2001-03-04 07:43:27 +00:00
parent cf3629b3b3
commit 3ab3941c81
12 changed files with 39 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nq/include/Makefile.am
View file

@ -5,7 +5,7 @@ EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h asm_ia32.h \
dga_check.h d_iface.h d_ifacea.h d_local.h dosisms.h draw.h \
gcc_attr.h gib_error.h gib.h gib_instructions.h \
gib_interpret.h gib_modules.h gib_parse.h gib_stack.h gib_vars.h glquake.h \
gl_warp_sin.h host.h info.h input.h keys.h link.h mathlib.h mdfour.h menu.h \
gl_warp_sin.h host.h info.h input.h keys.h link.h mathlib.h mdfour.h \
modelgen.h model.h mpdosock.h msg.h net_bw.h net_dgrm.h net.h \
net_ipx.h net_loop.h net_mp.h net_ser.h net_udp.h net_vcr.h \
net_wins.h net_wipx.h pr_comp.h progdefs.h progdefs.q1 \

47
nq/include/menu.h
View file

@ -1,47 +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$
*/
//
// 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);

2
nq/source/Makefile.am
View file

@ -132,7 +132,7 @@ client_LIBS= -L. -L../../libs -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet -lqfgamecode
client_LIB_DEPS= libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a ../../libs/libqfgamecode.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

4
nq/source/gl_screen.c
View file

@ -51,7 +51,6 @@
#include "net.h" // needed by: client.h
#include "protocol.h" // needed by: client.h
#include "keys.h"
#include "menu.h"
#include "cmd.h"
#include "sbar.h"
#include "sound.h"
@ -1032,7 +1031,8 @@ SCR_UpdateScreen (void)
SCR_CheckDrawCenterString ();
Sbar_Draw ();
SCR_DrawConsole ();
M_Draw ();
// FIXME: MENUCODE
// M_Draw ();
}
}
}

4
nq/source/host.c
View file

@ -41,7 +41,6 @@
#include "cdaudio.h"
#include "va.h"
#include "sbar.h"
#include "menu.h"
#include "msg.h"
#include "vid.h"
#include "draw.h"
@ -945,7 +944,8 @@ Host_Init (quakeparms_t *parms)
Con_Init_Cvars ();
Key_Init ();
Con_Init ();
M_Init ();
// FIXME: MENUCODE
// M_Init ();
PR_Init_Cvars ();
PR_Init ();
SV_Progs_Init_Cvars ();

10
nq/source/host_cmd.c
View file

@ -54,15 +54,13 @@ Host_Quit_f
==================
*/
extern void M_Menu_Quit_f (void);
void
Host_Quit_f (void)
{
if (key_dest != key_console && cls.state != ca_dedicated) {
M_Menu_Quit_f ();
return;
}
// if (key_dest != key_console && cls.state != ca_dedicated) {
// M_Menu_Quit_f ();
// return;
// }
CL_Disconnect ();
Host_ShutdownServer (false);

1
nq/source/in_sdl.c
View file

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

11
nq/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,12 @@ 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 ();
Con_ToggleConsole_f ();
break;
default:
Sys_Error ("Bad key_dest");
@ -849,7 +849,8 @@ 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 ();
Con_ToggleConsole_f ();
return;
}
//
@ -886,7 +887,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:

34
nq/source/net_dgrm.c
View file

@ -107,10 +107,11 @@ struct {
byte data[MAX_DATAGRAM];
} packetBuffer;
extern int m_return_state;
extern int m_state;
extern qboolean m_return_onerror;
extern char m_return_reason[32];
// FIXME: MENUCODE
//extern int m_return_state;
//extern int m_state;
//extern qboolean m_return_onerror;
//extern char m_return_reason[32];
#ifdef DEBUG
@ -1360,14 +1361,14 @@ _Datagram_Connect (char *host)
if (ret == 0) {
reason = "No Response";
Con_Printf ("%s\n", reason);
strcpy (m_return_reason, reason);
// strcpy (m_return_reason, reason);
goto ErrorReturn;
}
if (ret == -1) {
reason = "Network Error";
Con_Printf ("%s\n", reason);
strcpy (m_return_reason, reason);
// strcpy (m_return_reason, reason);
goto ErrorReturn;
}
@ -1375,7 +1376,7 @@ _Datagram_Connect (char *host)
if (ret == CCREP_REJECT) {
reason = MSG_ReadString (net_message);
Con_Printf (reason);
strncpy (m_return_reason, reason, 31);
// strncpy (m_return_reason, reason, 31);
goto ErrorReturn;
}
@ -1386,7 +1387,7 @@ _Datagram_Connect (char *host)
} else {
reason = "Bad Response";
Con_Printf ("%s\n", reason);
strcpy (m_return_reason, reason);
// strcpy (m_return_reason, reason);
goto ErrorReturn;
}
@ -1399,22 +1400,25 @@ _Datagram_Connect (char *host)
if (dfunc.Connect (newsock, &sock->addr) == -1) {
reason = "Connect to Game failed";
Con_Printf ("%s\n", reason);
strcpy (m_return_reason, reason);
// strcpy (m_return_reason, reason);
goto ErrorReturn;
}
m_return_onerror = false;
// FIXME: MENUCODE
// m_return_onerror = false;
return sock;
ErrorReturn:
// FIXME: MENUCODE - do something with reason
NET_FreeQSocket (sock);
ErrorReturn2:
dfunc.CloseSocket (newsock);
if (m_return_onerror) {
key_dest = key_menu;
m_state = m_return_state;
m_return_onerror = false;
}
// FIXME: MENUCODE
// if (m_return_onerror) {
// key_dest = key_menu;
// m_state = m_return_state;
// m_return_onerror = false;
// }
return NULL;
}

5
nq/source/sbar.c
View file

@ -100,7 +100,6 @@ qboolean sbar_centered;
void Sbar_MiniDeathmatchOverlay (void);
void Sbar_DeathmatchOverlay (void);
void M_DrawPic (int, int, qpic_t *);
/*
*
@ -996,7 +995,7 @@ Sbar_DeathmatchOverlay (void)
scr_fullupdate = 0;
pic = Draw_CachePic ("gfx/ranking.lmp");
M_DrawPic ((320 - pic->width) / 2, 8, pic);
Draw_Pic (160 - pic->width / 2, 0, pic);
// scores
Sbar_SortFrags ();
@ -1004,7 +1003,7 @@ Sbar_DeathmatchOverlay (void)
// draw the text
l = scoreboardlines;
x = 80 + ((vid.width - 320) >> 1);
x = 80;
y = 40;
for (i = 0; i < l; i++) {
k = fragsort[i];

4
nq/source/screen.c
View file

@ -37,7 +37,6 @@
#include "sbar.h"
#include "input.h"
#include "view.h"
#include "menu.h"
#include "host.h"
#include "sys.h"
#include "console.h"
@ -1010,7 +1009,8 @@ SCR_UpdateScreen (void)
SCR_CheckDrawCenterString ();
Sbar_Draw ();
SCR_DrawConsole ();
M_Draw ();
// FIXME: MENUCODE
// M_Draw ();
}
D_DisableBackBufferAccess (); // for adapters that can't stay

1
nq/source/vid_x11.c
View file

@ -57,7 +57,6 @@
#include "d_local.h"
#include "keys.h"
#include "cvar.h"
#include "menu.h"
#include "sys.h"
#include "cmd.h"
#include "input.h"