Skip to content
Permalink
Browse files

Update TF2_IgnitePlayer to support setting duration of fire (#1038)

Related to #713
  • Loading branch information...
FortyTwoFortyTwo authored and asherkin committed Jul 5, 2019
1 parent e47c1a8 commit 199802150bd6ae7cc3d3394fdc2b3583baeff6c1
Showing with 14 additions and 4 deletions.
  1. +9 −2 extensions/tf2/natives.cpp
  2. +5 −2 plugins/include/tf2.inc
@@ -92,7 +92,7 @@ cell_t TF2_MakeBleed(IPluginContext *pContext, const cell_t *params)
return 1;
}

// native TF2_Burn(client, target)
// native TF2_Burn(client, target, duration)
cell_t TF2_Burn(IPluginContext *pContext, const cell_t *params)
{
static ICallWrapper *pWrapper = NULL;
@@ -126,10 +126,17 @@ cell_t TF2_Burn(IPluginContext *pContext, const cell_t *params)
return pContext->ThrowNativeError("Client index %d is not valid", params[2]);
}

float fDuration = 10.0;
// Compatibility fix for the newly-added duration
if (params[0] >= 3)
{
fDuration = sp_ctof(params[3]);
}

void *obj = (void *)((uint8_t *)pEntity + playerSharedOffset->actual_offset);
ArgBuffer<void*, CBaseEntity*, CBaseEntity*,
float> //duration
vstk(obj, pTarget, nullptr, 10.0f);
vstk(obj, pTarget, nullptr, fDuration);

pWrapper->Execute(vstk, nullptr);
return 1;
@@ -245,13 +245,16 @@ enum TFObjectMode
};

/**
* Sets a client on fire for 10 seconds.
* Sets a client on fire.
*
* @note Fire duration is capped to 10 seconds.
*
* @param client Player's index.
* @param attacker Attacker's index.
* @param duration Duration of fire (in seconds).
* @error Invalid client index, client not in game, or no mod support.
*/
native void TF2_IgnitePlayer(int client, int attacker);
native void TF2_IgnitePlayer(int client, int attacker, float duration=10.0);

/**
* Respawns a client

0 comments on commit 1998021

Please sign in to comment.
You can’t perform that action at this time.