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

Fix gamma ramp and add hud_waypointblinking

Browse source 
- fix gamma ramp not working correctly on maps with no env_gamma entity
- add hud_waypointblinking
This commit is contained in:
pierow 2024-04-29 17:27:57 -04:00
parent 3b8049d226
commit f39297efcb
8 changed files with 43 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,6 +229,7 @@ void CHud :: Init( void )
CVAR_CREATE("hud_mapnamesBlue", "255", FCVAR_ARCHIVE);
CVAR_CREATE("hud_nameinfo", "1", FCVAR_ARCHIVE);
CVAR_CREATE("hud_drawwaypoints", "2", FCVAR_ARCHIVE);
CVAR_CREATE("hud_waypointblinking", "0", FCVAR_ARCHIVE);
m_pSpriteList = NULL;

2
main/source/cl_dll/shader.cpp
View file

@ -175,7 +175,7 @@ void CPostProcessShader::DrawShader()
// If the map has no gamma value, override it with the cvar's value.
else
{
colorMultiplier = min(1.0f, scalarCvar);
colorMultiplier = max(1.0f, scalarCvar);
}
// Use shader.

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

@ -1030,7 +1030,7 @@ void AvHGameplay::Spawn()
AvHGamma::AvHGamma()
{
this->mGammaScalar = 1.0f;
this->mGammaScalar = kDefaultMapGamma;
}
void AvHGamma::KeyValue(KeyValueData* pkvd)

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

@ -770,7 +770,7 @@ bool AvHGamerules::CanPlayerBeKilled(CBasePlayer* inPlayer)
void AvHGamerules::CalculateMapGamma()
{
// Set defaults
this->mCalculatedMapGamma = kDefaultMapGamma;
//this->mCalculatedMapGamma = kDefaultMapGamma;
// Fetch from map extents entity if the map has one
FOR_ALL_ENTITIES(kwsGammaClassName, AvHGamma*)
@ -2307,6 +2307,8 @@ void AvHGamerules::PostWorldPrecacheReset(bool inNewMap)
this->mMapExtents.ResetMapExtents();
this->mCalculatedMapGamma = false;
this->mMapGamma = kDefaultMapGamma;
this->mMapGammaAlt = kDefaultMapGamma;
// TODO: Clear min/max map sizes? Others?

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

@ -2611,6 +2611,7 @@ void AvHHud::ResetGame(bool inMapChanged)
this->mHiveInfoList.clear();
this->mShaderGamma = kDefaultMapGamma;
this->mShaderGammaAlt = kDefaultMapGamma;
this->mDesiredGammaSlope = kDefaultMapGamma;
this->mDesiredGammaSlopeAlt = kDefaultMapGamma;
this->mRecordingLastFrame = false;
@ -2821,7 +2822,24 @@ int AvHHud::MsgFunc_SetOrder(const char* pszName, int iSize, void* pbuf)
AvHChangeOrder(this->mOrders, theNewOrder);
this->mDrawOrderOverlay = true;
// Check if it's the same order as the last one before setting the acknowledgement bool. Happens when respawning.
Vector newOrderLocation;
theNewOrder.GetLocation(newOrderLocation);
if (CVAR_GET_FLOAT("hud_drawwaypoints") == 2.0f)
{
if ((newOrderLocation != this->mLastOrderLocation && theNewOrder.GetTargetIndex() == -1) || theNewOrder.GetTargetIndex() != this->mLastOrderIndex)
{
this->mDrawOrderOverlay = true;
}
if (!this->mDrawOrderOverlay)
gEngfuncs.Con_Printf("waypoint trapped \n");
}
else
{
this->mDrawOrderOverlay = true;
}
this->mLastOrderLocation = newOrderLocation;
this->mLastOrderIndex = theNewOrder.GetTargetIndex();
// Give feedback on order
this->OrderNotification(theNewOrder);
@ -3875,6 +3893,8 @@ void AvHHud::Init(void)
this->mDrawCombatUpgradeMenu = false;
this->mDrawOrderOverlay = true;
this->mLastOrderLocation = Vector(0.0f, 0.0f, 0.0f);
this->mLastOrderIndex = -1;
this->mReInitHUD = false;
this->mLastHudStyle = 0;

3
main/source/mod/AvHHud.h
View file

@ -889,6 +889,9 @@ private:
float mShaderGamma;
float mShaderGammaAlt;
Vector mLastOrderLocation;
int mLastOrderIndex;
};
class CPostProcessShader

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

@ -1342,7 +1342,7 @@ void AvHHud::DrawOrders()
{
// Draw them blinking for soldiers, but always for commanders
float theFractionalLastUpdate = this->mTimeOfLastUpdate - (int)this->mTimeOfLastUpdate;
if((theFractionalLastUpdate > .25f) || (this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER))
if ((theFractionalLastUpdate > .25f || CVAR_GET_FLOAT("hud_waypointblinking") <= 1.0f) || (this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER))
{
OrderListType theOrders = this->GetOrderList();

12
main/user.scr
View file

@ -236,6 +236,18 @@ DESCRIPTION INFO_OPTIONS
}
{ "2.000000" }
}
"hud_waypointblinking"
{
"Waypoint blinking"
{
LIST
"Never" "0"
"On map only" "1"
"On map and HUD" "2"
}
{ "1.000000" }
}
"hud_teamhealthalert"
{