hush some texture loading warnings in dedicated servers (thanks to Biomass for report...

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 3fcc7dbd10ac9b657ad9e366d9d36682aa6fde2e..0506b8780716373a6da5b3c30b259ee2c06bfc33 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -28,8 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define TYPE_GAME 2
 #define TYPE_BOTH 3
 
-mempool_t *menu_mempool;
-
 int NehGameType;
 
 enum m_state_e m_state;
@@ -415,7 +413,7 @@ void M_Main_Draw (void)
        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
@@ -436,7 +434,7 @@ void M_Main_Draw (void)
 
        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)
@@ -721,7 +719,7 @@ void M_SinglePlayer_Draw (void)
        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)
@@ -887,8 +885,8 @@ void M_Load_Draw (void)
 
        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]);
@@ -905,7 +903,7 @@ void M_Save_Draw (void)
 
        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++)
@@ -1011,7 +1009,7 @@ void M_Transfusion_Episode_Draw (void)
        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));
@@ -1068,7 +1066,7 @@ void M_Transfusion_Skill_Draw (void)
        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++)
@@ -1105,19 +1103,19 @@ void M_Transfusion_Skill_Key (int key, char ascii)
                switch (m_skill_cursor)
                {
                case 0:
-                       Cbuf_AddText ("skill 0\n");
+                       Cbuf_AddText ("skill 1\n");
                        break;
                case 1:
-                       Cbuf_AddText ("skill 1\n");
+                       Cbuf_AddText ("skill 2\n");
                        break;
                case 2:
-                       Cbuf_AddText ("skill 2\n");
+                       Cbuf_AddText ("skill 3\n");
                        break;
                case 3:
-                       Cbuf_AddText ("skill 3\n");
+                       Cbuf_AddText ("skill 4\n");
                        break;
                case 4:
-                       Cbuf_AddText ("skill 4\n");
+                       Cbuf_AddText ("skill 5\n");
                        break;
                }
                key_dest = key_game;
@@ -1172,7 +1170,7 @@ void M_MultiPlayer_Draw (void)
        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));
@@ -1182,7 +1180,7 @@ void M_MultiPlayer_Draw (void)
        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");
 
@@ -1300,7 +1298,7 @@ void M_Setup_Draw (void)
        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");
@@ -1328,12 +1326,12 @@ void M_Setup_Draw (void)
                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);
                }
@@ -1650,7 +1648,7 @@ void M_Options_Draw (void)
        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;
@@ -1849,7 +1847,7 @@ void M_Options_Effects_Draw (void)
        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;
@@ -1988,7 +1986,7 @@ void M_Options_Graphics_Draw (void)
        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;
@@ -2171,7 +2169,7 @@ void M_Options_ColorControl_Draw (void)
        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;
@@ -2559,7 +2557,7 @@ void M_Keys_Draw (void)
 
        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)
@@ -2770,7 +2768,7 @@ void M_Video_Draw (void)
        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
@@ -3149,7 +3147,7 @@ void M_LanConfig_Draw (void)
        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");
 
@@ -3562,6 +3560,8 @@ level_t           transfusionlevels[] =
        {"cpbb04",              "Deadly Inspirations"},
 
        {"b2a15",               "Area 15 (B2)"},
+       {"b2bodies",    "BB_Bodies (B2)"},
+       {"b2cabana",    "BB_Cabana"},
        {"b2power",             "BB_Power"},
        {"barena",              "Blood Arena"},
        {"bkeep",               "Blood Keep"},
@@ -3582,6 +3582,9 @@ level_t           transfusionlevels[] =
        {"fragm",               "Frag'M"},
        {"maim",                "Maim"},
        {"qe1m7",               "The House of Chthon"},
+       {"qdm1",                "Dm-Place of Two Deaths"},
+       {"qdm4",                "Dm-The Bad Place"},
+       {"qdm5",                "Dm-The Cistern"},
        {"qmorbias",    "Dm-Morbias"},
        {"simple",              "Dead Simple"}
 };
@@ -3596,9 +3599,9 @@ episode_t transfusionepisodes[] =
        {"Post Mortem", 45, 9},
        {"Cryptic Passage", 54, 10},
        {"Cryptic BloodBath", 64, 4},
-       {"Blood 2", 68, 6},
-       {"Transfusion", 74, 9},
-       {"Conversions", 83, 6}
+       {"Blood 2", 68, 8},
+       {"Transfusion", 76, 9},
+       {"Conversions", 85, 9}
 };
 
 level_t goodvsbad2levels[] =
@@ -3733,7 +3736,7 @@ void M_GameOptions_Draw (void)
        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);
@@ -3804,17 +3807,31 @@ void M_GameOptions_Draw (void)
                        }
                        M_Print(160, 72, msg);
                }
-
                M_Print(0, 80, "            Skill");
