fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-03 06:20:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

renamed Key_ForceDest to Key_UpdateForDest. added M_Menu_Main_f()

Browse source 
prototype to menu.h. minor tidy-ups.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@775 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2012-10-23 08:44:20 +00:00
parent 5de9f199ae
commit cf30d683d0
5 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Quake/console.c
View file

@ -63,7 +63,6 @@ qboolean con_debuglog = false;
qboolean con_initialized; qboolean con_initialized;
extern void M_Menu_Main_f (void);
/* /*
================ ================
@ -250,7 +249,6 @@ static void Con_MessageMode_f (void)
key_dest = key_message; key_dest = key_message;
} }
/* /*
================ ================
Con_MessageMode2_f Con_MessageMode2_f
@ -351,9 +349,6 @@ void Con_Init (void)
Con_Printf ("Console initialized.\n"); Con_Printf ("Console initialized.\n");
//
// register our commands
//
Cvar_RegisterVariable (&con_notifytime); Cvar_RegisterVariable (&con_notifytime);
Cvar_RegisterVariable (&con_logcenterprint); //johnfitz Cvar_RegisterVariable (&con_logcenterprint); //johnfitz
@ -407,8 +402,7 @@ static void Con_Print (const char *txt)
if (txt[0] == 1) if (txt[0] == 1)
{ {
mask = 128; // go to colored text mask = 128; // go to colored text
S_LocalSound ("misc/talk.wav"); S_LocalSound ("misc/talk.wav"); // play talk wav
// play talk wav
txt++; txt++;
} }
else if (txt[0] == 2) else if (txt[0] == 2)

3
Quake/host.c
View file

@ -686,8 +686,7 @@ void _Host_Frame (float time)
return; // don't run too fast, or packets will flood out return; // don't run too fast, or packets will flood out
// get new key events // get new key events
Key_ForceDest (); Key_UpdateForDest ();
//IN_UpdateForKeydest ();
Sys_SendKeyEvents (); Sys_SendKeyEvents ();
// allow mice or other external controllers to add commands // allow mice or other external controllers to add commands

2
Quake/keys.c
View file

@ -1047,7 +1047,7 @@ void Key_ClearStates (void)
Key_ForceDest Key_ForceDest
=================== ===================
*/ */
void Key_ForceDest (void) void Key_UpdateForDest (void)
{ {
static qboolean forced = false; static qboolean forced = false;

10
Quake/keys.h
View file

@ -158,16 +158,18 @@ extern int key_linepos;
extern int key_insert; extern int key_insert;
extern double key_blinktime; extern double key_blinktime;
void Key_Event (int key, qboolean down); extern qboolean chat_team;
void Key_Init (void); void Key_Init (void);
void Key_WriteBindings (FILE *f);
void Key_ClearStates (void); void Key_ClearStates (void);
void Key_ForceDest (void); void Key_UpdateForDest (void);
void Key_Event (int key, qboolean down);
void Key_SetBinding (int keynum, const char *binding); void Key_SetBinding (int keynum, const char *binding);
const char *Key_KeynumToString (int keynum); const char *Key_KeynumToString (int keynum);
void Key_WriteBindings (FILE *f);
extern qboolean chat_team;
void Key_EndChat (void); void Key_EndChat (void);
const char *Key_GetChatBuffer (void); const char *Key_GetChatBuffer (void);
int Key_GetChatMsgLen (void); int Key_GetChatMsgLen (void);

18
Quake/menu.h
View file

@ -22,15 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef _QUAKE_MENU_H #ifndef _QUAKE_MENU_H
#define _QUAKE_MENU_H #define _QUAKE_MENU_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;
enum m_state_e { enum m_state_e {
m_none, m_none,
m_main, m_main,
@ -63,17 +54,20 @@ extern qboolean m_keys_bind_grab;
// //
void M_Init (void); void M_Init (void);
void M_Keydown (int key); void M_Keydown (int key);
void M_Draw (void);
void M_ToggleMenu_f (void); void M_ToggleMenu_f (void);
void M_Menu_Main_f (void);
void M_Menu_Options_f (void); void M_Menu_Options_f (void);
void M_Menu_Quit_f (void); void M_Menu_Quit_f (void);
void M_Print (int cx, int cy, const char *str); void M_Print (int cx, int cy, const char *str);
void M_PrintWhite (int cx, int cy, const char *str); void M_PrintWhite (int cx, int cy, const char *str);
void M_Draw (void);
void M_DrawCharacter (int cx, int line, int num); void M_DrawCharacter (int cx, int line, int num);
void M_DrawTransPic (int x, int y, qpic_t *pic);
void M_DrawPic (int x, int y, qpic_t *pic); void M_DrawPic (int x, int y, qpic_t *pic);
void M_DrawTransPic (int x, int y, qpic_t *pic);
void M_DrawCheckbox (int x, int y, int on); void M_DrawCheckbox (int x, int y, int on);
#endif /* _QUAKE_MENU_H */ #endif /* _QUAKE_MENU_H */