#define TYPE_GAME 2
#define TYPE_BOTH 3
-int NehGameType;
+static int NehGameType;
enum m_state_e m_state;
+char m_return_reason[32];
void M_Menu_Main_f (void);
void M_Menu_SinglePlayer_f (void);
void M_Menu_GameOptions_f (void);
void M_Menu_ServerList_f (void);
-void M_Main_Draw (void);
- void M_SinglePlayer_Draw (void);
- void M_Transfusion_Episode_Draw (void);
- void M_Transfusion_Skill_Draw (void);
- void M_Load_Draw (void);
- void M_Save_Draw (void);
- void M_MultiPlayer_Draw (void);
- void M_Setup_Draw (void);
- void M_Options_Draw (void);
- void M_Options_Effects_Draw (void);
- void M_Options_Graphics_Draw (void);
- void M_Options_ColorControl_Draw (void);
- void M_Keys_Draw (void);
- void M_Reset_Draw (void);
- void M_Video_Draw (void);
- void M_Help_Draw (void);
- void M_Credits_Draw (void);
- void M_Quit_Draw (void);
-void M_LanConfig_Draw (void);
-void M_GameOptions_Draw (void);
-void M_ServerList_Draw (void);
-
-void M_Main_Key (int key, char ascii);
- void M_SinglePlayer_Key (int key, char ascii);
- void M_Transfusion_Episode_Key (int key, char ascii);
- void M_Transfusion_Skill_Key (int key, char ascii);
- void M_Load_Key (int key, char ascii);
- void M_Save_Key (int key, char ascii);
- void M_MultiPlayer_Key (int key, char ascii);
- void M_Setup_Key (int key, char ascii);
- void M_Options_Key (int key, char ascii);
- void M_Options_Effects_Key (int key, char ascii);
- void M_Options_Graphics_Key (int key, char ascii);
- void M_Options_ColorControl_Key (int key, char ascii);
- void M_Keys_Key (int key, char ascii);
- void M_Reset_Key (int key, char ascii);
- void M_Video_Key (int key, char ascii);
- void M_Help_Key (int key, char ascii);
- void M_Credits_Key (int key, char ascii);
- void M_Quit_Key (int key, char ascii);
-void M_LanConfig_Key (int key, char ascii);
-void M_GameOptions_Key (int key, char ascii);
-void M_ServerList_Key (int key, char ascii);
-
-qboolean m_entersound; // play after drawing a frame, so caching
- // won't disrupt the sound
-
-char m_return_reason [32];
+static void M_Main_Draw (void);
+ static void M_SinglePlayer_Draw (void);
+ static void M_Transfusion_Episode_Draw (void);
+ static void M_Transfusion_Skill_Draw (void);
+ static void M_Load_Draw (void);
+ static void M_Save_Draw (void);
+ static void M_MultiPlayer_Draw (void);
+ static void M_Setup_Draw (void);
+ static void M_Options_Draw (void);
+ static void M_Options_Effects_Draw (void);
+ static void M_Options_Graphics_Draw (void);
+ static void M_Options_ColorControl_Draw (void);
+ static void M_Keys_Draw (void);
+ static void M_Reset_Draw (void);
+ static void M_Video_Draw (void);
+ static void M_Help_Draw (void);
+ static void M_Credits_Draw (void);
+ static void M_Quit_Draw (void);
+static void M_LanConfig_Draw (void);
+static void M_GameOptions_Draw (void);
+static void M_ServerList_Draw (void);
+
+static void M_Main_Key (int key, char ascii);
+ static void M_SinglePlayer_Key (int key, char ascii);
+ static void M_Transfusion_Episode_Key (int key, char ascii);
+ static void M_Transfusion_Skill_Key (int key, char ascii);
+ static void M_Load_Key (int key, char ascii);
+ static void M_Save_Key (int key, char ascii);
+ static void M_MultiPlayer_Key (int key, char ascii);
+ static void M_Setup_Key (int key, char ascii);
+ static void M_Options_Key (int key, char ascii);
+ static void M_Options_Effects_Key (int key, char ascii);
+ static void M_Options_Graphics_Key (int key, char ascii);
+ static void M_Options_ColorControl_Key (int key, char ascii);
+ static void M_Keys_Key (int key, char ascii);
+ static void M_Reset_Key (int key, char ascii);
+ static void M_Video_Key (int key, char ascii);
+ static void M_Help_Key (int key, char ascii);
+ static void M_Credits_Key (int key, char ascii);
+ static void M_Quit_Key (int key, char ascii);
+static void M_LanConfig_Key (int key, char ascii);
+static void M_GameOptions_Key (int key, char ascii);
+static void M_ServerList_Key (int key, char ascii);
+
+static qboolean m_entersound; // play after drawing a frame, so caching won't disrupt the sound
void M_Update_Return_Reason(char *s)
{
char *desc;
} nehahrademonames_t;
-nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
+static nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
{
{"intro", "Prologue"},
{"genf", "The Beginning"},
{"seal", "The Seal is Broken"}
};
-float menu_x, menu_y, menu_width, menu_height;
+static float menu_x, menu_y, menu_width, menu_height;
-void M_Background(int width, int height)
+static void M_Background(int width, int height)
{
menu_width = bound(1, width, vid_conwidth.integer);
menu_height = bound(1, height, vid_conheight.integer);
Draws one solid graphics character
================
*/
-void M_DrawCharacter (float cx, float cy, int num)
+static void M_DrawCharacter (float cx, float cy, int num)
{
char temp[2];
temp[0] = num;
DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0);
}
-void M_PrintColored(float cx, float cy, const char *str)
+static void M_PrintColored(float cx, float cy, const char *str)
{
DrawQ_ColoredString(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL);
}
-void M_Print(float cx, float cy, const char *str)
+static void M_Print(float cx, float cy, const char *str)
{
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
}
-void M_PrintRed (float cx, float cy, const char *str)
+static void M_PrintRed(float cx, float cy, const char *str)
{
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0);
}
-void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
+static void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
{
if (unghosted)
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0);
}
-void M_DrawPic (float cx, float cy, const char *picname)
+static void M_DrawPic(float cx, float cy, const char *picname)
{
- DrawQ_Pic (menu_x + cx, menu_y + cy, Draw_CachePic(picname, false), 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic(menu_x + cx, menu_y + cy, Draw_CachePic(picname, true), 0, 0, 1, 1, 1, 1, 0);
}
-unsigned char identityTable[256];
-unsigned char translationTable[256];
+static unsigned char identityTable[256];
+static unsigned char translationTable[256];
-void M_BuildTranslationTable(int top, int bottom)
+static void M_BuildTranslationTable(int top, int bottom)
{
int j;
unsigned char *dest, *source;
dest[BOTTOM_RANGE+j] = source[bottom+15-j];
}
-
-void M_DrawTextBox (float x, float y, float width, float height)
+static void M_DrawTextBox(float x, float y, float width, float height)
{
int n;
float cx, cy;
}
-int demo_cursor;
-void M_Demo_Draw (void)
+static int demo_cursor;
+static void M_Demo_Draw (void)
{
int i;
m_entersound = true;
}
-void M_Demo_Key (int k, char ascii)
+
+static void M_Demo_Key (int k, char ascii)
{
switch (k)
{
//=============================================================================
/* MAIN MENU */
-int m_main_cursor;
+static int m_main_cursor;
+
+static int MAIN_ITEMS = 4; // Nehahra: Menu Disable
-int MAIN_ITEMS = 4; // Nehahra: Menu Disable
void M_Menu_Main_f (void)
{
}
-void M_Main_Draw (void)
+static void M_Main_Draw (void)
{
int f;
cachepic_t *p;
if (gamemode == GAME_TRANSFUSION) {
int y1, y2, y3;
M_Background(640, 480);
- p = Draw_CachePic ("gfx/menu/tb-transfusion", false);
+ p = Draw_CachePic ("gfx/menu/tb-transfusion", true);
M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/tb-transfusion");
y2 = 120;
// 8 rather than MAIN_ITEMS to skip a number and not miss the last option
}
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/ttl_main", false);
+ p = Draw_CachePic ("gfx/ttl_main", true);
M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main");
// Nehahra
if (gamemode == GAME_NEHAHRA)
}
-void M_Main_Key (int key, char ascii)
+static void M_Main_Key (int key, char ascii)
{
switch (key)
{
switch (m_main_cursor)
{
case 0:
- m_state = m_none;
- key_dest = key_game;
+ if (cls.state == ca_connected)
+ {
+ m_state = m_none;
+ key_dest = key_game;
+ }
Con_ToggleConsole_f ();
break;
case 1:
//=============================================================================
/* SINGLE PLAYER MENU */
-int m_singleplayer_cursor;
+static int m_singleplayer_cursor;
#define SINGLEPLAYER_ITEMS 3
}
-void M_SinglePlayer_Draw (void)
+static void M_SinglePlayer_Draw (void)
{
cachepic_t *p;
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/ttl_sgl", false);
+ p = Draw_CachePic ("gfx/ttl_sgl", true);
// Some mods don't have a single player mode
if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
}
-void M_SinglePlayer_Key (int key, char ascii)
+static void M_SinglePlayer_Key (int key, char ascii)
{
if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
{
//=============================================================================
/* LOAD/SAVE MENU */
-int load_cursor; // 0 < load_cursor < MAX_SAVEGAMES
+static int load_cursor; // 0 < load_cursor < MAX_SAVEGAMES
#define MAX_SAVEGAMES 12
-char m_filenames[MAX_SAVEGAMES][SAVEGAME_COMMENT_LENGTH+1];
-int loadable[MAX_SAVEGAMES];
+static char m_filenames[MAX_SAVEGAMES][SAVEGAME_COMMENT_LENGTH+1];
+static int loadable[MAX_SAVEGAMES];
-void M_ScanSaves (void)
+static void M_ScanSaves (void)
{
int i, j, len;
char name[MAX_OSPATH];
}
-void M_Load_Draw (void)
+static void M_Load_Draw (void)
{
int i;
cachepic_t *p;
M_Background(320, 200);
- p = Draw_CachePic ("gfx/p_load", false);
+ p = Draw_CachePic ("gfx/p_load", true);
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load" );
for (i=0 ; i< MAX_SAVEGAMES; i++)
}
-void M_Save_Draw (void)
+static void M_Save_Draw (void)
{
int i;
cachepic_t *p;
M_Background(320, 200);
- p = Draw_CachePic ("gfx/p_save", false);
+ p = Draw_CachePic ("gfx/p_save", true);
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save");
for (i=0 ; i<MAX_SAVEGAMES ; i++)
}
-void M_Load_Key (int k, char ascii)
+static void M_Load_Key (int k, char ascii)
{
switch (k)
{
}
-void M_Save_Key (int k, char ascii)
+static void M_Save_Key (int k, char ascii)
{
switch (k)
{
//=============================================================================
/* Transfusion Single Player Episode Menu */
-int m_episode_cursor;
+static int m_episode_cursor;
#define EPISODE_ITEMS 6
void M_Menu_Transfusion_Episode_f (void)
key_dest = key_menu;
}
-void M_Transfusion_Episode_Draw (void)
+static void M_Transfusion_Episode_Draw (void)
{
int y;
cachepic_t *p;
M_Background(640, 480);
- p = Draw_CachePic ("gfx/menu/tb-episodes", false);
+ p = Draw_CachePic ("gfx/menu/tb-episodes", true);
M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/tb-episodes");
for (y = 0; y < EPISODE_ITEMS; y++){
M_DrawPic (0, 160 + y * 40, va("gfx/menu/episode%i", y+1));
M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va("gfx/menu/episode%iselected", m_episode_cursor + 1));
}
-void M_Transfusion_Episode_Key (int key, char ascii)
+static void M_Transfusion_Episode_Key (int key, char ascii)
{
switch (key)
{
//=============================================================================
/* Transfusion Single Player Skill Menu */
-int m_skill_cursor = 2;
+static int m_skill_cursor = 2;
#define SKILL_ITEMS 5
void M_Menu_Transfusion_Skill_f (void)
key_dest = key_menu;
}
-void M_Transfusion_Skill_Draw (void)
+static void M_Transfusion_Skill_Draw (void)
{
int y;
cachepic_t *p;
M_Background(640, 480);
- p = Draw_CachePic ("gfx/menu/tb-difficulty", false);
+ p = Draw_CachePic ("gfx/menu/tb-difficulty", true);
M_DrawPic(640/2 - p->width/2, 40, "gfx/menu/tb-difficulty");
for (y = 0; y < SKILL_ITEMS; y++)
M_DrawPic (0, 140 + (m_skill_cursor + 1) *40, va("gfx/menu/difficulty%iselected", m_skill_cursor + 1));
}
-void M_Transfusion_Skill_Key (int key, char ascii)
+static void M_Transfusion_Skill_Key (int key, char ascii)
{
switch (key)
{
//=============================================================================
/* MULTIPLAYER MENU */
-int m_multiplayer_cursor;
+static int m_multiplayer_cursor;
#define MULTIPLAYER_ITEMS 3
}
-void M_MultiPlayer_Draw (void)
+static void M_MultiPlayer_Draw (void)
{
int f;
cachepic_t *p;
if (gamemode == GAME_TRANSFUSION)
{
M_Background(640, 480);
- p = Draw_CachePic ("gfx/menu/tb-online", false);
+ p = Draw_CachePic ("gfx/menu/tb-online", true);
M_DrawPic (640/2 - p->width/2, 140, "gfx/menu/tb-online");
for (f = 1; f <= MULTIPLAYER_ITEMS; f++)
M_DrawPic (0, 180 + f*40, va("gfx/menu/online%i", f));
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/p_multi", false);
+ p = Draw_CachePic ("gfx/p_multi", true);
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
M_DrawPic (72, 32, "gfx/mp_menu");
}
-void M_MultiPlayer_Key (int key, char ascii)
+static void M_MultiPlayer_Key (int key, char ascii)
{
switch (key)
{
//=============================================================================
/* SETUP MENU */
-int setup_cursor = 4;
-int setup_cursor_table[] = {40, 64, 88, 124, 140};
+static int setup_cursor = 4;
+static int setup_cursor_table[] = {40, 64, 88, 124, 140};
-char setup_myname[32];
-int setup_oldtop;
-int setup_oldbottom;
-int setup_top;
-int setup_bottom;
-int setup_rate;
-int setup_oldrate;
+static char setup_myname[32];
+static int setup_oldtop;
+static int setup_oldbottom;
+static int setup_top;
+static int setup_bottom;
+static int setup_rate;
+static int setup_oldrate;
#define NUM_SETUP_CMDS 5
return bound(1, i, RATES) - 1;
}
-void M_Setup_Draw (void)
+static void M_Setup_Draw (void)
{
int i;
cachepic_t *p;
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/p_multi", false);
+ p = Draw_CachePic ("gfx/p_multi", true);
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
M_Print(64, 40, "Your name");
menuplyr_width = image_width;
menuplyr_height = image_height;
Mem_Free(f);
- menuplyr_pixels = (unsigned char *)Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height);
- menuplyr_translated = (unsigned int *)Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height * 4);
+ menuplyr_pixels = (unsigned char *)Mem_Alloc(cls.permanentmempool, menuplyr_width * menuplyr_height);
+ menuplyr_translated = (unsigned int *)Mem_Alloc(cls.permanentmempool, menuplyr_width * menuplyr_height * 4);
memcpy(menuplyr_pixels, data, menuplyr_width * menuplyr_height);
Mem_Free(data);
}
}
-void M_Setup_Key (int k, char ascii)
+static void M_Setup_Key (int k, char ascii)
{
int l;
#define SLIDER_RANGE 10
-void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
+static void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
{
char text[16];
int i;
M_Print(x + (SLIDER_RANGE+2) * 8, y, text);
}
-void M_DrawCheckbox (int x, int y, int on)
+static void M_DrawCheckbox (int x, int y, int on)
{
if (on)
M_Print(x, y, "on");
#define OPTIONS_ITEMS 40
-int options_cursor;
+static int options_cursor;
void M_Menu_Options_f (void)
{
extern cvar_t gl_texture_anisotropy;
extern cvar_t r_textshadow;
-void M_Menu_Options_AdjustSliders (int dir)
+static void M_Menu_Options_AdjustSliders (int dir)
{
int optnum;
S_LocalSound ("sound/misc/menu3.wav");
Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer);
}
-int optnum;
-int opty;
-int optcursor;
+static int optnum;
+static int opty;
+static int optcursor;
-void M_Options_PrintCommand(const char *s, int enabled)
+static void M_Options_PrintCommand(const char *s, int enabled)
{
if (opty >= 32)
{
optnum++;
}
-void M_Options_PrintCheckbox(const char *s, int enabled, int yes)
+static void M_Options_PrintCheckbox(const char *s, int enabled, int yes)
{
if (opty >= 32)
{
optnum++;
}
-void M_Options_PrintSlider(const char *s, int enabled, float value, float minvalue, float maxvalue)
+static void M_Options_PrintSlider(const char *s, int enabled, float value, float minvalue, float maxvalue)
{
if (opty >= 32)
{
optnum++;
}
-void M_Options_Draw (void)
+static void M_Options_Draw (void)
{
int visible;
cachepic_t *p;
M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", false);
+ p = Draw_CachePic("gfx/p_option", true);
M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optnum = 0;
}
-void M_Options_Key (int k, char ascii)
+static void M_Options_Key (int k, char ascii)
{
switch (k)
{
#define OPTIONS_EFFECTS_ITEMS 35
-int options_effects_cursor;
+static int options_effects_cursor;
void M_Menu_Options_Effects_f (void)
{
extern cvar_t r_lightningbeam_color_blue;
extern cvar_t r_lightningbeam_qmbtexture;
-void M_Menu_Options_Effects_AdjustSliders (int dir)
+static void M_Menu_Options_Effects_AdjustSliders (int dir)
{
int optnum;
S_LocalSound ("sound/misc/menu3.wav");
else if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_waterscroll, bound(0, r_waterscroll.value + dir * 0.5, 10));
}
-void M_Options_Effects_Draw (void)
+static void M_Options_Effects_Draw (void)
{
int visible;
cachepic_t *p;
M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", false);
+ p = Draw_CachePic("gfx/p_option", true);
M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optcursor = options_effects_cursor;
}
-void M_Options_Effects_Key (int k, char ascii)
+static void M_Options_Effects_Key (int k, char ascii)
{
switch (k)
{
#define OPTIONS_GRAPHICS_ITEMS 14
-int options_graphics_cursor;
+static int options_graphics_cursor;
void M_Menu_Options_Graphics_f (void)
{
extern cvar_t r_bloom_resolution;
extern cvar_t gl_picmip;
-void M_Menu_Options_Graphics_AdjustSliders (int dir)
+static void M_Menu_Options_Graphics_AdjustSliders (int dir)
{
int optnum;
S_LocalSound ("sound/misc/menu3.wav");
}
-void M_Options_Graphics_Draw (void)
+static void M_Options_Graphics_Draw (void)
{
int visible;
cachepic_t *p;
M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", false);
+ p = Draw_CachePic("gfx/p_option", true);
M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optcursor = options_graphics_cursor;
}
-void M_Options_Graphics_Key (int k, char ascii)
+static void M_Options_Graphics_Key (int k, char ascii)
{
switch (k)
{
#define OPTIONS_COLORCONTROL_ITEMS 18
-int options_colorcontrol_cursor;
+static int options_colorcontrol_cursor;
// intensity value to match up to 50% dither to 'correct' quake
-cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.25", "intensity value that matches up to white/black dither pattern, due to Quake's grey level being quite dark this is 0.25, other games may use other values"};
+static cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.25", "intensity value that matches up to white/black dither pattern, due to Quake's grey level being quite dark this is 0.25, other games may use other values"};
void M_Menu_Options_ColorControl_f (void)
{
}
-void M_Menu_Options_ColorControl_AdjustSliders (int dir)
+static void M_Menu_Options_ColorControl_AdjustSliders (int dir)
{
int optnum;
float f;
}
}
-void M_Options_ColorControl_Draw (void)
+static void M_Options_ColorControl_Draw (void)
{
int visible;
float x, c, s, t, u, v;
cachepic_t *p, *dither;
- dither = Draw_CachePic("gfx/colorcontrol/ditherpattern", false);
+ dither = Draw_CachePic("gfx/colorcontrol/ditherpattern", true);
M_Background(320, 256);
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/p_option", false);
+ p = Draw_CachePic("gfx/p_option", true);
M_DrawPic((320-p->width)/2, 4, "gfx/p_option");
optcursor = options_colorcontrol_cursor;
}
-void M_Options_ColorControl_Key (int k, char ascii)
+static void M_Options_ColorControl_Key (int k, char ascii)
{
switch (k)
{
//=============================================================================
/* KEYS MENU */
-char *quakebindnames[][2] =
+static char *quakebindnames[][2] =
{
{"+attack", "attack"},
{"impulse 10", "next weapon"},
{"+movedown", "swim down"}
};
-char *transfusionbindnames[][2] =
+static char *transfusionbindnames[][2] =
{
{"", "Movement"}, // Movement commands
{"+forward", "walk forward"},
{"impulse 79", "taunt 9"}
};
-char *goodvsbad2bindnames[][2] =
+static char *goodvsbad2bindnames[][2] =
{
{"impulse 69", "Power 1"},
{"impulse 70", "Power 2"},
{"+movedown", "swim down"}
};
-int numcommands;
-char *(*bindnames)[2];
+static int numcommands;
+static char *(*bindnames)[2];
/*
typedef struct binditem_s
}
bindcategory_t;
-bindcategory_t *bindcategories = NULL;
+static bindcategory_t *bindcategories = NULL;
-void M_ClearBinds (void)
+static void M_ClearBinds (void)
{
for (c = bindcategories;c;c = cnext)
{
bindcategories = NULL;
}
-void M_AddBindToCategory(bindcategory_t *c, char *command, char *description)
+static void M_AddBindToCategory(bindcategory_t *c, char *command, char *description)
{
for (b = &c->binds;*b;*b = &(*b)->next);
*b = Z_Alloc(sizeof(binditem_t) + strlen(command) + 1 + strlen(description) + 1);
strcpy(*b->description, description);
}
-void M_AddBind (char *category, char *command, char *description)
+static void M_AddBind (char *category, char *command, char *description)
{
for (c = &bindcategories;*c;c = &(*c)->next)
{
M_AddBindToCategory(*c, command, description);
}
-void M_DefaultBinds (void)
+static void M_DefaultBinds (void)
{
M_ClearBinds();
M_AddBind("movement", "+jump", "jump / swim up");
*/
-int keys_cursor;
-int bind_grab;
+static int keys_cursor;
+static int bind_grab;
void M_Menu_Keys_f (void)
{
}
}
-void M_UnbindCommand (char *command)
+static void M_UnbindCommand (char *command)
{
int j;
char *b;
}
-void M_Keys_Draw (void)
+static void M_Keys_Draw (void)
{
int i, j;
int keys[NUMKEYS];
M_Background(320, 48 + 8 * numcommands);
- p = Draw_CachePic ("gfx/ttl_cstm", false);
+ p = Draw_CachePic ("gfx/ttl_cstm", true);
M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm");
if (bind_grab)
}
-void M_Keys_Key (int k, char ascii)
+static void M_Keys_Key (int k, char ascii)
{
char cmd[80];
int keys[NUMKEYS];
}
-void M_Reset_Key (int key, char ascii)
+static void M_Reset_Key (int key, char ascii)
{
switch (key)
{
}
}
-void M_Reset_Draw (void)
+static void M_Reset_Draw (void)
{
int lines = 2, linelength = 20;
M_Background(linelength * 8 + 16, lines * 8 + 16);
#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
#define VIDEO_ITEMS 7
-int video_cursor = 0;
-int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162};
-int video_resolution;
+static int video_cursor = 0;
+static int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162};
+static int video_resolution;
void M_Menu_Video_f (void)
{
}
-void M_Video_Draw (void)
+static void M_Video_Draw (void)
{
cachepic_t *p;
M_Background(320, 200);
M_DrawPic(16, 4, "gfx/qplaque");
- p = Draw_CachePic("gfx/vidmodes", false);
+ p = Draw_CachePic("gfx/vidmodes", true);
M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes");
// Current Resolution
}
-void M_Menu_Video_AdjustSliders (int dir)
+static void M_Menu_Video_AdjustSliders (int dir)
{
S_LocalSound ("sound/misc/menu3.wav");
}
-void M_Video_Key (int key, char ascii)
+static void M_Video_Key (int key, char ascii)
{
switch (key)
{
//=============================================================================
/* HELP MENU */
-int help_page;
+static int help_page;
#define NUM_HELP_PAGES 6
-void M_Help_Draw (void)
+static void M_Help_Draw (void)
{
M_Background(320, 200);
M_DrawPic (0, 0, va("gfx/help%i", help_page));
}
-void M_Help_Key (int key, char ascii)
+static void M_Help_Key (int key, char ascii)
{
switch (key)
{
-void M_Credits_Draw (void)
+static void M_Credits_Draw (void)
{
M_Background(640, 480);
M_DrawPic (0, 0, "gfx/creditsmiddle");
}
-void M_Credits_Key (int key, char ascii)
+static void M_Credits_Key (int key, char ascii)
{
M_Menu_Main_f ();
}
//=============================================================================
/* QUIT MENU */
-char *m_quit_message[9];
-int m_quit_prevstate;
-qboolean wasInMenus;
+static char *m_quit_message[9];
+static int m_quit_prevstate;
+static qboolean wasInMenus;
-int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8)
+static int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8)
{
m_quit_message[0] = line1;
m_quit_message[1] = line2;
return 1;
}
-int M_ChooseQuitMessage(int request)
+static int M_ChooseQuitMessage(int request)
{
switch (gamemode)
{
}
-void M_Quit_Key (int key, char ascii)
+static void M_Quit_Key (int key, char ascii)
{
switch (key)
{
}
}
-void M_Quit_Draw (void)
+static void M_Quit_Draw (void)
{
int i, l, linelength, firstline, lastline, lines;
for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_quit_message[i];i++)
//=============================================================================
/* LAN CONFIG MENU */
-int lanConfig_cursor = -1;
-int lanConfig_cursor_table [] = {56, 76, 112};
-#define NUM_LANCONFIG_CMDS 3
+static int lanConfig_cursor = -1;
+static int lanConfig_cursor_table [] = {56, 76, 84, 120};
+#define NUM_LANCONFIG_CMDS 4
-int lanConfig_port;
-char lanConfig_portname[6];
-char lanConfig_joinname[22];
+static int lanConfig_port;
+static char lanConfig_portname[6];
+static char lanConfig_joinname[22];
void M_Menu_LanConfig_f (void)
{
}
-void M_LanConfig_Draw (void)
+static void M_LanConfig_Draw (void)
{
cachepic_t *p;
int basex;
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/p_multi", false);
+ p = Draw_CachePic ("gfx/p_multi", true);
basex = (320-p->width)/2;
M_DrawPic (basex, 4, "gfx/p_multi");
if (JoiningGame)
{
- M_Print(basex, lanConfig_cursor_table[1], "Search for games...");
- M_Print(basex, lanConfig_cursor_table[2]-16, "Join game at:");
- M_DrawTextBox (basex+8, lanConfig_cursor_table[2]-8, 22, 1);
- M_Print(basex+16, lanConfig_cursor_table[2], lanConfig_joinname);
+ M_Print(basex, lanConfig_cursor_table[1], "Search for DarkPlaces games...");
+ M_Print(basex, lanConfig_cursor_table[2], "Search for QuakeWorld games...");
+ M_Print(basex, lanConfig_cursor_table[3]-16, "Join game at:");
+ M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, 22, 1);
+ M_Print(basex+16, lanConfig_cursor_table[3], lanConfig_joinname);
}
else
{
M_DrawCharacter (basex-8, lanConfig_cursor_table [lanConfig_cursor], 12+((int)(realtime*4)&1));
if (lanConfig_cursor == 0)
- M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [0], 10+((int)(realtime*4)&1));
+ M_DrawCharacter (basex+9*8 + 8*strlen(lanConfig_portname), lanConfig_cursor_table [lanConfig_cursor], 10+((int)(realtime*4)&1));
- if (lanConfig_cursor == 2)
- M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [2], 10+((int)(realtime*4)&1));
+ if (lanConfig_cursor == 3)
+ M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [lanConfig_cursor], 10+((int)(realtime*4)&1));
if (*m_return_reason)
M_Print(basex, 168, m_return_reason);
}
-void M_LanConfig_Key (int key, char ascii)
+static void M_LanConfig_Key (int key, char ascii)
{
int l;
lanConfig_cursor--;
if (lanConfig_cursor < 0)
lanConfig_cursor = NUM_LANCONFIG_CMDS-1;
+ // when in start game menu, skip the unused search qw servers item
+ if (StartingGame && lanConfig_cursor == 2)
+ lanConfig_cursor = 1;
break;
case K_DOWNARROW:
lanConfig_cursor++;
if (lanConfig_cursor >= NUM_LANCONFIG_CMDS)
lanConfig_cursor = 0;
+ // when in start game menu, skip the unused search qw servers item
+ if (StartingGame && lanConfig_cursor == 1)
+ lanConfig_cursor = 2;
break;
case K_ENTER:
Cvar_SetValue("port", lanConfig_port);
- if (lanConfig_cursor == 1)
+ if (lanConfig_cursor == 1 || lanConfig_cursor == 2)
{
if (StartingGame)
{
break;
}
- if (lanConfig_cursor == 2)
+ if (lanConfig_cursor == 3)
Cbuf_AddText ( va ("connect \"%s\"\n", lanConfig_joinname) );
break;
lanConfig_portname[strlen(lanConfig_portname)-1] = 0;
}
- if (lanConfig_cursor == 2)
+ if (lanConfig_cursor == 3)
{
if (strlen(lanConfig_joinname))
lanConfig_joinname[strlen(lanConfig_joinname)-1] = 0;
if (ascii < 32)
break;
- if (lanConfig_cursor == 2)
+ if (lanConfig_cursor == 3)
{
l = (int)strlen(lanConfig_joinname);
if (l < 21)
}
}
- if (StartingGame && lanConfig_cursor == 2)
+ if (StartingGame && lanConfig_cursor == 3)
{
if (key == K_UPARROW)
lanConfig_cursor = 1;
}
gamelevels_t;
-level_t quakelevels[] =
+static level_t quakelevels[] =
{
{"start", "Entrance"}, // 0
{"dm6", "The Dark Zone"}
};
-episode_t quakeepisodes[] =
+static episode_t quakeepisodes[] =
{
{"Welcome to Quake", 0, 1},
{"Doomed Dimension", 1, 8},
};
//MED 01/06/97 added hipnotic levels
-level_t hipnoticlevels[] =
+static level_t hipnoticlevels[] =
{
{"start", "Command HQ"}, // 0
};
//MED 01/06/97 added hipnotic episodes
-episode_t hipnoticepisodes[] =
+static episode_t hipnoticepisodes[] =
{
{"Scourge of Armagon", 0, 1},
{"Fortress of the Dead", 1, 5},
//PGM 01/07/97 added rogue levels
//PGM 03/02/97 added dmatch level
-level_t roguelevels[] =
+static level_t roguelevels[] =
{
{"start", "Split Decision"},
{"r1m1", "Deviant's Domain"},
//PGM 01/07/97 added rogue episodes
//PGM 03/02/97 added dmatch episode
-episode_t rogueepisodes[] =
+static episode_t rogueepisodes[] =
{
{"Introduction", 0, 1},
{"Hell's Fortress", 1, 7},
{"Deathmatch Arena", 16, 1}
};
-level_t nehahralevels[] =
+static level_t nehahralevels[] =
{
{"nehstart", "Welcome to Nehahra"},
{"neh1m1", "Forge City1: Slipgates"},
{"nehend", "Quintessence"}
};
-episode_t nehahraepisodes[] =
+static episode_t nehahraepisodes[] =
{
{"Welcome to Nehahra", 0, 1},
{"The Fall of Forge", 1, 9},
};
// Map list for Transfusion
-level_t transfusionlevels[] =
+static level_t transfusionlevels[] =
{
{"e1m1", "Cradle to Grave"},
{"e1m2", "Wrong Side of the Tracks"},
{"simple", "Dead Simple"}
};
-episode_t transfusionepisodes[] =
+static episode_t transfusionepisodes[] =
{
{"The Way of All Flesh", 0, 8},
{"Even Death May Die", 8, 9},
{"Conversions", 85, 9}
};
-level_t goodvsbad2levels[] =
+static level_t goodvsbad2levels[] =
{
{"rts", "Many Paths"}, // 0
{"chess", "Chess, Scott Hess"}, // 1
{"island", "Adventure Islands"},
};
-episode_t goodvsbad2episodes[] =
+static episode_t goodvsbad2episodes[] =
{
{"Levels? Bevels!", 0, 8},
};
-level_t battlemechlevels[] =
+static level_t battlemechlevels[] =
{
{"start", "Parking Level"},
{"dm1", "Hot Dump"}, // 1
{"dm6", "Army go Underground"},
};
-episode_t battlemechepisodes[] =
+static episode_t battlemechepisodes[] =
{
{"Time for Battle", 0, 7},
};
-level_t openquartzlevels[] =
+static level_t openquartzlevels[] =
{
{"start", "Welcome to Openquartz"},
{"am1", "The nameless chambers"},
};
-episode_t openquartzepisodes[] =
+static episode_t openquartzepisodes[] =
{
{"Single Player", 0, 1},
{"Void Deathmatch", 1, 6},
{"Contrib", 7, 6},
};
-level_t defeatindetail2levels[] =
+static level_t defeatindetail2levels[] =
{
{"atac3", "River Crossing"},
{"atac4", "Canyon Chaos"},
{"atac7", "Desert Stormer"},
};
-episode_t defeatindetail2episodes[] =
+static episode_t defeatindetail2episodes[] =
{
{"ATAC Campaign", 0, 3},
};
-gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
-gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7};
-gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
-gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
-gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
-gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 11};
-gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1};
-gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
-gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3};
-gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1};
+static gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
+static gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7};
+static gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
+static gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
+static gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
+static gamelevels_t transfusiongame = {"Transfusion", transfusionlevels, transfusionepisodes, 11};
+static gamelevels_t goodvsbad2game = {"Good Vs. Bad 2", goodvsbad2levels, goodvsbad2episodes, 1};
+static gamelevels_t battlemechgame = {"Battlemech", battlemechlevels, battlemechepisodes, 1};
+static gamelevels_t openquartzgame = {"OpenQuartz", openquartzlevels, openquartzepisodes, 3};
+static gamelevels_t defeatindetail2game = {"Defeat In Detail 2", defeatindetail2levels, defeatindetail2episodes, 1};
typedef struct gameinfo_s
{
}
gameinfo_t;
-gameinfo_t gamelist[] =
+static gameinfo_t gamelist[] =
{
{GAME_NORMAL, &sharewarequakegame, ®isteredquakegame},
{GAME_HIPNOTIC, &hipnoticgame, &hipnoticgame},
{(gamemode_t)-1, &sharewarequakegame, ®isteredquakegame} // final fallback
};
-gamelevels_t *lookupgameinfo(void)
+static gamelevels_t *lookupgameinfo(void)
{
int i;
for (i = 0;gamelist[i].gameid >= 0 && gamelist[i].gameid != gamemode;i++);
return gamelist[i].notregistered;
}
-int startepisode;
-int startlevel;
-int maxplayers;
-qboolean m_serverInfoMessage = false;
-double m_serverInfoMessageTime;
+static int startepisode;
+static int startlevel;
+static int maxplayers;
+static qboolean m_serverInfoMessage = false;
+static double m_serverInfoMessageTime;
void M_Menu_GameOptions_f (void)
{
}
-int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 112, 140, 160, 168};
+static int gameoptions_cursor_table[] = {40, 56, 64, 72, 80, 88, 96, 104, 112, 140, 160, 168};
#define NUM_GAMEOPTIONS 12
-int gameoptions_cursor;
+static int gameoptions_cursor;
void M_GameOptions_Draw (void)
{
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque");
- p = Draw_CachePic ("gfx/p_multi", false);
+ p = Draw_CachePic ("gfx/p_multi", true);
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi");
M_DrawTextBox (152, 32, 10, 1);
}
-void M_NetStart_Change (int dir)
+static void M_NetStart_Change (int dir)
{
gamelevels_t *g;
int count;
}
}
-void M_GameOptions_Key (int key, char ascii)
+static void M_GameOptions_Key (int key, char ascii)
{
gamelevels_t *g;
int l;
//=============================================================================
/* SLIST MENU */
-int slist_cursor;
+static int slist_cursor;
void M_Menu_ServerList_f (void)
{
m_entersound = true;
slist_cursor = 0;
M_Update_Return_Reason("");
- Net_Slist_f();
+ if (lanConfig_cursor == 2)
+ Net_SlistQW_f();
+ else
+ Net_Slist_f();
}
-void M_ServerList_Draw (void)
+static void M_ServerList_Draw (void)
{
int n, y, visible, start, end;
cachepic_t *p;
start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible);
end = min(start + visible, serverlist_viewcount);
- p = Draw_CachePic("gfx/p_multi", false);
+ p = Draw_CachePic("gfx/p_multi", true);
M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi");
if (end > start)
{
M_PrintColored(0, y, serverlist_viewlist[n]->line2);y += 8;
}
}
- else if (realtime - masterquerytime < 3)
+ else if (realtime - masterquerytime > 10)
{
if (masterquerycount)
M_Print(0, y, "No servers found");
else
M_Print(0, y, "No master servers found (network problem?)");
}
+ else
+ {
+ if (serverquerycount)
+ M_Print(0, y, "Querying servers");
+ else
+ M_Print(0, y, "Querying master servers");
+ }
}
-void M_ServerList_Key(int k, char ascii)
+static void M_ServerList_Key(int k, char ascii)
{
switch (k)
{
break;
case K_SPACE:
- Net_Slist_f();
+ if (lanConfig_cursor == 2)
+ Net_SlistQW_f();
+ else
+ Net_Slist_f();
break;
case K_UPARROW:
//=============================================================================
/* Menu Subsystem */
-void M_Keydown(int key, char ascii);
-void M_Draw(void);
+static void M_Keydown(int key, char ascii);
+static void M_Draw(void);
void M_ToggleMenu_f(void);
-void M_Shutdown(void);
+static void M_Shutdown(void);
void M_Init (void)
{
g = (int)(realtime * 64)%96;
scale_y_rate = (float)(g+1) / 96;
top_offset = (g+12)/12;
- p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset), false);
- drop1 = Draw_CachePic("gfx/menu/blooddrop1", false);
- drop2 = Draw_CachePic("gfx/menu/blooddrop2", false);
- drop3 = Draw_CachePic("gfx/menu/blooddrop3", false);
+ p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset), true);
+ drop1 = Draw_CachePic("gfx/menu/blooddrop1", true);
+ drop2 = Draw_CachePic("gfx/menu/blooddrop2", true);
+ drop3 = Draw_CachePic("gfx/menu/blooddrop3", true);
for (scale_x = 0; scale_x <= vid_conwidth.integer; scale_x += p->width) {
for (scale_y = -scale_y_repeat; scale_y <= vid_conheight.integer; scale_y += scale_y_repeat) {
DrawQ_Pic (scale_x + 21, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop3, 0, 0, 1, 1, 1, 1, 0);
DrawQ_Pic (scale_x + 557, scale_y_repeat * .9425 + scale_y + scale_y_rate * scale_y_repeat, drop1, 0, 0, 1, 1, 1, 1, 0);
DrawQ_Pic (scale_x + 606, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop2, 0, 0, 1, 1, 1, 1, 0);
}
- DrawQ_Pic (scale_x, -1, Draw_CachePic(va("gfx/menu/blooddrip%i", top_offset), false), 0, 0, 1, 1, 1, 1, 0);
+ DrawQ_Pic (scale_x, -1, Draw_CachePic(va("gfx/menu/blooddrip%i", top_offset), true), 0, 0, 1, 1, 1, 1, 0);
}
}
}
};
#ifdef NG_MENU
-qboolean m_displayed;
+static qboolean m_displayed;
#endif
static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*);
projects / xonotic / darkplaces.git / blobdiff