#define TYPE_GAME 2
#define TYPE_BOTH 3
-mempool_t *menu_mempool;
-
int NehGameType;
enum m_state_e m_state;
if (gamemode == GAME_TRANSFUSION) {
int y1, y2, y3;
M_Background(640, 480);
- p = Draw_CachePic ("gfx/tb-transfusion");
+ p = Draw_CachePic ("gfx/tb-transfusion", false);
M_DrawPic (640/2 - p->width/2, 40, "gfx/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.lmp");
- p = Draw_CachePic ("gfx/ttl_main.lmp");
+ p = Draw_CachePic ("gfx/ttl_main.lmp", false);
M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main.lmp");
// Nehahra
if (gamemode == GAME_NEHAHRA)
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/ttl_sgl.lmp");
+ p = Draw_CachePic ("gfx/ttl_sgl.lmp", false);
// Some mods don't have a single player mode
if (gamemode == GAME_NEXUIZ || gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH)
M_Background(320, 200);
- p = Draw_CachePic ("gfx/p_load.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load.lmp");
+ p = Draw_CachePic ("gfx/p_load.lmp", false);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load.lmp" );
for (i=0 ; i< MAX_SAVEGAMES; i++)
M_Print(16, 32 + 8*i, m_filenames[i]);
M_Background(320, 200);
- p = Draw_CachePic ("gfx/p_save.lmp");
+ p = Draw_CachePic ("gfx/p_save.lmp", false);
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save.lmp");
for (i=0 ; i<MAX_SAVEGAMES ; i++)
cachepic_t *p;
M_Background(640, 480);
- p = Draw_CachePic ("gfx/tb-episodes");
+ p = Draw_CachePic ("gfx/tb-episodes", false);
M_DrawPic (640/2 - p->width/2, 40, "gfx/tb-episodes");
for (y = 0; y < EPISODE_ITEMS; y++){
M_DrawPic (0, 160 + y * 40, va("gfx/episode%i", y+1));
cachepic_t *p;
M_Background(640, 480);
- p = Draw_CachePic ("gfx/tb-difficulty");
+ p = Draw_CachePic ("gfx/tb-difficulty", false);
M_DrawPic(640/2 - p->width/2, 40, "gfx/tb-difficulty");
for (y = 0; y < SKILL_ITEMS; y++)
if (gamemode == GAME_TRANSFUSION)
{
M_Background(640, 480);
- p = Draw_CachePic ("gfx/tb-online");
+ p = Draw_CachePic ("gfx/tb-online", false);
M_DrawPic (640/2 - p->width/2, 140, "gfx/tb-online");
for (f = 1; f <= MULTIPLAYER_ITEMS; f++)
M_DrawPic (0, 180 + f*40, va("gfx/online%i", f));
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/p_multi.lmp");
+ p = Draw_CachePic ("gfx/p_multi.lmp", false);
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
M_DrawPic (72, 32, "gfx/mp_menu.lmp");
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/p_multi.lmp");
+ p = Draw_CachePic ("gfx/p_multi.lmp", false);
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
M_Print(64, 40, "Your name");
menuplyr_bottom = -1;
if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true)))
{
- data = LoadLMPAs8Bit (f, 0, 0);
+ data = LoadLMP (f, 0, 0, true);
menuplyr_width = image_width;
menuplyr_height = image_height;
Mem_Free(f);
- menuplyr_pixels = Mem_Alloc(menu_mempool, menuplyr_width * menuplyr_height);
- menuplyr_translated = Mem_Alloc(menu_mempool, menuplyr_width * menuplyr_height * 4);
+ menuplyr_pixels = Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height);
+ menuplyr_translated = Mem_Alloc(cl_mempool, menuplyr_width * menuplyr_height * 4);
memcpy(menuplyr_pixels, data, menuplyr_width * menuplyr_height);
Mem_Free(data);
}
M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid.conheight));
M_DrawPic(16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic("gfx/p_option.lmp");
+ p = Draw_CachePic("gfx/p_option.lmp", false);
M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
optnum = 0;
M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid.conheight));
M_DrawPic(16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic("gfx/p_option.lmp");
+ p = Draw_CachePic("gfx/p_option.lmp", false);
M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
optcursor = options_effects_cursor;
M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid.conheight));
M_DrawPic(16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic("gfx/p_option.lmp");
+ p = Draw_CachePic("gfx/p_option.lmp", false);
M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
optcursor = options_graphics_cursor;
M_Background(320, 256);
M_DrawPic(16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic("gfx/p_option.lmp");
+ p = Draw_CachePic("gfx/p_option.lmp", false);
M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
optcursor = options_colorcontrol_cursor;
M_Background(320, 48 + 8 * numcommands);
- p = Draw_CachePic ("gfx/ttl_cstm.lmp");
+ p = Draw_CachePic ("gfx/ttl_cstm.lmp", false);
M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp");
if (bind_grab)
M_Background(320, 200);
M_DrawPic(16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic("gfx/vidmodes.lmp");
+ p = Draw_CachePic("gfx/vidmodes.lmp", false);
M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes.lmp");
// Resolution
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/p_multi.lmp");
+ p = Draw_CachePic ("gfx/p_multi.lmp", false);
basex = (320-p->width)/2;
M_DrawPic (basex, 4, "gfx/p_multi.lmp");
M_Background(320, 200);
M_DrawPic (16, 4, "gfx/qplaque.lmp");
- p = Draw_CachePic ("gfx/p_multi.lmp");
+ p = Draw_CachePic ("gfx/p_multi.lmp", false);
M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi.lmp");
M_DrawTextBox (152, 32, 10, 1);
start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible);
end = min(start + visible, serverlist_viewcount);
- p = Draw_CachePic("gfx/p_multi.lmp");
+ p = Draw_CachePic("gfx/p_multi.lmp", false);
M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi.lmp");
if (end > start)
{
void M_Init (void)
{
- menu_mempool = Mem_AllocPool("Menu", 0, NULL);
menuplyr_load = true;
menuplyr_pixels = NULL;
Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f);
Cmd_AddCommand ("menu_options_graphics", M_Menu_Options_Graphics_f);
Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f);
- Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
Cmd_AddCommand ("menu_keys", M_Menu_Keys_f);
Cmd_AddCommand ("menu_video", M_Menu_Video_f);
Cmd_AddCommand ("menu_reset", M_Menu_Reset_f);
g = (int)(realtime * 64)%96;
scale_y_rate = (float)(g+1) / 96;
top_offset = (g+12)/12;
- p = Draw_CachePic (va("gfx/blooddrip%i", top_offset));
+ p = Draw_CachePic (va("gfx/blooddrip%i", top_offset), false);
for (scale_x = 0; scale_x <= vid.conwidth; scale_x += p->width) {
for (scale_y = -scale_y_repeat; scale_y <= vid.conheight; scale_y += scale_y_repeat) {
DrawQ_Pic (scale_x + 21, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0);
{
// reset key_dest
key_dest = key_game;
-
- Mem_FreePool (&menu_mempool);
}
void M_Restart(void)
prog->error_cmd = MP_Error;
// allocate the mempools
- prog->edicts_mempool = Mem_AllocPool(M_NAME " edicts mempool", 0, NULL);
- prog->edictstring_mempool = Mem_AllocPool( M_NAME " edict string mempool", 0, NULL);
prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL);
PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func);
{
// set router console commands
Cvar_RegisterVariable (&forceqmenu);
+ Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
if (gamemode == GAME_NETHERWORLD)
Cmd_AddCommand ("menu_fallback", MP_Error); //Force to old-style menu
Cmd_AddCommand ("menu_restart",MR_Restart);