ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-10 07:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

revise hud waypoint command names and usage

Browse source 
-now hud_waypoint_draw and hud_waypoint_blink
This commit is contained in:
pierow 2024-04-29 19:21:38 -04:00
parent 1b8460c74a
commit aa3ddd6017
8 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
main/presetcfgs/AV/competitive.cfg
View file

@ -27,7 +27,6 @@ hud_style "2"
hud_mapstyle "3" hud_mapstyle "3"
//hud_mapnames "5" //hud_mapnames "5"
cl_hudmapzoom "2" cl_hudmapzoom "2"
hud_waypointblinking "0"
// New crosshairs // New crosshairs
crosshair "0" crosshair "0"

1
main/presetcfgs/AV/newdefault.cfg
View file

@ -27,7 +27,6 @@ hud_style "1"
hud_mapstyle "3" hud_mapstyle "3"
//hud_mapnames "5" //hud_mapnames "5"
cl_hudmapzoom "2" cl_hudmapzoom "2"
hud_waypointblinking "1"
// New crosshairs // New crosshairs
crosshair "0" crosshair "0"

1
main/presetcfgs/AV/ns32.cfg
View file

@ -27,7 +27,6 @@ hud_style "0"
hud_mapstyle "1" hud_mapstyle "1"
//hud_mapnames "0" //hud_mapnames "0"
cl_hudmapzoom "3" cl_hudmapzoom "3"
hud_waypointblinking "2"
// Legacy sprite crosshairs // Legacy sprite crosshairs
crosshair "1" crosshair "1"

4
main/source/cl_dll/hud.cpp
View file

@ -228,8 +228,8 @@ void CHud :: Init( void )
CVAR_CREATE("hud_mapnamesGreen", "255", FCVAR_ARCHIVE); CVAR_CREATE("hud_mapnamesGreen", "255", FCVAR_ARCHIVE);
CVAR_CREATE("hud_mapnamesBlue", "255", FCVAR_ARCHIVE); CVAR_CREATE("hud_mapnamesBlue", "255", FCVAR_ARCHIVE);
CVAR_CREATE("hud_nameinfo", "1", FCVAR_ARCHIVE); CVAR_CREATE("hud_nameinfo", "1", FCVAR_ARCHIVE);
CVAR_CREATE("hud_drawwaypoints", "2", FCVAR_ARCHIVE); CVAR_CREATE("hud_waypoint_draw", "2", FCVAR_ARCHIVE);
CVAR_CREATE("hud_waypointblinking", "1", FCVAR_ARCHIVE); CVAR_CREATE("hud_waypoint_blink", "2", FCVAR_ARCHIVE);
m_pCvarWidescreen = gEngfuncs.pfnGetCvarPointer("gl_widescreen_yfov"); m_pCvarWidescreen = gEngfuncs.pfnGetCvarPointer("gl_widescreen_yfov");
m_pSpriteList = NULL; m_pSpriteList = NULL;

2
main/source/mod/AvHHud.cpp
View file

@ -2825,7 +2825,7 @@ int AvHHud::MsgFunc_SetOrder(const char* pszName, int iSize, void* pbuf)
// Check if it's the same order as the last one before setting the acknowledgement bool. Happens when respawning. // Check if it's the same order as the last one before setting the acknowledgement bool. Happens when respawning.
Vector newOrderLocation; Vector newOrderLocation;
theNewOrder.GetLocation(newOrderLocation); theNewOrder.GetLocation(newOrderLocation);
if (CVAR_GET_FLOAT("hud_drawwaypoints") == 2.0f) if (CVAR_GET_FLOAT("hud_waypoint_draw") == 2.0f)
{ {
if ((newOrderLocation != this->mLastOrderLocation && theNewOrder.GetTargetIndex() == -1) || theNewOrder.GetTargetIndex() != this->mLastOrderIndex) if ((newOrderLocation != this->mLastOrderLocation && theNewOrder.GetTargetIndex() == -1) || theNewOrder.GetTargetIndex() != this->mLastOrderIndex)
{ {

4
main/source/mod/AvHHudRender.cpp
View file

@ -1342,7 +1342,7 @@ void AvHHud::DrawOrders()
{ {
// Draw them blinking for soldiers, but always for commanders // Draw them blinking for soldiers, but always for commanders
float theFractionalLastUpdate = this->mTimeOfLastUpdate - (int)this->mTimeOfLastUpdate; float theFractionalLastUpdate = this->mTimeOfLastUpdate - (int)this->mTimeOfLastUpdate;
if ((theFractionalLastUpdate > .25f || CVAR_GET_FLOAT("hud_waypointblinking") <= 1.0f) || (this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER)) if ((theFractionalLastUpdate > .25f || CVAR_GET_FLOAT("hud_waypoint_blink") != 1.0f) || (this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER))
{ {
OrderListType theOrders = this->GetOrderList(); OrderListType theOrders = this->GetOrderList();
@ -2903,7 +2903,7 @@ void AvHHud::RenderCommonUI()
DrawInfoLocationText(); DrawInfoLocationText();
DrawHUDStructureNotification(); DrawHUDStructureNotification();
if (CVAR_GET_FLOAT("hud_drawwaypoints") == 1 || (CVAR_GET_FLOAT("hud_drawwaypoints") == 2.0f && this->GetDrawOrderOverlay())) { if (CVAR_GET_FLOAT("hud_waypoint_draw") == 1.0f || (CVAR_GET_FLOAT("hud_waypoint_draw") == 2.0f && this->GetDrawOrderOverlay())) {
this->DrawOrders(); this->DrawOrders();
} }
this->DrawHelpIcons(); this->DrawHelpIcons();

2
main/source/mod/AvHOverviewMap.cpp
View file

@ -399,7 +399,7 @@ void AvHOverviewMap::DrawMiniMapEntity(const DrawInfo& inDrawInfo, const Drawabl
float theFractionalLastUpdate = mLastUpdateTime - (int)mLastUpdateTime; float theFractionalLastUpdate = mLastUpdateTime - (int)mLastUpdateTime;
if (theFractionalLastUpdate < .25f && CVAR_GET_FLOAT("hud_waypointblinking") >= 1.0f) if (theFractionalLastUpdate < .25f && CVAR_GET_FLOAT("hud_waypoint_blink") >= 1.0f)
{ {
return; return;
} }

10
main/user.scr
View file

@ -225,7 +225,7 @@ DESCRIPTION INFO_OPTIONS
{ "2.000000" } { "2.000000" }
} }
"hud_drawwaypoints" "hud_waypoint_draw"
{ {
"Show waypoints on HUD" "Show waypoints on HUD"
{ {
@ -237,16 +237,16 @@ DESCRIPTION INFO_OPTIONS
{ "2.000000" } { "2.000000" }
} }
"hud_waypointblinking" "hud_waypoint_blink"
{ {
"Waypoint blinking" "Waypoint blinking"
{ {
LIST LIST
"Never" "0" "Never" "0"
"On map only" "1" "Always" "1"
"On map and HUD" "2" "On minimap only" "2"
} }
{ "1.000000" } { "2.000000" }
} }
"hud_teamhealthalert" "hud_teamhealthalert"