#define TYPE_GAME 2
#define TYPE_BOTH 3
-mempool_t *menu_mempool;
-
int NehGameType;
enum m_state_e m_state;
case 0:
M_Menu_Transfusion_Episode_f ();
break;
-
+
case 1:
M_Menu_MultiPlayer_f ();
break;
-
+
case 2:
M_Menu_Options_f ();
break;
case 4:
M_Menu_Help_f ();
break;
-
+
case 5:
M_Menu_Credits_f ();
break;
case 0:
M_Menu_Transfusion_Episode_f ();
break;
-
+
case 1:
M_Menu_MultiPlayer_f ();
break;
-
+
case 2:
M_Menu_Options_f ();
break;
case 4:
M_Menu_Load_f ();
break;
-
+
case 5:
M_Menu_Help_f ();
break;
strcpy (m_filenames[i], "--- UNUSED SLOT ---");
loadable[i] = false;
sprintf (name, "s%i.sav", i);
- f = FS_Open (name, "rb", false);
+ f = FS_Open (name, "rb", false, false);
if (!f)
continue;
// read enough to get the comment
int y;
cachepic_t *p;
M_Background(640, 480);
-
+
p = Draw_CachePic ("gfx/tb-episodes");
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));
}
-
+
M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va("gfx/episode%iselected", m_episode_cursor + 1));
}
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;
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);
}
{
switch (key)
{
+ case 'Y':
+ case 'y':
+ Cbuf_AddText ("exec default.cfg\n");
+ // no break here since we also exit the menu
+
case K_ESCAPE:
case 'n':
case 'N':
m_entersound = true;
break;
- case 'Y':
- case 'y':
- Cbuf_AddText ("exec default.cfg\n");
- break;
-
default:
break;
}
#define VIDEO_ITEMS 5
int video_cursor = 0;
-int video_cursor_table[] = {56, 68, 80, 100, 120};
+int video_cursor_table[] = {56, 68, 80, 100, 130};
// note: if modes are added to the beginning of this list, update the
// video_resolution = x; in M_Menu_Video_f below
unsigned short video_resolutions[][2] = {{320,240}, {400,300}, {512,384}, {640,480}, {800,600}, {1024,768}, {1152,864}, {1280,960}, {1280,1024}, {1600,1200}, {1792,1344}, {1920,1440}, {2048,1536}, {0,0}};
{"cpbb04", "Deadly Inspirations"},
{"b2a15", "Area 15 (B2)"},
+ {"b2bodies", "BB_Bodies (B2)"},
+ {"b2cabana", "BB_Cabana"},
{"b2power", "BB_Power"},
{"barena", "Blood Arena"},
{"bkeep", "Blood Keep"},
{"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"}
};
{"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[] =
}
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");
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
{
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");
M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi.lmp");
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)
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:
void M_Init (void)
{
- menu_mempool = Mem_AllocPool("Menu", 0, NULL);
menuplyr_load = true;
menuplyr_pixels = NULL;
{
// 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);
projects / xonotic / darkplaces.git / blobdiff