DrawQ_Pic(menu_x + cx, menu_y + cy, Draw_CachePic(picname, true), 0, 0, 1, 1, 1, 1, 0);
}
-static unsigned char identityTable[256];
-static unsigned char translationTable[256];
-
-static void M_BuildTranslationTable(int top, int bottom)
-{
- int j;
- unsigned char *dest, *source;
-
- for (j = 0; j < 256; j++)
- identityTable[j] = j;
- dest = translationTable;
- source = identityTable;
- memcpy (dest, source, 256);
-
- // LordHavoc: corrected skin color ranges
- if (top < 128 || (top >= 224 && top < 240)) // the artists made some backwards ranges. sigh.
- memcpy (dest + TOP_RANGE, source + top, 16);
- else
- for (j=0 ; j<16 ; j++)
- dest[TOP_RANGE+j] = source[top+15-j];
-
- // LordHavoc: corrected skin color ranges
- if (bottom < 128 || (bottom >= 224 && bottom < 240))
- memcpy (dest + BOTTOM_RANGE, source + bottom, 16);
- else
- for (j=0 ; j<16 ; j++)
- dest[BOTTOM_RANGE+j] = source[bottom+15-j];
-}
-
static void M_DrawTextBox(float x, float y, float width, float height)
{
int n;
else
MAIN_ITEMS = 6;
}
- else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
- MAIN_ITEMS = 6;
else if (gamemode == GAME_TRANSFUSION)
{
s = "gfx/menu/mainmenu1";
break;
}
}
- else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
- {
- switch (m_main_cursor)
- {
- case 0:
- M_Menu_SinglePlayer_f ();
- break;
-
- case 1:
- M_Menu_MultiPlayer_f ();
- break;
-
- case 2:
- M_Menu_Options_f ();
- break;
-
- case 3:
- M_Menu_Help_f ();
- break;
-
- case 4:
- M_Menu_Quit_f ();
- break;
- case 5:
- MR_Restart();
- break;
- }
- }
else if (gamemode == GAME_TRANSFUSION) {
if (MAIN_ITEMS == 7)
{
buf[sizeof(buf) - 1] = 0;
t = buf;
// version
- COM_ParseToken_Simple(&t, false);
+ COM_ParseToken_Simple(&t, false, false);
version = atoi(com_token);
// description
- COM_ParseToken_Simple(&t, false);
+ COM_ParseToken_Simple(&t, false, false);
strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
// change _ back to space
static void M_Setup_Draw (void)
{
- int i;
+ int i, j;
cachepic_t *p;
M_Background(320, 200);
// LordHavoc: rewrote this code greatly
if (menuplyr_load)
{
- unsigned char *data, *f;
+ unsigned char *f;
fs_offset_t filesize;
menuplyr_load = false;
menuplyr_top = -1;
menuplyr_bottom = -1;
- if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true, &filesize)))
+ f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true, &filesize);
+ if (f && filesize >= 9)
{
- data = LoadLMP (f, filesize, 0, 0, true);
- menuplyr_width = image_width;
- menuplyr_height = image_height;
- Mem_Free(f);
- 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);
+ int width, height;
+ width = f[0] + f[1] * 256 + f[2] * 65536 + f[3] * 16777216;
+ height = f[4] + f[5] * 256 + f[6] * 65536 + f[7] * 16777216;
+ if (filesize >= 8 + width * height)
+ {
+ menuplyr_width = width;
+ menuplyr_height = height;
+ menuplyr_pixels = (unsigned char *)Mem_Alloc(cls.permanentmempool, width * height);
+ menuplyr_translated = (unsigned int *)Mem_Alloc(cls.permanentmempool, width * height * 4);
+ memcpy(menuplyr_pixels, f + 8, width * height);
+ }
}
+ if (f)
+ Mem_Free(f);
}
if (menuplyr_pixels)
{
menuplyr_top = setup_top;
menuplyr_bottom = setup_bottom;
- M_BuildTranslationTable(menuplyr_top*16, menuplyr_bottom*16);
+
for (i = 0;i < menuplyr_width * menuplyr_height;i++)
- menuplyr_translated[i] = palette_transparent[translationTable[menuplyr_pixels[i]]];
+ {
+ j = menuplyr_pixels[i];
+ if (j >= TOP_RANGE && j < TOP_RANGE + 16)
+ {
+ if (menuplyr_top < 8 || menuplyr_top == 14)
+ j = menuplyr_top * 16 + (j - TOP_RANGE);
+ else
+ j = menuplyr_top * 16 + 15-(j - TOP_RANGE);
+ }
+ else if (j >= BOTTOM_RANGE && j < BOTTOM_RANGE + 16)
+ {
+ if (menuplyr_bottom < 8 || menuplyr_bottom == 14)
+ j = menuplyr_bottom * 16 + (j - BOTTOM_RANGE);
+ else
+ j = menuplyr_bottom * 16 + 15-(j - BOTTOM_RANGE);
+ }
+ menuplyr_translated[i] = palette_bgra_transparent[j];
+ }
Draw_NewPic("gfx/menuplyr", menuplyr_width, menuplyr_height, true, (unsigned char *)menuplyr_translated);
}
M_DrawPic(160, 48, "gfx/bigbox");
//#define OPTIONS_ITEMS 25 aule was here
-#define OPTIONS_ITEMS 26
+#define OPTIONS_ITEMS 27
static int options_cursor;
else if (options_cursor == optnum++) Cvar_SetValueQuick(&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
else if (options_cursor == optnum++) Cvar_SetValueQuick(&m_pitch, -m_pitch.value);
else if (options_cursor == optnum++) Cvar_SetValueQuick(&scr_fov, bound(1, scr_fov.integer + dir * 1, 170));
+ else if (options_cursor == optnum++)
+ {
+ if (cl_forwardspeed.value > 200)
+ {
+ Cvar_SetValueQuick (&cl_forwardspeed, 200);
+ Cvar_SetValueQuick (&cl_backspeed, 200);
+ }
+ else
+ {
+ Cvar_SetValueQuick (&cl_forwardspeed, 400);
+ Cvar_SetValueQuick (&cl_backspeed, 400);
+ }
+ }
else if (options_cursor == optnum++) Cvar_SetValueQuick(&showfps, !showfps.integer);
else if (options_cursor == optnum++) {f = !(showdate.integer && showtime.integer);Cvar_SetValueQuick(&showdate, f);Cvar_SetValueQuick(&showtime, f);}
else if (options_cursor == optnum++) ;
M_Options_PrintSlider( " Mouse Speed", true, sensitivity.value, 1, 50);
M_Options_PrintCheckbox(" Invert Mouse", true, m_pitch.value < 0);
M_Options_PrintSlider( " Field of View", true, scr_fov.integer, 1, 170);
+ M_Options_PrintCheckbox(" Always Run", true, cl_forwardspeed.value > 200);
M_Options_PrintCheckbox(" Show Framerate", true, showfps.integer);
M_Options_PrintCheckbox(" Show Date and Time", true, showdate.integer && showtime.integer);
M_Options_PrintCommand( " Custom Brightness", true);
case 3:
M_Menu_Video_f ();
break;
- case 10:
+ case 11:
M_Menu_Options_ColorControl_f ();
break;
- case 16: // Customize Effects
+ case 17: // Customize Effects
M_Menu_Options_Effects_f ();
break;
- case 17: // Effects: Quake
+ case 18: // Effects: Quake
Cbuf_AddText("cl_particles 1;cl_particles_quake 1;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 0;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 0;cl_beams_polygons 0;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
break;
- case 18: // Effects: Normal
+ case 19: // Effects: Normal
Cbuf_AddText("cl_particles 1;cl_particles_quake 0;cl_particles_quality 1;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 0;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
break;
- case 19: // Effects: High
+ case 20: // Effects: High
Cbuf_AddText("cl_particles 1;cl_particles_quake 0;cl_particles_quality 2;cl_particles_explosions_shell 0;r_explosionclip 1;cl_stainmaps 1;cl_stainmaps_clearonload 1;cl_decals 1;cl_particles_bulletimpacts 1;cl_particles_smoke 1;cl_particles_sparks 1;cl_particles_bubbles 1;cl_particles_blood 1;cl_particles_blood_alpha 1;cl_particles_blood_bloodhack 1;cl_beams_polygons 1;cl_beams_instantaimhack 0;cl_beams_quakepositionhack 1;cl_beams_lightatend 0;r_lerpmodels 1;r_lerpsprites 1;gl_polyblend 1;r_skyscroll1 1;r_skyscroll2 2;r_waterwarp 1;r_wateralpha 1;r_waterscroll 1\n");
break;
- case 20:
+ case 21:
M_Menu_Options_Graphics_f ();
break;
- case 21: // Lighting: Flares
+ case 22: // Lighting: Flares
Cbuf_AddText("r_coronas 1;gl_flashblend 1;r_shadow_gloss 0;r_shadow_realtime_dlight 0;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
break;
- case 22: // Lighting: Normal
+ case 23: // Lighting: Normal
Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 0;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
break;
- case 23: // Lighting: High
+ case 24: // Lighting: High
Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 0;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
break;
- case 24: // Lighting: Full
+ case 25: // Lighting: Full
Cbuf_AddText("r_coronas 1;gl_flashblend 0;r_shadow_gloss 1;r_shadow_realtime_dlight 1;r_shadow_realtime_dlight_shadows 1;r_shadow_realtime_world 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
break;
- case 25:
+ case 26:
M_Menu_ModList_f ();
break;
default:
*b = Z_Alloc(sizeof(binditem_t) + strlen(command) + 1 + strlen(description) + 1);
*b->command = (char *)((*b) + 1);
*b->description = *b->command + strlen(command) + 1;
- strcpy(*b->command, command);
- strcpy(*b->description, description);
+ strlcpy(*b->command, command, strlen(command) + 1);
+ strlcpy(*b->description, description, strlen(description) + 1);
}
static void M_AddBind (char *category, char *command, char *description)
/* VIDEO MENU */
// note: if modes are added to the beginning of this list, update VID_DEFAULT
-typedef struct video_resolution_s
-{
- const char *type;
- int width, height;
- int conwidth, conheight;
- double pixelheight; // pixel aspect
-}
-video_resolution_t;
video_resolution_t video_resolutions[] =
{
{"Standard 4x3" , 320, 240, 320, 240, 1 },
// set router console commands
Cvar_RegisterVariable (&forceqmenu);
Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
- if (gamemode == GAME_NETHERWORLD)
- Cmd_AddCommand ("menu_fallback", MP_Fallback, "switch to engine menu (unload menu.dat)");
Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat");
Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu");
}
projects / xonotic / darkplaces.git / blobdiff