X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fwaypoints%2Fwaypointsprites.qh;h=7fb578f82438477dd41d19c4aa1edebb4a0978d6;hb=3220cab5a7b69ced4a641504a6a5f4eccf2d3bfc;hp=4e3ceb0e5749d3e14e74d0e99b852a8dbb198e29;hpb=880ec900682c7c466960b24bdeed3a68a9646213;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh index 4e3ceb0e5..7fb578f82 100644 --- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh +++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qh @@ -97,18 +97,18 @@ vector drawspritearrow(vector o, float ang, vector rgb, float a, float t); // returns location of sprite healthbar vector drawspritetext(vector o, float ang, float minwidth, vector rgb, float a, vector fontsize, string s); -float spritelookupblinkvalue(string s); +float spritelookupblinkvalue(entity this, string s); vector spritelookupcolor(entity this, string s, vector def); -string spritelookuptext(string s); +string spritelookuptext(entity this, string s); vector fixrgbexcess_move(vector rgb, vector src, vector dst); vector fixrgbexcess(vector rgb); // they are drawn using a .draw function -void Ent_RemoveWaypointSprite(); +void Ent_RemoveWaypointSprite(entity this); -void Ent_WaypointSprite(); +void Ent_WaypointSprite(entity this); void WaypointSprite_Load_Frames(string ext); @@ -128,7 +128,7 @@ float autocvar_sv_waypointsprite_limitedrange; .string model2; .string model3; -.float(entity) waypointsprite_visible_for_player; +.bool(entity, entity, entity) waypointsprite_visible_for_player; void WaypointSprite_UpdateSprites(entity e, entity m1, entity m2, entity m3); @@ -160,19 +160,19 @@ void WaypointSprite_Kill(entity wp); void WaypointSprite_Disown(entity wp, float fadetime); -void WaypointSprite_Think(); +void WaypointSprite_Think(entity this); -float WaypointSprite_visible_for_player(entity e); +bool WaypointSprite_visible_for_player(entity this, entity player, entity view); entity WaypointSprite_getviewentity(entity e); float WaypointSprite_isteammate(entity e, entity e2); -float WaypointSprite_Customize(); +float WaypointSprite_Customize(entity this); bool WaypointSprite_SendEntity(entity this, entity to, float sendflags); -void WaypointSprite_Reset(); +void WaypointSprite_Reset(entity this); entity WaypointSprite_Spawn( entity spr, // sprite @@ -196,6 +196,7 @@ entity WaypointSprite_SpawnFixed( entity WaypointSprite_DeployFixed( entity spr, float limited_range, + entity player, vector ofs, entity icon // initial icon ); @@ -203,6 +204,7 @@ entity WaypointSprite_DeployFixed( .entity waypointsprite_deployed_personal; entity WaypointSprite_DeployPersonal( entity spr, + entity player, vector ofs, entity icon // initial icon ); @@ -211,6 +213,7 @@ entity WaypointSprite_DeployPersonal( .entity waypointsprite_attachedforcarrier; entity WaypointSprite_Attach( entity spr, + entity player, float limited_range, entity icon // initial icon ); @@ -223,13 +226,13 @@ entity WaypointSprite_AttachCarrier( void WaypointSprite_DetachCarrier(entity carrier); -void WaypointSprite_ClearPersonal(); +void WaypointSprite_ClearPersonal(entity this); -void WaypointSprite_ClearOwned(); +void WaypointSprite_ClearOwned(entity this); -void WaypointSprite_PlayerDead(); +void WaypointSprite_PlayerDead(entity this); -void WaypointSprite_PlayerGone(); +void WaypointSprite_PlayerGone(entity this); #endif #endif