diff --git a/_entWatch4/scripting/entWatch-core.sp b/_entWatch4/scripting/entWatch-core.sp index db846ed4..b339feb9 100644 --- a/_entWatch4/scripting/entWatch-core.sp +++ b/_entWatch4/scripting/entWatch-core.sp @@ -12,7 +12,7 @@ #include #include #include -#include +#include /* BOOLS */ bool g_bLate; diff --git a/_entWatch4/scripting/entWatch-interface.sp b/_entWatch4/scripting/entWatch-interface.sp index e80fe95e..c532a049 100644 --- a/_entWatch4/scripting/entWatch-interface.sp +++ b/_entWatch4/scripting/entWatch-interface.sp @@ -10,7 +10,6 @@ #pragma newdecls required #include -#include #include //---------------------------------------------------------------------------------------------------- diff --git a/_entWatch4/scripting/entWatch-messages.sp b/_entWatch4/scripting/entWatch-messages.sp index 721633e2..81f9cf95 100644 --- a/_entWatch4/scripting/entWatch-messages.sp +++ b/_entWatch4/scripting/entWatch-messages.sp @@ -11,7 +11,6 @@ #pragma newdecls required #include -#include #include #define MESSAGEFORMAT "\x07%s[entWatch] \x07%s%s \x07%s(\x07%s%s\x07%s) %t \x07%s%s" diff --git a/_entWatch4/scripting/entWatch-restrictions.sp b/_entWatch4/scripting/entWatch-restrictions.sp index ad776f6b..1c2e5d8d 100644 --- a/_entWatch4/scripting/entWatch-restrictions.sp +++ b/_entWatch4/scripting/entWatch-restrictions.sp @@ -12,7 +12,6 @@ #include #include -#include #include /* FORWARDS */ diff --git a/_entWatch4/scripting/include/entWatch4.inc b/_entWatch4/scripting/include/entWatch4.inc deleted file mode 100644 index de02b382..00000000 --- a/_entWatch4/scripting/include/entWatch4.inc +++ /dev/null @@ -1,31 +0,0 @@ -#if defined entWatch_included - #endinput -#endif - -#define entWatch_included - -#define DISPLAY_CHAT (1 << 0) -#define DISPLAY_HUD (1 << 1) -#define DISPLAY_USE (1 << 2) - -enum items -{ - String:item_name[32], - String:item_short[32], - String:item_color[32], - String:item_filter[32], - bool:item_owned, - item_buttonid, - item_weaponid, - item_triggerid, - item_owner, - item_button, - item_weapon, - item_trigger, - item_display, - item_mode, - item_uses, - item_maxuses, - item_nextuse, - item_cooldown, -}; \ No newline at end of file diff --git a/_entWatch4/scripting/include/entWatch_core.inc b/_entWatch4/scripting/include/entWatch_core.inc index 70296a55..aad9150b 100644 --- a/_entWatch4/scripting/include/entWatch_core.inc +++ b/_entWatch4/scripting/include/entWatch_core.inc @@ -4,11 +4,51 @@ #define entWatch_core_included +#define DISPLAY_CHAT (1 << 0) +#define DISPLAY_HUD (1 << 1) +#define DISPLAY_USE (1 << 2) + +enum items +{ + String:item_name[32], + String:item_short[32], + String:item_color[32], + String:item_filter[32], + bool:item_owned, + item_buttonid, + item_weaponid, + item_triggerid, + item_owner, + item_button, + item_weapon, + item_trigger, + item_display, + item_mode, + item_uses, + item_maxuses, + item_nextuse, + item_cooldown, +}; + +native int EW_GetItemCount(); + +native void EW_GetItemArray(int index, any[] itemArray, int size); +native void EW_SetItemArray(int index, any[] itemArray, int size); + +forward void EW_OnClientItemDrop(any[] itemArray, int client, int index); +forward void EW_OnClientItemDeath(any[] itemArray, int client, int index); +forward void EW_OnClientItemPickup(any[] itemArray, int client, int index); +forward void EW_OnClientItemActivate(any[] itemArray, int client, int index); +forward void EW_OnClientItemDisconnect(any[] itemArray, int client, int index); + +forward Action EW_OnClientItemCanPickup(any[] itemArray, int client, int index); +forward Action EW_OnClientItemCanActivate(any[] itemArray, int client, int index); + public SharedPlugin __pl_entWatch_core = { name = "entWatch-core", file = "entWatch-core.smx", - + #if defined REQUIRE_PLUGIN required = 1 #else @@ -23,18 +63,4 @@ public SharedPlugin __pl_entWatch_core = MarkNativeAsOptional("EW_GetItemArray"); MarkNativeAsOptional("EW_SetItemArray"); } -#endif - -native int EW_GetItemCount(); - -native void EW_GetItemArray(int index, any[] itemArray, int size); -native void EW_SetItemArray(int index, any[] itemArray, int size); - -forward void EW_OnClientItemDrop(any[] itemArray, int client, int index); -forward void EW_OnClientItemDeath(any[] itemArray, int client, int index); -forward void EW_OnClientItemPickup(any[] itemArray, int client, int index); -forward void EW_OnClientItemActivate(any[] itemArray, int client, int index); -forward void EW_OnClientItemDisconnect(any[] itemArray, int client, int index); - -forward Action EW_OnClientItemCanPickup(any[] itemArray, int client, int index); -forward Action EW_OnClientItemCanActivate(any[] itemArray, int client, int index); \ No newline at end of file +#endif \ No newline at end of file