Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add crosshair target changed callback #893

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Add crosshair target changed callback #893

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9a73ace
Add files via upload
NachosChipeados Oct 13, 2024
bdf8ff3
Add MP callback
NachosChipeados Oct 13, 2024
8f820a8
Add SP callback
NachosChipeados Oct 13, 2024
eaf586c
Update cl_player.gnut
NachosChipeados Oct 13, 2024
8980e94
Merge branch 'R2Northstar:main' into crosshairtarget_callback
NachosChipeados Oct 14, 2024
ce3a1ee
Merge branch 'R2Northstar:main' into crosshairtarget_callback
NachosChipeados Nov 13, 2024
0b9c4e3
Merge branch 'main' into crosshairtarget_callback
NachosChipeados Nov 15, 2024
1409dc4
Merge branch 'main' into crosshairtarget_callback
GeckoEidechse Nov 16, 2024
aec153d
Renormalize line endings
GeckoEidechse Nov 16, 2024
52a6ffd
Remove unnecesary IsLobby check
NachosChipeados Nov 17, 2024
256f2b6
Merge branch 'main' into crosshairtarget_callback
NachosChipeados Nov 18, 2024
3a3ba91
Merge branch 'main' into crosshairtarget_callback
Zanieon Nov 18, 2024
2ad8fea
Merge branch 'R2Northstar:main' into crosshairtarget_callback
NachosChipeados Nov 30, 2024
74ba32d
Merge branch 'R2Northstar:main' into crosshairtarget_callback
NachosChipeados Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Northstar.Client/mod/scripts/vscripts/client/cl_player.gnut
View file
Open in desktop
NachosChipeados marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ global function GetWaveSpawnTime
global function ServerCallback_HideNextSpawnMessage

global function ClientCodeCallback_OnHealthChanged

// Northstar
global function AddCallback_OnCrosshairCurrentTargetChanged
global function ClientCodeCallback_OnCrosshairCurrentTargetChanged
global function Pressed_TitanNextMode
global function ClientCodeCallback_OnGib
Expand Down Expand Up @@ -70,6 +73,9 @@ struct {
var law_missile_tracer = null
float nextSpawnTime = 0.0
entity lastEarnedReward // primarily used to check if we should still show the reward message after a delay

// Northstar
array< void functionref( entity, entity ) > OnCrosshairCurrentTargetChangedCallbacks
} file

struct BloodDecalParams
Expand Down Expand Up @@ -1515,6 +1521,14 @@ void function ClientCodeCallback_OnHealthChanged( entity ent, int oldHealth, int
ent.Signal( "HealthChanged", { oldHealth = oldHealth, newHealth = newHealth } )
}

// Northstar
void function AddCallback_OnCrosshairCurrentTargetChanged( void functionref( entity, entity ) callbackFunc )
{
Assert( !file.OnCrosshairCurrentTargetChangedCallbacks.contains( callbackFunc ), "Already added " + string( callbackFunc ) + " with AddCallback_OnCrosshairCurrentTargetChanged" )

file.OnCrosshairCurrentTargetChangedCallbacks.append( callbackFunc )
}

void function ClientCodeCallback_OnCrosshairCurrentTargetChanged( entity player, entity newTarget )
{
if ( IsLobby() )
Expand All @@ -1524,6 +1538,12 @@ void function ClientCodeCallback_OnCrosshairCurrentTargetChanged( entity player,

if ( IsValid( newTarget ) )
TryOfferRodeoBatteryHint( newTarget )

// Northstar
foreach ( callback in file.OnCrosshairCurrentTargetChangedCallbacks )
{
callback( player, newTarget )
}
}

void function SetupPlayerAnimEvents( entity player )
Expand Down
28 changes: 28 additions & 0 deletions Northstar.Client/mod/scripts/vscripts/client/cl_sp_player.gnut
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From which VPK is that vanilla file from?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its in all sp vpks

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, so ig it's the same in all of them? I'll check ig and then add it from one of them ^^

Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ global function GetWaveSpawnTime
global function ServerCallback_HideNextSpawnMessage

global function ClientCodeCallback_OnHealthChanged

// Northstar
global function AddCallback_OnCrosshairCurrentTargetChanged
global function ClientCodeCallback_OnCrosshairCurrentTargetChanged

global function Pressed_TitanNextMode
global function ClientCodeCallback_OnGib
global function ClientPilotSpawned
Expand Down Expand Up @@ -59,6 +64,9 @@ struct {
var law_missile_tracer = null
float nextSpawnTime = 0.0
var UI_friendlyText

// Northstar
array< void functionref( entity, entity ) > OnCrosshairCurrentTargetChangedCallbacks
} file

struct BloodDecalParams
Expand Down Expand Up @@ -1261,6 +1269,26 @@ void function ClientCodeCallback_OnHealthChanged( entity ent, int oldHealth, int
ent.Signal( "HealthChanged", { oldHealth = oldHealth, newHealth = newHealth } )
}

// Northstar
void function AddCallback_OnCrosshairCurrentTargetChanged( void functionref( entity, entity ) callbackFunc )
{
Assert( !file.OnCrosshairCurrentTargetChangedCallbacks.contains( callbackFunc ), "Already added " + string( callbackFunc ) + " with AddCallback_OnCrosshairCurrentTargetChanged" )

file.OnCrosshairCurrentTargetChangedCallbacks.append( callbackFunc )
}

void function ClientCodeCallback_OnCrosshairCurrentTargetChanged( entity player, entity newTarget )
{
if ( IsLobby() )
return;
if ( !IsValid( player ) )
return

foreach ( callback in file.OnCrosshairCurrentTargetChangedCallbacks )
{
callback( player, newTarget )
}
}

void function SetupPlayerAnimEvents( entity player )
{
Expand Down
Loading