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
//#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
- 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_dlightshadows 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
+ 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
- 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_dlightshadows 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 0;r_hdr 0");
+ 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
- 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_dlightshadows 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
+ 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
- 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_dlightshadows 1;r_shadow_realtime_world_lightmaps 0;r_shadow_realtime_world_shadows 1;r_bloom 1;r_hdr 0");
+ 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:
}
-#define OPTIONS_GRAPHICS_ITEMS 21
+#define OPTIONS_GRAPHICS_ITEMS 20
static int options_graphics_cursor;
extern cvar_t r_shadow_realtime_dlight;
extern cvar_t r_shadow_realtime_dlight_shadows;
extern cvar_t r_shadow_realtime_world;
-extern cvar_t r_shadow_realtime_world_dlightshadows;
extern cvar_t r_shadow_realtime_world_lightmaps;
extern cvar_t r_shadow_realtime_world_shadows;
extern cvar_t r_bloom;
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight, !r_shadow_realtime_dlight.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_dlight_shadows, !r_shadow_realtime_dlight_shadows.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world, !r_shadow_realtime_world.integer);
- else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_dlightshadows, !r_shadow_realtime_world_dlightshadows.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_lightmaps, bound(0, r_shadow_realtime_world_lightmaps.value + dir * 0.1, 1));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_shadow_realtime_world_shadows, !r_shadow_realtime_world_shadows.integer);
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_scenebrightness, bound(0.25, r_hdr_scenebrightness.value + dir * 0.125, 4));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_hdr_glowintensity, bound(0, r_hdr_glowintensity.value + dir * 0.25, 4));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorscale, bound(0.0625, r_bloom_colorscale.value + dir * 0.0625, 1));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorsubtract, bound(0, r_bloom_colorsubtract.value + dir * 0.0625, 1-0.0625));
- else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorexponent, bound(1, r_bloom_colorexponent.value *= (dir > 0 ? 2 : 0.5), 8));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_colorexponent, bound(1, r_bloom_colorexponent.value * (dir > 0 ? 2.0 : 0.5), 8));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_brighten, bound(1, r_bloom_brighten.value + dir * 0.0625, 4));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_blur, bound(1, r_bloom_blur.value + dir * 1, 16));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_resolution, bound(64, r_bloom_resolution.value + dir * 64, 2048));
M_Options_PrintCheckbox(" RT DLights", !gl_flashblend.integer, r_shadow_realtime_dlight.integer);
M_Options_PrintCheckbox(" RT DLight Shadows", !gl_flashblend.integer, r_shadow_realtime_dlight_shadows.integer);
M_Options_PrintCheckbox(" RT World", true, r_shadow_realtime_world.integer);
- M_Options_PrintCheckbox("RTWorld DLight Shadows", !gl_flashblend.integer, r_shadow_realtime_world_dlightshadows.integer);
M_Options_PrintSlider( " RT World Lightmaps", true, r_shadow_realtime_world_lightmaps.value, 0, 1);
M_Options_PrintCheckbox(" RT World Shadow", true, r_shadow_realtime_world_shadows.integer);
M_Options_PrintSlider( " Scene Brightness", true, r_hdr_scenebrightness.value, 0.25, 4);
*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 },
#define VID_DEFAULT 3
#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
-#define VIDEO_ITEMS 9
+#define VIDEO_ITEMS 10
static int video_cursor = 0;
-static int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162, 174, 186};
+static int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162, 170, 178, 186};
static int video_resolution;
void M_Menu_Video_f (void)
M_ItemPrint(16, video_cursor_table[8], " Texture Quality", true);
M_DrawSlider(220, video_cursor_table[8], gl_picmip.value, 3, 0);
+ M_ItemPrint(16, video_cursor_table[9], " Texture Compression", gl_support_texture_compression);
+ M_DrawCheckbox(220, video_cursor_table[9], gl_texturecompression.integer);
+
// Cursor
M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
}
case 8:
Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
break;
+ case 9:
+ Cvar_SetValueQuick (&gl_texturecompression, !gl_texturecompression.integer);
+ break;
}
}
projects / xonotic / darkplaces.git / blobdiff