Merge.
Merge.
2.1 --- a/core/smn_halflife.cpp Wed May 30 23:00:16 2012 -0400
2.2 +++ b/core/smn_halflife.cpp Wed May 30 23:01:08 2012 -0400
2.3 @@ -87,6 +87,11 @@
2.4 return sp_ftoc(gpGlobals->curtime);
2.5 }
2.6
2.7 +static cell_t GetGameTickCount(IPluginContext *pContext, const cell_t *params)
2.8 +{
2.9 + return gpGlobals->tickcount;
2.10 +}
2.11 +
2.12 static cell_t CreateFakeClient(IPluginContext *pContext, const cell_t *params)
2.13 {
2.14 if (!g_SourceMod.IsMapRunning())
2.15 @@ -524,6 +529,7 @@
2.16 {"GetGameDescription", GetGameDescription},
2.17 {"GetGameFolderName", GetGameFolderName},
2.18 {"GetGameTime", GetGameTime},
2.19 + {"GetGameTickCount", GetGameTickCount},
2.20 {"GetRandomFloat", GetRandomFloat},
2.21 {"GetRandomInt", GetRandomInt},
2.22 {"IsDedicatedServer", IsDedicatedServer},
3.1 --- a/plugins/include/halflife.inc Wed May 30 23:00:16 2012 -0400
3.2 +++ b/plugins/include/halflife.inc Wed May 30 23:01:08 2012 -0400
3.3 @@ -128,6 +128,13 @@
3.4 */
3.5 native Float:GetGameTime();
3.6
3.7 +/**
3.8 + * Returns the game's internal tick count.
3.9 + *
3.10 + * @return Game tick count.
3.11 + */
3.12 +native GetGameTickCount();
3.13 +
3.14 /**
3.15 * Returns the game description from the mod.
3.16 *