mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2025-04-04 17:02:00 +00:00
New graphics presets added to the UI, key bind for VoIP, minor tweaks
This commit is contained in:
Tomi Isoaho
parent
373d05079b
commit
053cfac6f2
2 changed files with 178 additions and 56 deletions
|
|
@ -5389,82 +5389,155 @@ static void UI_Update(const char *name)
|
|||
break;
|
||||
}
|
||||
} else if (Q_stricmp(name, "r_lodbias") == 0) {
|
||||
//TTI: minor changes
|
||||
switch (val) {
|
||||
case 0:
|
||||
trap_Cvar_SetValue("r_subdivisions", 4);
|
||||
trap_Cvar_SetValue("r_lodCurveError", 250);
|
||||
break;
|
||||
case 1:
|
||||
trap_Cvar_SetValue("r_subdivisions", 12);
|
||||
trap_Cvar_SetValue("r_subdivisions", 8);
|
||||
trap_Cvar_SetValue("r_lodCurveError", 250);
|
||||
break;
|
||||
case 2:
|
||||
trap_Cvar_SetValue("r_subdivisions", 20);
|
||||
trap_Cvar_SetValue("r_subdivisions", 16);
|
||||
trap_Cvar_SetValue("r_lodCurveError", 125);
|
||||
break;
|
||||
}
|
||||
} else if (Q_stricmp(name, "ui_glCustom") == 0) {
|
||||
switch (val) {
|
||||
//TTI: new presets
|
||||
case 0: // high quality
|
||||
trap_Cvar_SetValue("r_fullScreen", 1);
|
||||
trap_Cvar_SetValue("r_subdivisions", 4);
|
||||
trap_Cvar_SetValue("r_vertexlight", 0);
|
||||
trap_Cvar_SetValue("r_lodbias", 0);
|
||||
trap_Cvar_SetValue("r_colorbits", 32);
|
||||
trap_Cvar_SetValue("r_depthbits", 24);
|
||||
trap_Cvar_SetValue("r_picmip", 0);
|
||||
trap_Cvar_SetValue("r_mode", 4);
|
||||
trap_Cvar_SetValue("r_texturebits", 32);
|
||||
trap_Cvar_SetValue("r_fastSky", 0);
|
||||
trap_Cvar_SetValue("r_inGameVideo", 1);
|
||||
trap_Cvar_SetValue("com_blood", 1);
|
||||
trap_Cvar_SetValue("cg_gibs", 1);
|
||||
trap_Cvar_SetValue("cg_simpleItems", 0);
|
||||
trap_Cvar_SetValue("cg_marks", 1);
|
||||
trap_Cvar_SetValue("cg_brassTime", 30000);
|
||||
trap_Cvar_SetValue("cg_RQ3_glasstime", 30000);
|
||||
trap_Cvar_SetValue("cg_RQ3_flash", 1);
|
||||
trap_Cvar_SetValue("cg_RQ3_impactEffects", 1);
|
||||
trap_Cvar_SetValue("cg_shadows", 1);
|
||||
trap_Cvar_SetValue("cg_brassTime", 2500);
|
||||
trap_Cvar_SetValue("r_inGameVideo", 1);
|
||||
trap_Cvar_SetValue("r_picmip", 0);
|
||||
trap_Cvar_SetValue("r_roundImagesDown", 0);
|
||||
trap_Cvar_SetValue("r_detailtextures", 1);
|
||||
trap_Cvar_SetValue("r_lodBias", 0);
|
||||
trap_Cvar_SetValue("r_swapInterval", 0);
|
||||
trap_Cvar_SetValue("r_subdivisions", 0);
|
||||
trap_Cvar_SetValue("r_lodCurveError", 10000);
|
||||
trap_Cvar_SetValue("r_vertexlight", 0);
|
||||
trap_Cvar_SetValue("r_colorbits", 32);
|
||||
trap_Cvar_SetValue("r_texturebits", 32);
|
||||
trap_Cvar_SetValue("r_stencilbits", 8);
|
||||
trap_Cvar_SetValue("r_depthbits", 24);
|
||||
trap_Cvar_SetValue("r_dynamiclight", 1);
|
||||
trap_Cvar_SetValue("r_drawSun", 1);
|
||||
trap_Cvar_SetValue("r_fastsky", 0);
|
||||
trap_Cvar_SetValue("r_flares", 1);
|
||||
trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR");
|
||||
trap_Cvar_SetValue("r_ext_multitexture", 1);
|
||||
trap_Cvar_SetValue("r_ext_compressed_textures", 0);
|
||||
trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 1);
|
||||
trap_Cvar_SetValue("r_ext_max_anisotropy", 16);
|
||||
break;
|
||||
case 1: // normal
|
||||
trap_Cvar_SetValue("r_fullScreen", 1);
|
||||
trap_Cvar_SetValue("r_subdivisions", 12);
|
||||
trap_Cvar_SetValue("r_vertexlight", 0);
|
||||
trap_Cvar_SetValue("r_lodbias", 0);
|
||||
trap_Cvar_SetValue("r_colorbits", 0);
|
||||
trap_Cvar_SetValue("r_depthbits", 24);
|
||||
trap_Cvar_SetValue("r_picmip", 1);
|
||||
trap_Cvar_SetValue("r_mode", 3);
|
||||
trap_Cvar_SetValue("r_texturebits", 0);
|
||||
trap_Cvar_SetValue("r_fastSky", 0);
|
||||
trap_Cvar_SetValue("com_blood", 1);
|
||||
trap_Cvar_SetValue("cg_gibs", 1);
|
||||
trap_Cvar_SetValue("cg_simpleItems", 0);
|
||||
trap_Cvar_SetValue("cg_marks", 1);
|
||||
trap_Cvar_SetValue("cg_brassTime", 10000);
|
||||
trap_Cvar_SetValue("cg_RQ3_glasstime", 10000);
|
||||
trap_Cvar_SetValue("cg_RQ3_flash", 1);
|
||||
trap_Cvar_SetValue("cg_RQ3_impactEffects", 1);
|
||||
trap_Cvar_SetValue("cg_shadows", 1);
|
||||
trap_Cvar_SetValue("r_inGameVideo", 1);
|
||||
trap_Cvar_SetValue("cg_brassTime", 2500);
|
||||
trap_Cvar_SetValue("r_picmip", 0);
|
||||
trap_Cvar_SetValue("r_roundImagesDown", 1);
|
||||
trap_Cvar_SetValue("r_detailtextures", 1);
|
||||
trap_Cvar_SetValue("r_lodBias", 0);
|
||||
trap_Cvar_SetValue("r_swapInterval", 0);
|
||||
trap_Cvar_SetValue("r_subdivisions", 4);
|
||||
trap_Cvar_SetValue("r_lodCurveError", 250);
|
||||
trap_Cvar_SetValue("r_vertexlight", 0);
|
||||
trap_Cvar_SetValue("r_colorbits", 32);
|
||||
trap_Cvar_SetValue("r_texturebits", 32);
|
||||
trap_Cvar_SetValue("r_stencilbits", 0);
|
||||
trap_Cvar_SetValue("r_depthbits", 24);
|
||||
trap_Cvar_SetValue("r_dynamiclight", 1);
|
||||
trap_Cvar_SetValue("r_drawSun", 0);
|
||||
trap_Cvar_SetValue("r_fastsky", 0);
|
||||
trap_Cvar_SetValue("r_flares", 1);
|
||||
trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR");
|
||||
trap_Cvar_SetValue("cg_shadows", 0);
|
||||
trap_Cvar_SetValue("r_ext_multitexture", 1);
|
||||
trap_Cvar_SetValue("r_ext_compressed_textures", 0);
|
||||
trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 1);
|
||||
trap_Cvar_SetValue("r_ext_max_anisotropy", 4);
|
||||
break;
|
||||
case 2: // fast
|
||||
trap_Cvar_SetValue("r_fullScreen", 1);
|
||||
trap_Cvar_SetValue("r_subdivisions", 8);
|
||||
trap_Cvar_SetValue("r_vertexlight", 0);
|
||||
trap_Cvar_SetValue("r_lodbias", 1);
|
||||
trap_Cvar_SetValue("r_colorbits", 0);
|
||||
trap_Cvar_SetValue("r_depthbits", 0);
|
||||
trap_Cvar_SetValue("r_picmip", 1);
|
||||
trap_Cvar_SetValue("r_mode", 3);
|
||||
trap_Cvar_SetValue("r_texturebits", 0);
|
||||
trap_Cvar_SetValue("com_blood", 1);
|
||||
trap_Cvar_SetValue("cg_gibs", 1);
|
||||
trap_Cvar_SetValue("cg_simpleItems", 0);
|
||||
trap_Cvar_SetValue("cg_marks", 1);
|
||||
trap_Cvar_SetValue("cg_brassTime", 2000);
|
||||
trap_Cvar_SetValue("cg_RQ3_glasstime", 2000);
|
||||
trap_Cvar_SetValue("cg_RQ3_flash", 1);
|
||||
trap_Cvar_SetValue("cg_RQ3_impactEffects", 0);
|
||||
trap_Cvar_SetValue("cg_shadows", 0);
|
||||
trap_Cvar_SetValue("r_fastSky", 1);
|
||||
trap_Cvar_SetValue("r_inGameVideo", 0);
|
||||
trap_Cvar_SetValue("cg_brassTime", 0);
|
||||
trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_NEAREST");
|
||||
trap_Cvar_SetValue("r_inGameVideo", 1);
|
||||
trap_Cvar_SetValue("r_picmip", 1);
|
||||
trap_Cvar_SetValue("r_roundImagesDown", 1);
|
||||
trap_Cvar_SetValue("r_detailtextures", 1);
|
||||
trap_Cvar_SetValue("r_lodBias", 1);
|
||||
trap_Cvar_SetValue("r_swapInterval", 0);
|
||||
trap_Cvar_SetValue("r_subdivisions", 8);
|
||||
trap_Cvar_SetValue("r_lodCurveError", 250);
|
||||
trap_Cvar_SetValue("r_vertexlight", 0);
|
||||
trap_Cvar_SetValue("r_colorbits", 32);
|
||||
trap_Cvar_SetValue("r_texturebits", 32);
|
||||
trap_Cvar_SetValue("r_stencilbits", 0);
|
||||
trap_Cvar_SetValue("r_depthbits", 16);
|
||||
trap_Cvar_SetValue("r_dynamiclight", 1);
|
||||
trap_Cvar_SetValue("r_drawSun", 0);
|
||||
trap_Cvar_SetValue("r_fastsky", 0);
|
||||
trap_Cvar_SetValue("r_flares", 0);
|
||||
trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR");
|
||||
trap_Cvar_SetValue("r_ext_multitexture", 1);
|
||||
trap_Cvar_SetValue("r_ext_compressed_textures", 1);
|
||||
trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 0);
|
||||
trap_Cvar_SetValue("r_ext_max_anisotropy", 2);
|
||||
break;
|
||||
case 3: // fastest
|
||||
trap_Cvar_SetValue("r_fullScreen", 1);
|
||||
trap_Cvar_SetValue("r_subdivisions", 20);
|
||||
trap_Cvar_SetValue("r_vertexlight", 1);
|
||||
trap_Cvar_SetValue("r_lodbias", 2);
|
||||
trap_Cvar_SetValue("r_colorbits", 16);
|
||||
trap_Cvar_SetValue("r_depthbits", 16);
|
||||
trap_Cvar_SetValue("r_mode", 3);
|
||||
trap_Cvar_SetValue("r_picmip", 2);
|
||||
trap_Cvar_SetValue("r_texturebits", 16);
|
||||
trap_Cvar_SetValue("cg_shadows", 0);
|
||||
trap_Cvar_SetValue("com_blood", 0);
|
||||
trap_Cvar_SetValue("cg_gibs", 0);
|
||||
trap_Cvar_SetValue("cg_simpleItems", 1);
|
||||
trap_Cvar_SetValue("cg_marks", 0);
|
||||
trap_Cvar_SetValue("cg_brassTime", 0);
|
||||
trap_Cvar_SetValue("r_fastSky", 1);
|
||||
trap_Cvar_SetValue("r_inGameVideo", 0);
|
||||
trap_Cvar_SetValue("cg_RQ3_glasstime", 0);
|
||||
trap_Cvar_SetValue("cg_RQ3_flash", 0);
|
||||
trap_Cvar_SetValue("cg_RQ3_impactEffects", 0);
|
||||
trap_Cvar_SetValue("cg_shadows", 0);
|
||||
trap_Cvar_SetValue("r_inGameVideo", 1);
|
||||
trap_Cvar_SetValue("r_picmip", 2);
|
||||
trap_Cvar_SetValue("r_roundImagesDown", 2);
|
||||
trap_Cvar_SetValue("r_detailtextures", 0);
|
||||
trap_Cvar_SetValue("r_lodBias", 2);
|
||||
trap_Cvar_SetValue("r_swapInterval", 0);
|
||||
trap_Cvar_SetValue("r_subdivisions", 16);
|
||||
trap_Cvar_SetValue("r_lodCurveError", 125);
|
||||
trap_Cvar_SetValue("r_vertexlight", 0);
|
||||
trap_Cvar_SetValue("r_colorbits", 16);
|
||||
trap_Cvar_SetValue("r_texturebits", 16);
|
||||
trap_Cvar_SetValue("r_stencilbits", 0);
|
||||
trap_Cvar_SetValue("r_depthbits", 16);
|
||||
trap_Cvar_SetValue("r_dynamiclight", 0);
|
||||
trap_Cvar_SetValue("r_drawSun", 0);
|
||||
trap_Cvar_SetValue("r_fastsky", 1);
|
||||
trap_Cvar_SetValue("r_flares", 0);
|
||||
trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_NEAREST");
|
||||
trap_Cvar_SetValue("r_ext_multitexture", 0);
|
||||
trap_Cvar_SetValue("r_ext_compressed_textures", 1);
|
||||
trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 0);
|
||||
trap_Cvar_SetValue("r_ext_max_anisotropy", 2);
|
||||
break;
|
||||
}
|
||||
} else if (Q_stricmp(name, "ui_mousePitch") == 0) {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
//
|
||||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// $Log: ui_shared.c,v $
|
||||
// Revision 1.35 2006/07/24 17:16:12 makro
|
||||
// Got rid of the warnings lcc liked to share with the world
|
||||
//
|
||||
|
|
@ -4969,8 +4969,9 @@ static bind_t g_bindings[] = {
|
|||
{"+button5", 'r', -1, -1, -1},
|
||||
{"weapon", K_MOUSE3, -1, -1, -1},
|
||||
{"opendoor", K_ENTER, -1, -1, -1},
|
||||
{"dropweapon", 'x', -1, -1, -1},
|
||||
{"dropitem", 'z', -1, -1, -1},
|
||||
//TTI: replacing "dropweapon" with the newer "drop weapon", the same goes for "dropitem"
|
||||
{"drop weapon", 'x', -1, -1, -1},
|
||||
{"drop item", 'z', -1, -1, -1},
|
||||
{"irvision", 'v', -1, -1, -1},
|
||||
//Makro - this one was missing
|
||||
{"specialweapon", 'e', -1, -1, -1},
|
||||
|
|
@ -4979,8 +4980,11 @@ static bind_t g_bindings[] = {
|
|||
{"ui_RQ3_joinTeam", 'j', -1, -1, -1},
|
||||
{"ui_RQ3_presets", -1, -1, -1, -1},
|
||||
{"ui_RQ3_tkok", -1, -1, -1, -1},
|
||||
{"screenshot", -1, -1, -1. - 1},
|
||||
{"screenshotJPEG", K_F12, -1, -1. - 1}
|
||||
{"screenshot", -1, -1, -1, -1},
|
||||
{"screenshotJPEG", K_F12, -1, -1, -1},
|
||||
//TTI: more binds
|
||||
{"drop case", -1, -1, -1, -1},
|
||||
{"+voiprecord", -1, -1, -1, -1}
|
||||
};
|
||||
|
||||
static const int g_bindCount = sizeof(g_bindings) / sizeof(bind_t);
|
||||
|
|
@ -7321,6 +7325,49 @@ qboolean ItemParse_columns(itemDef_t * item, int handle)
|
|||
return qtrue;
|
||||
}
|
||||
|
||||
// columndef sets a number of columns and an x pos and width per
|
||||
qboolean ItemParse_columndef(itemDef_t * item, int handle)
|
||||
{
|
||||
int num, i;
|
||||
listBoxDef_t *listPtr;
|
||||
|
||||
Item_ValidateTypeData(item);
|
||||
if (!item->typeData)
|
||||
return qfalse;
|
||||
listPtr = (listBoxDef_t *) item->typeData;
|
||||
if (PC_Int_Parse(handle, &num))
|
||||
{
|
||||
int total = 0;
|
||||
//int max = (int)item->window.rect.w;
|
||||
if (num > MAX_LB_COLUMNS)
|
||||
{
|
||||
num = MAX_LB_COLUMNS;
|
||||
}
|
||||
listPtr->numColumns = num;
|
||||
for (i = 0; i < num; i++)
|
||||
{
|
||||
int pos, width;
|
||||
|
||||
if (PC_Int_Parse(handle, &pos) && PC_Int_Parse(handle, &width))
|
||||
{
|
||||
listPtr->columnInfo[i].pos = pos + total;
|
||||
listPtr->columnInfo[i].width = width;
|
||||
listPtr->columnInfo[i].maxChars = 0;
|
||||
total += pos + width;
|
||||
//if (total > max)
|
||||
//{
|
||||
// PC_SourceWarning(handle, "Column %d extends past window bounds by %d units", i+1, total - max);
|
||||
//}
|
||||
} else {
|
||||
return qfalse;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return qfalse;
|
||||
}
|
||||
return qtrue;
|
||||
}
|
||||
|
||||
qboolean ItemParse_border(itemDef_t * item, int handle)
|
||||
{
|
||||
if (!PC_Int_Parse(handle, &item->window.border)) {
|
||||
|
|
@ -7874,6 +7921,7 @@ keywordHash_t itemParseKeywords[] = {
|
|||
{"model_fovy", ItemParse_model_fovy, NULL},
|
||||
{"model_rotation", ItemParse_model_rotation, NULL},
|
||||
{"model_angle", ItemParse_model_angle, NULL},
|
||||
//{"model_adjustable", ItemParse_model_adjustable, NULL},
|
||||
//Makro - support for 3 angles
|
||||
{"model_angles", ItemParse_model_angles, NULL},
|
||||
{"rect", ItemParse_rect, NULL},
|
||||
|
|
@ -7903,6 +7951,7 @@ keywordHash_t itemParseKeywords[] = {
|
|||
{"feeder", ItemParse_feeder, NULL},
|
||||
{"elementtype", ItemParse_elementtype, NULL},
|
||||
{"columns", ItemParse_columns, NULL},
|
||||
{"columndef", ItemParse_columndef, NULL},
|
||||
{"border", ItemParse_border, NULL},
|
||||
//Makro - for drop shadow effects
|
||||
{"shadowStyle", ItemParse_shadowStyle, NULL},
|
||||
|
|
|
|||
Loading…
Reference in a new issue