cachepic_t *sb_finale;
cvar_t showfps = {CVAR_SAVE, "showfps", "0", "shows your rendered fps (frames per second)"};
+cvar_t showspeed = {CVAR_SAVE, "showspeed", "0", "shows your current speed (qu per second); number selects unit: 1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots"};
cvar_t showtime = {CVAR_SAVE, "showtime", "0", "shows current time of day (useful on screenshots)"};
cvar_t showtime_format = {CVAR_SAVE, "showtime_format", "%H:%M:%S", "format string for time of day"};
cvar_t showdate = {CVAR_SAVE, "showdate", "0", "shows current date (useful on screenshots)"};
cvar_t sbar_hudselector = {CVAR_SAVE, "sbar_hudselector", "0", "selects which of the builtin hud layouts to use (meaning is somewhat dependent on gamemode, so nexuiz has a very different set of hud layouts than quake for example)"};
cvar_t sbar_miniscoreboard_size = {CVAR_SAVE, "sbar_miniscoreboard_size", "-1", "sets the size of the mini deathmatch overlay in items, or disables it when set to 0, or sets it to a sane default when set to -1"};
cvar_t sbar_flagstatus_right = {CVAR_SAVE, "sbar_flagstatus_right", "0", "moves Nexuiz flag status icons to the right"};
+cvar_t sbar_flagstatus_pos = {CVAR_SAVE, "sbar_flagstatus_pos", "115", "pixel position of the Nexuiz flag status icons, from the bottom"};
cvar_t cl_deathscoreboard = {0, "cl_deathscoreboard", "1", "shows scoreboard (+showscores) while dead"};
Cmd_AddCommand("+showscores", Sbar_ShowScores, "show scoreboard");
Cmd_AddCommand("-showscores", Sbar_DontShowScores, "hide scoreboard");
Cvar_RegisterVariable(&showfps);
+ Cvar_RegisterVariable(&showspeed);
Cvar_RegisterVariable(&showtime);
Cvar_RegisterVariable(&showtime_format);
Cvar_RegisterVariable(&showdate);
Cvar_RegisterVariable(&crosshair_size);
if(gamemode == GAME_NEXUIZ)
+ {
Cvar_RegisterVariable(&sbar_flagstatus_right); // this cvar makes no sense in other games
+ Cvar_RegisterVariable(&sbar_flagstatus_pos); // this cvar makes no sense in other games
+ }
R_RegisterModule("sbar", sbar_start, sbar_shutdown, sbar_newmap);
}
char fpsstring[32];
char timestring[32];
char datestring[32];
+ char speedstring[32];
qboolean red = false;
fpsstring[0] = 0;
timestring[0] = 0;
datestring[0] = 0;
+ speedstring[0] = 0;
if (showfps.integer)
{
float calc;
strlcpy(timestring, Sys_TimeString(showtime_format.string), sizeof(timestring));
if (showdate.integer)
strlcpy(datestring, Sys_TimeString(showdate_format.string), sizeof(datestring));
- if (fpsstring[0] || timestring[0])
+ if (showspeed.integer)
+ {
+ double speed, speedxy, f;
+ const char *unit;
+ speed = VectorLength(cl.movement_velocity);
+ speedxy = sqrt(cl.movement_velocity[0] * cl.movement_velocity[0] + cl.movement_velocity[1] * cl.movement_velocity[1]);
+ switch(showspeed.integer)
+ {
+ default:
+ case 1:
+ if(gamemode == GAME_NEXUIZ)
+ unit = "in/s";
+ else
+ unit = "qu/s";
+ f = 1.0;
+ break;
+ case 2:
+ unit = "m/s";
+ f = 0.0254;
+ if(gamemode != GAME_NEXUIZ) f *= 1.5;
+ // 1qu=1.5in is for non-Nexuiz only - Nexuiz players are overly large, but 1qu=1in fixes that
+ break;
+ case 3:
+ unit = "km/h";
+ f = 0.0254 * 3.6;
+ if(gamemode != GAME_NEXUIZ) f *= 1.5;
+ break;
+ case 4:
+ unit = "mph";
+ f = 0.0254 * 3.6 * 0.6213711922;
+ if(gamemode != GAME_NEXUIZ) f *= 1.5;
+ break;
+ case 5:
+ unit = "knots";
+ f = 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h
+ if(gamemode != GAME_NEXUIZ) f *= 1.5;
+ break;
+ }
+ dpsnprintf(speedstring, sizeof(speedstring), "%.0f (%.0f) %s", f*speed, f*speedxy, unit);
+ }
+ if (fpsstring[0] || timestring[0] || datestring[0] || speedstring[0])
{
fps_scalex = 12;
fps_scaley = 12;
- fps_height = fps_scaley * ((fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0));
+ fps_height = fps_scaley * ((fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0) + (speedstring[0] != 0));
//fps_y = vid_conheight.integer - sb_lines; // yes this may draw over the sbar
//fps_y = bound(0, fps_y, vid_conheight.integer - fps_height);
fps_y = vid_conheight.integer - fps_height;
DrawQ_String_Font(fps_x, fps_y, datestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
fps_y += fps_scaley;
}
+ if (speedstring[0])
+ {
+ fps_x = vid_conwidth.integer - DrawQ_TextWidth_Font(speedstring, 0, true, FONT_INFOBAR) * fps_scalex;
+ DrawQ_Fill(fps_x, fps_y, vid_conwidth.integer - fps_x, fps_scaley, 0, 0, 0, 0.5, 0);
+ DrawQ_String_Font(fps_x, fps_y, speedstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
+ fps_y += fps_scaley;
+ }
}
}
{
// The Impossible Combination[tm]
// Can only happen in Key Hunt mode...
- Sbar_DrawPic (x, -179, sb_items[14]);
+ Sbar_DrawPic (x, (vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 128), sb_items[14]);
}
else
{
if (redflag)
- Sbar_DrawPic (x, -117, sb_items[redflag+10]);
+ Sbar_DrawPic (x, (vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 64), sb_items[redflag+10]);
if (blueflag)
- Sbar_DrawPic (x, -177, sb_items[blueflag+14]);
+ Sbar_DrawPic (x, (vid_conheight.integer - sbar_y) - (sbar_flagstatus_pos.value + 128), sb_items[blueflag+14]);
}
// armor
projects / xonotic / darkplaces.git / blobdiff