blendo/thirtyflightsofloving
0
0
Fork 0
mirror of https://github.com/blendogames/thirtyflightsofloving.git synced 2025-01-31 04:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed cvars hud_scale, hud_alpha, and hud_squeezedigits to scr_hudsize, scr_hudalpha, and scr_hudsqueezedigits.

Browse source 
Added cl_hud and cl_hud_variant placeholder cvars.
Fixed some VS2019 compiler warnings pointed out by Paril.
This commit is contained in:
Knightmare66 2020-08-09 17:03:47 -04:00
parent 123d52cf8c
commit 74e4a4f1cc
8 changed files with 61 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/cl_http.c
View file

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifdef USE_CURL #ifdef USE_CURL
static enum /*static*/ enum
{ {
HTTPDL_ABORT_NONE, HTTPDL_ABORT_NONE,
HTTPDL_ABORT_SOFT, HTTPDL_ABORT_SOFT,

4
client/cl_inv.c
View file

@ -95,13 +95,13 @@ void CL_DrawInventory (void)
x = SCREEN_WIDTH/2 - 128; x = SCREEN_WIDTH/2 - 128;
y = SCREEN_HEIGHT/2 - 116; y = SCREEN_HEIGHT/2 - 116;
// R_DrawScaledPic (x, y+SCR_ScaledHud(8), SCR_GetHudScale(), hud_alpha->value, "inventory"); // R_DrawScaledPic (x, y+SCR_ScaledHud(8), SCR_GetHudScale(), scr_hudalpha->value, "inventory");
// y += SCR_ScaledHud(24); // y += SCR_ScaledHud(24);
// x += SCR_ScaledHud(24); // x += SCR_ScaledHud(24);
// Hud_DrawString (x, y, S_COLOR_BOLD"hotkey ### item"); // Hud_DrawString (x, y, S_COLOR_BOLD"hotkey ### item");
// Hud_DrawString (x, y+SCR_ScaledHud(8), S_COLOR_BOLD"------ --- ----"); // Hud_DrawString (x, y+SCR_ScaledHud(8), S_COLOR_BOLD"------ --- ----");
// y += SCR_ScaledHud(16); // y += SCR_ScaledHud(16);
SCR_DrawPic (x, y, 256, 192, ALIGN_CENTER, "inventory", hud_alpha->value); SCR_DrawPic (x, y, 256, 192, ALIGN_CENTER, "inventory", scr_hudalpha->value);
x += 24; x += 24;
y += 20; y += 20;
SCR_DrawString (x, y, 8, ALIGN_CENTER, S_COLOR_WHITE"hotkey ### item", 255); SCR_DrawString (x, y, 8, ALIGN_CENTER, S_COLOR_WHITE"hotkey ### item", 255);

60
client/cl_screen.c
View file

@ -74,9 +74,9 @@ cvar_t *scr_surroundlayout; // whether to keep HUD/menu elements on center scre
cvar_t *scr_surroundleft; // left placement of HUD/menu elements on center screen in triple-wide video modes cvar_t *scr_surroundleft; // left placement of HUD/menu elements on center screen in triple-wide video modes
cvar_t *scr_surroundright; // right placement of HUD/menu elements on center screen in triple-wide video modes cvar_t *scr_surroundright; // right placement of HUD/menu elements on center screen in triple-wide video modes
cvar_t *hud_scale; cvar_t *scr_hudsize;
cvar_t *hud_alpha; cvar_t *scr_hudalpha;
cvar_t *hud_squeezedigits; cvar_t *scr_hudsqueezedigits;
cvar_t *crosshair; cvar_t *crosshair;
cvar_t *crosshair_scale; // Psychospaz's scalable corsshair cvar_t *crosshair_scale; // Psychospaz's scalable corsshair
@ -88,6 +88,8 @@ cvar_t *cl_drawfps;
//end Knightmare //end Knightmare
cvar_t *cl_demomessage; cvar_t *cl_demomessage;
//cvar_t *cl_loadpercent; // unused //cvar_t *cl_loadpercent; // unused
cvar_t *cl_hud; // placeholder cvar
cvar_t *cl_hud_variant; // placeholder cvar
float scr_screenScale; float scr_screenScale;
float scr_hudScale; float scr_hudScale;
@ -139,8 +141,8 @@ void SCR_InitHudScale (void)
float refWidth, refHeight; float refWidth, refHeight;
int sizeIndex; int sizeIndex;
// sizeIndex = min(max((int)hud_scale->value, 0), HUDSCALE_NUM_SIZES-1); // sizeIndex = min(max((int)scr_hudsize->value, 0), HUDSCALE_NUM_SIZES-1);
sizeIndex = min(max(hud_scale->integer, 0), HUDSCALE_NUM_SIZES-1); sizeIndex = min(max(scr_hudsize->integer, 0), HUDSCALE_NUM_SIZES-1);
if (sizeIndex == 0) { if (sizeIndex == 0) {
refWidth = viddef.width; refWidth = viddef.width;
@ -1092,9 +1094,9 @@ void SCR_SizeUp_f (void)
// Cvar_SetValue ("viewsize", scr_viewsize->value+10); // Cvar_SetValue ("viewsize", scr_viewsize->value+10);
// now handle HUD scale // now handle HUD scale
int hudscale = Cvar_VariableValue("hud_scale")+1; int hudscale = Cvar_VariableValue("scr_hudsize")+1;
if (hudscale > HUDSCALE_NUM_SIZES-1) hudscale = HUDSCALE_NUM_SIZES-1; if (hudscale > HUDSCALE_NUM_SIZES-1) hudscale = HUDSCALE_NUM_SIZES-1;
Cvar_SetValue ("hud_scale", hudscale); Cvar_SetValue ("scr_hudsize", hudscale);
} }
@ -1110,9 +1112,9 @@ void SCR_SizeDown_f (void)
// Cvar_SetValue ("viewsize", scr_viewsize->value-10); // Cvar_SetValue ("viewsize", scr_viewsize->value-10);
// now handle HUD scale // now handle HUD scale
int hudscale = Cvar_VariableValue("hud_scale")-1; int hudscale = Cvar_VariableValue("scr_hudsize")-1;
if (hudscale < 0) hudscale = 0; if (hudscale < 0) hudscale = 0;
Cvar_SetValue ("hud_scale", hudscale); Cvar_SetValue ("scr_hudsize", hudscale);
} }
/* /*
@ -1335,6 +1337,10 @@ void SCR_Init (void)
cl_demomessage = Cvar_Get ("cl_demomessage", "1", CVAR_ARCHIVE); cl_demomessage = Cvar_Get ("cl_demomessage", "1", CVAR_ARCHIVE);
Cvar_SetDescription ("cl_demomessage", "Enables display of \"Running Demo\" message when a demo is playing."); Cvar_SetDescription ("cl_demomessage", "Enables display of \"Running Demo\" message when a demo is playing.");
// cl_loadpercent = Cvar_Get ("cl_loadpercent", "0", CVAR_ARCHIVE); // unused // cl_loadpercent = Cvar_Get ("cl_loadpercent", "0", CVAR_ARCHIVE); // unused
cl_hud = Cvar_Get ("cl_hud", "default", CVAR_ARCHIVE|CVAR_NOSET);
Cvar_SetDescription ("cl_hud", "This is a placeholder cvar for cohabitation with a future release.");
cl_hud_variant = Cvar_Get ("cl_hud_variant", "default", CVAR_ARCHIVE|CVAR_NOSET);
Cvar_SetDescription ("cl_hud_variant", "This is a placeholder cvar for cohabitation with a future release.");
scr_viewsize = Cvar_Get ("viewsize", "100", CVAR_ARCHIVE); scr_viewsize = Cvar_Get ("viewsize", "100", CVAR_ARCHIVE);
Cvar_SetDescription ("viewsize", "Draw size of screen in percent, from 40 to 100."); Cvar_SetDescription ("viewsize", "Draw size of screen in percent, from 40 to 100.");
@ -1383,12 +1389,12 @@ void SCR_Init (void)
scr_surroundright = Cvar_Get ("scr_surroundright", "0.666666666667", CVAR_ARCHIVE); // right placement of HUD/menu elements on center screen in triple-wide video modes scr_surroundright = Cvar_Get ("scr_surroundright", "0.666666666667", CVAR_ARCHIVE); // right placement of HUD/menu elements on center screen in triple-wide video modes
Cvar_SetDescription ("scr_surroundright", "Changes right boundary for center monitor in triple-monitor surround layout. Only change if you have a surround setup with different size monitors."); Cvar_SetDescription ("scr_surroundright", "Changes right boundary for center monitor in triple-monitor surround layout. Only change if you have a surround setup with different size monitors.");
hud_scale = Cvar_Get ("hud_scale", "5", CVAR_ARCHIVE); scr_hudsize = Cvar_Get ("scr_hudsize", "5", CVAR_ARCHIVE);
Cvar_SetDescription ("hud_scale", "Sets scale for HUD."); Cvar_SetDescription ("scr_hudsize", "Sets scale for HUD.");
hud_alpha = Cvar_Get ("hud_alpha", "1", CVAR_ARCHIVE); scr_hudalpha = Cvar_Get ("scr_hudalpha", "1", CVAR_ARCHIVE);
Cvar_SetDescription ("hud_alpha", "Sets opacity of HUD."); Cvar_SetDescription ("scr_hudalpha", "Sets opacity of HUD.");
hud_squeezedigits = Cvar_Get ("hud_squeezedigits", "1", CVAR_ARCHIVE); scr_hudsqueezedigits = Cvar_Get ("scr_hudsqueezedigits", "1", CVAR_ARCHIVE);
Cvar_SetDescription ("hud_squeezedigits", "Enables display of 4 and 5-digit numbers on HUD."); Cvar_SetDescription ("scr_hudsqueezedigits", "Enables display of 4 and 5-digit numbers on HUD.");
// //
// register our commands // register our commands
@ -2248,8 +2254,8 @@ void SCR_DrawField (int x, int y, int color, int width, int value, qboolean flas
l = (int)strlen(num); l = (int)strlen(num);
if (l > width) if (l > width)
{ {
// if (hud_squeezedigits->value) { // if (scr_hudsqueezedigits->value) {
if (hud_squeezedigits->integer) { if (scr_hudsqueezedigits->integer) {
l = min(l, width+2); l = min(l, width+2);
fieldScale = (1.0 - ((1.0 - (float)width/(float)l) * 0.5)) * getScreenScale(); fieldScale = (1.0 - ((1.0 - (float)width/(float)l) * 0.5)) * getScreenScale();
} }
@ -2265,7 +2271,7 @@ void SCR_DrawField (int x, int y, int color, int width, int value, qboolean flas
flash_x = x; flash_x = x;
if (flash) if (flash)
R_DrawStretchPic (flash_x, y, flashWidth, scaleForScreen(ICON_HEIGHT), "field_3", hud_alpha->value); R_DrawStretchPic (flash_x, y, flashWidth, scaleForScreen(ICON_HEIGHT), "field_3", scr_hudalpha->value);
ptr = num; ptr = num;
while (*ptr && l) while (*ptr && l)
@ -2275,11 +2281,11 @@ void SCR_DrawField (int x, int y, int color, int width, int value, qboolean flas
else else
frame = *ptr -'0'; frame = *ptr -'0';
// R_DrawScaledPic (x, y, HudScale(), hud_alpha->value,sb_nums[color][frame]); // R_DrawScaledPic (x, y, HudScale(), scr_hudalpha->value,sb_nums[color][frame]);
// x += scaledHud(CHAR_WIDTH); // x += scaledHud(CHAR_WIDTH);
// R_DrawScaledPic (x, y, getScreenScale(), hud_alpha->value, sb_nums[color][frame]); // R_DrawScaledPic (x, y, getScreenScale(), scr_hudalpha->value, sb_nums[color][frame]);
// x += scaleForScreen(CHAR_WIDTH); // x += scaleForScreen(CHAR_WIDTH);
R_DrawStretchPic (x, y, digitWidth, scaleForScreen(ICON_HEIGHT), sb_nums[color][frame], hud_alpha->value); R_DrawStretchPic (x, y, digitWidth, scaleForScreen(ICON_HEIGHT), sb_nums[color][frame], scr_hudalpha->value);
x += digitWidth; x += digitWidth;
ptr++; ptr++;
l--; l--;
@ -2428,7 +2434,7 @@ void SCR_ExecuteLayoutString (char *s, qboolean isStatusBar)
} }
if (cl.configstrings[cs_images+value]) if (cl.configstrings[cs_images+value])
{ {
R_DrawScaledPic (x, y, getScreenScale(), hud_alpha->value, cl.configstrings[cs_images+value]); R_DrawScaledPic (x, y, getScreenScale(), scr_hudalpha->value, cl.configstrings[cs_images+value]);
} }
continue; continue;
} }
@ -2465,7 +2471,7 @@ void SCR_ExecuteLayoutString (char *s, qboolean isStatusBar)
if (!ci->icon) if (!ci->icon)
ci = &cl.baseclientinfo; ci = &cl.baseclientinfo;
R_DrawScaledPic(x, y, getScreenScale(), hud_alpha->value, ci->iconname); R_DrawScaledPic(x, y, getScreenScale(), scr_hudalpha->value, ci->iconname);
continue; continue;
} }
@ -2538,7 +2544,7 @@ void SCR_ExecuteLayoutString (char *s, qboolean isStatusBar)
if (!strcmp(token, "picn")) if (!strcmp(token, "picn"))
{ // draw a pic from a name { // draw a pic from a name
token = COM_Parse (&s); token = COM_Parse (&s);
R_DrawScaledPic (x, y, getScreenScale(), hud_alpha->value, token); R_DrawScaledPic (x, y, getScreenScale(), scr_hudalpha->value, token);
continue; continue;
} }
@ -2570,7 +2576,7 @@ void SCR_ExecuteLayoutString (char *s, qboolean isStatusBar)
color = 1; color = 1;
// if (cl.frame.playerstate.stats[STAT_FLASHES] & 1) // if (cl.frame.playerstate.stats[STAT_FLASHES] & 1)
// R_DrawScaledPic (x, y, getScreenScale(), hud_alpha->value, "field_3"); // R_DrawScaledPic (x, y, getScreenScale(), scr_hudalpha->value, "field_3");
SCR_DrawField (x, y, color, width, value, (cl.frame.playerstate.stats[STAT_FLASHES] & 1), isStatusBar); SCR_DrawField (x, y, color, width, value, (cl.frame.playerstate.stats[STAT_FLASHES] & 1), isStatusBar);
continue; continue;
@ -2590,7 +2596,7 @@ void SCR_ExecuteLayoutString (char *s, qboolean isStatusBar)
continue; // negative number = don't show continue; // negative number = don't show
// if (cl.frame.playerstate.stats[STAT_FLASHES] & 4) // if (cl.frame.playerstate.stats[STAT_FLASHES] & 4)
// R_DrawScaledPic (x, y, getScreenScale(), hud_alpha->value, "field_3"); // R_DrawScaledPic (x, y, getScreenScale(), scr_hudalpha->value, "field_3");
SCR_DrawField (x, y, color, width, value, (cl.frame.playerstate.stats[STAT_FLASHES] & 4), isStatusBar); SCR_DrawField (x, y, color, width, value, (cl.frame.playerstate.stats[STAT_FLASHES] & 4), isStatusBar);
continue; continue;
@ -2608,7 +2614,7 @@ void SCR_ExecuteLayoutString (char *s, qboolean isStatusBar)
color = 0; // green color = 0; // green
// if (cl.frame.playerstate.stats[STAT_FLASHES] & 2) // if (cl.frame.playerstate.stats[STAT_FLASHES] & 2)
// R_DrawScaledPic (x, y, getScreenScale(), hud_alpha->value, "field_3"); // R_DrawScaledPic (x, y, getScreenScale(), scr_hudalpha->value, "field_3");
SCR_DrawField (x, y, color, width, value, (cl.frame.playerstate.stats[STAT_FLASHES] & 2), isStatusBar); SCR_DrawField (x, y, color, width, value, (cl.frame.playerstate.stats[STAT_FLASHES] & 2), isStatusBar);
continue; continue;

5
client/client.h
View file

@ -478,8 +478,9 @@ extern cvar_t *lookspring;
extern cvar_t *lookstrafe; extern cvar_t *lookstrafe;
extern cvar_t *sensitivity; extern cvar_t *sensitivity;
extern cvar_t *hud_scale; extern cvar_t *scr_hudsize;
extern cvar_t *hud_alpha; extern cvar_t *scr_hudalpha;
extern cvar_t *scr_hudsqueezedigits;
extern cvar_t *m_pitch; extern cvar_t *m_pitch;
extern cvar_t *m_yaw; extern cvar_t *m_yaw;

2
kmquake2_changelog.txt
View file

@ -42,6 +42,8 @@ Changes as of v0.20 update 8:
- Now compresses .sav and .sv2 savegame files into .savz files. It will still read savegames from earlier - Now compresses .sav and .sv2 savegame files into .savz files. It will still read savegames from earlier
KMQ2 versions (with the same game DLL). This should improve load and save times in multi-level units. KMQ2 versions (with the same game DLL). This should improve load and save times in multi-level units.
- Renamed cvars hud_scale, hud_alpha, and hud_squeezedigits to scr_hudsize, scr_hudalpha, and scr_hudsqueezedigits.
- Added descriptions for most cvars. - Added descriptions for most cvars.
- Added dumpcvars command to output a list of cvars with their descriptions to cvarlist.txt. Takes an optional wildcard. Usage: - Added dumpcvars command to output a list of cvars with their descriptions to cvarlist.txt. Takes an optional wildcard. Usage:

2
renderer/r_local.h
View file

@ -370,7 +370,7 @@ extern vec4_t r_clearColor; // for gl_clear
// entity sorting struct // entity sorting struct
typedef struct sortedelement_s sortedelement_t; typedef struct sortedelement_s sortedelement_t;
typedef struct sortedelement_s struct sortedelement_s
{ {
void *data; void *data;
vec_t len; vec_t len;

7
renderer/r_particle.c
View file

@ -220,8 +220,9 @@ vec3_t shadelight;
// Particle batching struct // Particle batching struct
// used for grouping particles by identical rendering state // used for grouping particles by identical rendering state
// and rendering in vertex arrays // and rendering in vertex arrays
typedef struct particleRenderState_s particleRenderState_t; //typedef struct particleRenderState_s particleRenderState_t;
typedef struct particleRenderState_s //struct particleRenderState_s
typedef struct
{ {
GLenum polymode; GLenum polymode;
// qboolean texture2D; // qboolean texture2D;
@ -233,7 +234,7 @@ typedef struct particleRenderState_s
GLenum blendfunc_dst; GLenum blendfunc_dst;
int imagenum; int imagenum;
int depth_hack; int depth_hack;
}; } particleRenderState_t;
particleRenderState_t currentParticleState; particleRenderState_t currentParticleState;
//int particle_va, particle_index; //int particle_va, particle_index;

24
ui/ui_options_screen.c
View file

@ -70,19 +70,19 @@ static void CrosshairPulseFunc( void *unused )
// hud scaling option // hud scaling option
static void HudScaleFunc( void *unused ) static void HudScaleFunc( void *unused )
{ {
Cvar_SetValue( "hud_scale", s_options_screen_hudscale_slider.curvalue); Cvar_SetValue( "scr_hudsize", s_options_screen_hudscale_slider.curvalue);
} }
// hud trans option // hud trans option
static void HudAlphaFunc( void *unused ) static void HudAlphaFunc( void *unused )
{ {
Cvar_SetValue( "hud_alpha", (s_options_screen_hudalpha_slider.curvalue-1)/10); Cvar_SetValue( "scr_hudalpha", (s_options_screen_hudalpha_slider.curvalue-1)/10);
} }
// hud squeeze digits option // hud squeeze digits option
static void HudSqueezeDigitsFunc( void *unused ) static void HudSqueezeDigitsFunc( void *unused )
{ {
Cvar_SetValue( "hud_squeezedigits", s_options_screen_hudsqueezedigits_box.curvalue); Cvar_SetValue( "scr_hudsqueezedigits", s_options_screen_hudsqueezedigits_box.curvalue);
} }
// FPS counter option // FPS counter option
@ -343,14 +343,14 @@ static void ScreenSetMenuItemValues( void )
Cvar_SetValue( "crosshair_pulse", ClampCvar( 0, 0.5, Cvar_VariableValue("crosshair_pulse") ) ); Cvar_SetValue( "crosshair_pulse", ClampCvar( 0, 0.5, Cvar_VariableValue("crosshair_pulse") ) );
s_options_screen_crosshairpulse_slider.curvalue = Cvar_VariableValue("crosshair_pulse")*20; s_options_screen_crosshairpulse_slider.curvalue = Cvar_VariableValue("crosshair_pulse")*20;
Cvar_SetValue( "hud_scale", ClampCvar( 0, 8, Cvar_VariableValue("hud_scale") ) ); Cvar_SetValue( "scr_hudsize", ClampCvar( 0, 8, Cvar_VariableValue("scr_hudsize") ) );
s_options_screen_hudscale_slider.curvalue = Cvar_VariableValue("hud_scale"); s_options_screen_hudscale_slider.curvalue = Cvar_VariableValue("scr_hudsize");
Cvar_SetValue( "hud_alpha", ClampCvar( 0, 1, Cvar_VariableValue("hud_alpha") ) ); Cvar_SetValue( "scr_hudalpha", ClampCvar( 0, 1, Cvar_VariableValue("scr_hudalpha") ) );
s_options_screen_hudalpha_slider.curvalue = Cvar_VariableValue("hud_alpha")*10 + 1; s_options_screen_hudalpha_slider.curvalue = Cvar_VariableValue("scr_hudalpha")*10 + 1;
Cvar_SetValue( "hud_squeezedigits", ClampCvar( 0, 1, Cvar_VariableValue("hud_squeezedigits") ) ); Cvar_SetValue( "scr_hudsqueezedigits", ClampCvar( 0, 1, Cvar_VariableValue("scr_hudsqueezedigits") ) );
s_options_screen_hudsqueezedigits_box.curvalue = Cvar_VariableValue("hud_squeezedigits"); s_options_screen_hudsqueezedigits_box.curvalue = Cvar_VariableValue("scr_hudsqueezedigits");
Cvar_SetValue( "cl_drawfps", ClampCvar( 0, 1, Cvar_VariableValue("cl_drawfps") ) ); Cvar_SetValue( "cl_drawfps", ClampCvar( 0, 1, Cvar_VariableValue("cl_drawfps") ) );
s_options_screen_fps_box.curvalue = Cvar_VariableValue("cl_drawfps"); s_options_screen_fps_box.curvalue = Cvar_VariableValue("cl_drawfps");
@ -362,9 +362,9 @@ static void ScreenResetDefaultsFunc ( void *unused )
Cvar_SetToDefault ("crosshair_scale"); Cvar_SetToDefault ("crosshair_scale");
Cvar_SetToDefault ("crosshair_alpha"); Cvar_SetToDefault ("crosshair_alpha");
Cvar_SetToDefault ("crosshair_pulse"); Cvar_SetToDefault ("crosshair_pulse");
Cvar_SetToDefault ("hud_scale"); Cvar_SetToDefault ("scr_hudsize");
Cvar_SetToDefault ("hud_alpha"); Cvar_SetToDefault ("scr_hudalpha");
Cvar_SetToDefault ("hud_squeezedigits"); Cvar_SetToDefault ("scr_hudsqueezedigits");
Cvar_SetToDefault ("cl_drawfps"); Cvar_SetToDefault ("cl_drawfps");
ScreenSetMenuItemValues(); ScreenSetMenuItemValues();