Skip to content

Commit

Permalink
Revert "Hardpoint UI Fixes (#416)"
Browse files Browse the repository at this point in the history
This reverts commit 28d444c.

As it causes crash as explained in #416 (review)
  • Loading branch information
GeckoEidechse committed Apr 19, 2023
1 parent f7b0e6f commit a395e43
Showing 1 changed file with 3 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,8 @@ void function HardpointThink( HardpointStruct hardpoint )
}
else if(cappingTeam==TEAM_UNASSIGNED) // nobody on point
{
if((GetHardpointState(hardpoint)>=CAPTURE_POINT_STATE_AMPED) || (GetHardpointState(hardpoint)==CAPTURE_POINT_STATE_SELF_UNAMPING))
if((GetHardpointState(hardpoint)==CAPTURE_POINT_STATE_AMPED)||(GetHardpointState(hardpoint)==CAPTURE_POINT_STATE_AMPING))
{
if (GetHardpointState(hardpoint) == CAPTURE_POINT_STATE_AMPED)
SetHardpointState(hardpoint,CAPTURE_POINT_STATE_SELF_UNAMPING) // plays a pulsating effect on the UI only when the hardpoint is amped
SetHardpointCappingTeam(hardpoint,hardpointEnt.GetTeam())
SetHardpointCaptureProgress(hardpoint,max(1.0,GetHardpointCaptureProgress(hardpoint)-(deltaTime/HARDPOINT_AMPED_DELAY)))
if(GetHardpointCaptureProgress(hardpoint)<=1.001) // unamp
Expand Down Expand Up @@ -548,10 +546,8 @@ void function HardpointThink( HardpointStruct hardpoint )
}
else if(file.ampingEnabled)//amping or reamping
{
// i have no idea why but putting it CAPTURE_POINT_STATE_AMPING will say 'CONTESTED' on the UI
// since whether the point is contested is checked above, putting the hardpoint state to a value of 8 fixes it somehow
if(GetHardpointState(hardpoint)<=CAPTURE_POINT_STATE_AMPING)
SetHardpointState( hardpoint, 8 )
if(GetHardpointState(hardpoint)<CAPTURE_POINT_STATE_AMPING)
SetHardpointState(hardpoint,CAPTURE_POINT_STATE_AMPING)
SetHardpointCaptureProgress( hardpoint, min( 2.0, GetHardpointCaptureProgress( hardpoint ) + ( deltaTime / HARDPOINT_AMPED_DELAY * capperAmount ) ) )
if(GetHardpointCaptureProgress(hardpoint)==2.0&&!(GetHardpointState(hardpoint)==CAPTURE_POINT_STATE_AMPED))
{
Expand Down Expand Up @@ -650,8 +646,6 @@ void function OnHardpointEntered( entity trigger, entity player )
foreach(CP_PlayerStruct playerStruct in file.players)
if(playerStruct.player == player)
playerStruct.isOnHardpoint = true

player.SetPlayerNetInt( "playerHardpointID", hardpoint.hardpoint.GetHardpointID() )
}

void function OnHardpointLeft( entity trigger, entity player )
Expand All @@ -668,8 +662,6 @@ void function OnHardpointLeft( entity trigger, entity player )
foreach(CP_PlayerStruct playerStruct in file.players)
if(playerStruct.player == player)
playerStruct.isOnHardpoint = false

player.SetPlayerNetInt( "playerHardpointID", 69 ) // an arbitary number to remove the hud from the player
}

string function CaptureStateToString( int state )
Expand All @@ -683,7 +675,6 @@ string function CaptureStateToString( int state )
case CAPTURE_POINT_STATE_CAPTURED:
return "CAPTURED"
case CAPTURE_POINT_STATE_AMPING:
case 8:
return "AMPING"
case CAPTURE_POINT_STATE_AMPED:
return "AMPED"
Expand Down

0 comments on commit a395e43

Please sign in to comment.