-               if (skill.integer == 0)
-                       M_Print(160, 80, "Easy difficulty");
-               else if (skill.integer == 1)
-                       M_Print(160, 80, "Normal difficulty");
-               else if (skill.integer == 2)
-                       M_Print(160, 80, "Hard difficulty");
+               if (gamemode == GAME_TRANSFUSION)
+               {
+                       if (skill.integer == 1)
+                               M_Print(160, 80, "Still Kicking");
+                       else if (skill.integer == 2)
+                               M_Print(160, 80, "Pink On The Inside");
+                       else if (skill.integer == 3)
+                               M_Print(160, 80, "Lightly Broiled");
+                       else if (skill.integer == 4)
+                               M_Print(160, 80, "Well Done");
+                       else
+                               M_Print(160, 80, "Extra Crispy");
+               }
                else
-                       M_Print(160, 80, "Nightmare difficulty");
-
+               {
+                       if (skill.integer == 0)
+                               M_Print(160, 80, "Easy difficulty");
+                       else if (skill.integer == 1)
+                               M_Print(160, 80, "Normal difficulty");
+                       else if (skill.integer == 2)
+                               M_Print(160, 80, "Hard difficulty");
+                       else
+                               M_Print(160, 80, "Nightmare difficulty");
+               }
                M_Print(0, 88, "       Frag Limit");
                if (fraglimit.integer == 0)
                        M_Print(160, 88, "none");
@@ -3962,10 +3979,10 @@ void M_NetStart_Change (int dir)
                Cvar_SetValueQuick (&skill, skill.integer + dir);
                if (gamemode == GAME_TRANSFUSION)
                {
-                       if (skill.integer > 4)
-                               Cvar_SetValueQuick (&skill, 0);
-                       if (skill.integer < 0)
-                               Cvar_SetValueQuick (&skill, 4);
+                       if (skill.integer > 5)
+                               Cvar_SetValueQuick (&skill, 1);
+                       if (skill.integer < 1)
+                               Cvar_SetValueQuick (&skill, 5);
                }
                else
                {
@@ -4160,18 +4177,18 @@ void M_ServerList_Draw (void)
                M_Print(16, menu_height - 8, m_return_reason);
        y = 48;
        visible = (menu_height - 16 - y) / 8 / 2;
-       start = bound(0, slist_cursor - (visible >> 1), hostcache_viewcount - visible);
-       end = min(start + visible, hostcache_viewcount);
+       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)
        {
                for (n = start;n < end;n++)
                {
                        DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
-                       M_Print(0, y, hostcache_viewset[n]->line1);y += 8;
-                       M_Print(0, y, hostcache_viewset[n]->line2);y += 8;
+                       M_Print(0, y, serverlist_viewlist[n]->line1);y += 8;
+                       M_Print(0, y, serverlist_viewlist[n]->line2);y += 8;
                }
        }
        else if (realtime - masterquerytime < 3)
@@ -4201,21 +4218,21 @@ void M_ServerList_Key(int k, char ascii)
                S_LocalSound ("sound/misc/menu1.wav");
                slist_cursor--;
                if (slist_cursor < 0)
-                       slist_cursor = hostcache_viewcount - 1;
+                       slist_cursor = serverlist_viewcount - 1;
                break;
 
        case K_DOWNARROW:
        case K_RIGHTARROW:
                S_LocalSound ("sound/misc/menu1.wav");
                slist_cursor++;
-               if (slist_cursor >= hostcache_viewcount)
+               if (slist_cursor >= serverlist_viewcount)
                        slist_cursor = 0;
                break;
 
        case K_ENTER:
                S_LocalSound ("sound/misc/menu2.wav");
-               if (hostcache_viewcount)
-                       Cbuf_AddText(va("connect \"%s\"\n", hostcache_viewset[slist_cursor]->info.cname));
+               if (serverlist_viewcount)
+                       Cbuf_AddText(va("connect \"%s\"\n", serverlist_viewlist[slist_cursor]->info.cname));
                break;
 
        default:
@@ -4234,7 +4251,6 @@ void M_Shutdown(void);
 
 void M_Init (void)
 {
-       menu_mempool = Mem_AllocPool("Menu", 0, NULL);
        menuplyr_load = true;
        menuplyr_pixels = NULL;
 
@@ -4248,7 +4264,6 @@ void M_Init (void)
        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);
@@ -4428,7 +4443,7 @@ void M_Draw (void)
                        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);
@@ -4560,8 +4575,6 @@ void M_Shutdown(void)
 {
        // reset key_dest
        key_dest = key_game;
-
-       Mem_FreePool (&menu_mempool);
 }
 
 void M_Restart(void)
@@ -4698,8 +4711,6 @@ void MP_Init (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);
@@ -4787,6 +4798,7 @@ void MR_Init_Commands(void)
 {
        // 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);