SourceMod 1.10 and new OnEntitySpawned forward

This commit is contained in:
BotoX
2019-09-10 16:34:12 +02:00
parent 4bb399c18d
commit ad2f7cd71a
26 changed files with 802 additions and 975 deletions
+4 -14
View File
@@ -1,10 +1,6 @@
#pragma semicolon 1
#pragma newdecls required
#include <basic>
#include "CConfig.inc"
#include "CBoss.inc"
#include <sourcemod>
#include <sdkhooks>
#include <sdktools>
@@ -359,7 +355,9 @@ public void OnMapStart()
int entity = INVALID_ENT_REFERENCE;
while((entity = FindEntityByClassname(entity, "*")) != INVALID_ENT_REFERENCE)
{
OnEntitySpawned(entity);
char sClassname[64];
if(GetEntityClassname(entity, sClassname, sizeof(sClassname)))
OnEntitySpawned(entity, sClassname);
}
}
}
@@ -387,15 +385,7 @@ public void Event_RoundEnd(Event event, const char[] name, bool dontBroadcast)
g_aHadOnce = new StringMap();
}
public void OnEntityCreated(int entity, const char[] classname)
{
if(!g_aConfig)
return;
SDKHook(entity, SDKHook_SpawnPost, OnEntitySpawned);
}
public void OnEntitySpawned(int entity)
public void OnEntitySpawned(int entity, const char[] classname)
{
if(!g_aConfig)
return;
+10 -15
View File
@@ -1,8 +1,3 @@
#include <basic>
#include "CConfig.inc"
#include "CDamage.inc"
#include "CBoss.inc"
#include <sourcemod>
#include <BossHP>
#include <zombiereloaded>
@@ -84,7 +79,7 @@ public void OnClientDisconnect(int client)
//----------------------------------------------------------------------------------------------------
// Purpose:
//----------------------------------------------------------------------------------------------------
public void OnBossDamaged(any Boss, any Config, int client, float damage)
public void OnBossDamaged(CBoss Boss, CConfig Config, int client, float damage)
{
if (!IsValidClient(client))
return;
@@ -103,10 +98,10 @@ public void OnBossDamaged(any Boss, any Config, int client, float damage)
for (int index = 0; index < g_hStats[client].Length; index++)
{
any BossDamage[2];
int BossDamage[2];
g_hStats[client].GetArray(index, BossDamage, sizeof(BossDamage));
if (BossDamage[0] == Boss)
if (BossDamage[0] == view_as<int>(Boss))
{
if (bBreakable)
BossDamage[1] += RoundToNearest(damage);
@@ -118,8 +113,8 @@ public void OnBossDamaged(any Boss, any Config, int client, float damage)
}
}
any BossDamage[2];
BossDamage[0] = Boss;
int BossDamage[2];
BossDamage[0] = view_as<int>(Boss);
if (bBreakable)
BossDamage[1] = RoundToNearest(damage);
@@ -132,7 +127,7 @@ public void OnBossDamaged(any Boss, any Config, int client, float damage)
//----------------------------------------------------------------------------------------------------
// Purpose:
//----------------------------------------------------------------------------------------------------
public void OnBossKilled(any Boss, any Config, int reason)
public void OnBossKilled(CBoss Boss, CConfig Config, int reason)
{
if (reason == 0)
{
@@ -143,10 +138,10 @@ public void OnBossKilled(any Boss, any Config, int reason)
for (int index = 0; index < g_hStats[client].Length; index++)
{
any BossDamage[2];
int BossDamage[2];
g_hStats[client].GetArray(index, BossDamage, sizeof(BossDamage));
if (BossDamage[0] == Boss)
if (BossDamage[0] == view_as<int>(Boss))
{
g_hStats[client].Erase(index);
break;
@@ -166,10 +161,10 @@ public void OnBossKilled(any Boss, any Config, int reason)
for (int index = 0; index < g_hStats[client].Length; index++)
{
any BossDamage[2];
int BossDamage[2];
g_hStats[client].GetArray(index, BossDamage, sizeof(BossDamage));
if (BossDamage[0] == Boss)
if (BossDamage[0] == view_as<int>(Boss))
{
iSortedList[iSortedCount][0] = client;
iSortedList[iSortedCount][1] = BossDamage[1];
+4
View File
@@ -4,6 +4,10 @@
#define BossHP_included
#include <basic>
#include "BossHP/CConfig.inc"
#include "BossHP/CBoss.inc"
forward void OnBossIntialized(CBoss Boss, CConfig Config);
forward void OnBossDamaged(CBoss Boss, CConfig Config, int activator, float damage);