From 4a6a728c9b45f59bc84f52109b34d97519b1dd96 Mon Sep 17 00:00:00 2001
From: shavitush <djshavit@gmail.com>
Date: Tue, 26 Jul 2016 05:52:49 +0300
Subject: [PATCH] fix optional natives aaa i hate sourcepawn

---
 scripting/include/shavit.inc  | 2 ++
 scripting/shavit-chat.sp      | 3 +--
 scripting/shavit-core.sp      | 3 +--
 scripting/shavit-hud.sp       | 3 ++-
 scripting/shavit-misc.sp      | 1 +
 scripting/shavit-rankings.sp  | 1 +
 scripting/shavit-replay.sp    | 1 +
 scripting/shavit-sounds.sp    | 2 ++
 scripting/shavit-stats.sp     | 1 +
 scripting/shavit-timelimit.sp | 2 ++
 scripting/shavit-wr.sp        | 3 +--
 scripting/shavit-zones.sp     | 2 +-
 12 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/scripting/include/shavit.inc b/scripting/include/shavit.inc
index 2c304d96..aae0dfb9 100644
--- a/scripting/include/shavit.inc
+++ b/scripting/include/shavit.inc
@@ -740,6 +740,7 @@ public SharedPlugin __pl_shavit =
 #endif
 };
 
+#if !defined REQUIRE_PLUGIN
 public void __pl_shavit_SetNTVOptional()
 {
 	MarkNativeAsOptional("Shavit_StartTimer");
@@ -772,3 +773,4 @@ public void __pl_shavit_SetNTVOptional()
 	MarkNativeAsOptional("Shavit_IsReplayDataLoaded");
 	MarkNativeAsOptional("Shavit_FormatChat");
 }
+#endif
diff --git a/scripting/shavit-chat.sp b/scripting/shavit-chat.sp
index 68b2ea55..2013ac5f 100644
--- a/scripting/shavit-chat.sp
+++ b/scripting/shavit-chat.sp
@@ -22,10 +22,9 @@
 #include <cstrike>
 #include <dynamic>
 
+#undef REQUIRE_PLUGIN
 #define USES_CHAT_COLORS
 #include <shavit>
-
-#undef REQUIRE_PLUGIN
 #include <basecomm>
 #include <rtler>
 #include <scp>
diff --git a/scripting/shavit-core.sp b/scripting/shavit-core.sp
index f25aeb3c..c6832e74 100644
--- a/scripting/shavit-core.sp
+++ b/scripting/shavit-core.sp
@@ -22,12 +22,11 @@
 #include <sdktools>
 #include <geoip>
 
+#undef REQUIRE_PLUGIN
 #define USES_STYLE_PROPERTIES
 #define USES_STYLE_NAMES
 #define USES_STYLE_VELOCITY_LIMITS
 #include <shavit>
-
-#undef REQUIRE_PLUGIN
 #include <adminmenu>
 
 #pragma newdecls required
diff --git a/scripting/shavit-hud.sp b/scripting/shavit-hud.sp
index a4b56677..9a88e2ca 100644
--- a/scripting/shavit-hud.sp
+++ b/scripting/shavit-hud.sp
@@ -19,12 +19,13 @@
 */
 
 #include <sourcemod>
+#include <clientprefs>
 
+#undef REQUIRE_PLUGIN
 #define USES_STYLE_NAMES
 #define USES_STYLE_HTML_COLORS
 #define USES_STYLE_PROPERTIES
 #include <shavit>
-#include <clientprefs>
 
 #pragma newdecls required
 #pragma semicolon 1
diff --git a/scripting/shavit-misc.sp b/scripting/shavit-misc.sp
index 9505b7c0..d2fd1bb9 100644
--- a/scripting/shavit-misc.sp
+++ b/scripting/shavit-misc.sp
@@ -23,6 +23,7 @@
 #include <sdktools>
 #include <sdkhooks>
 
+#undef REQUIRE_PLUGIN
 #define USES_STYLE_NAMES
 #define USES_STYLE_PROPERTIES
 #include <shavit>
diff --git a/scripting/shavit-rankings.sp b/scripting/shavit-rankings.sp
index fd082406..8277581c 100644
--- a/scripting/shavit-rankings.sp
+++ b/scripting/shavit-rankings.sp
@@ -20,6 +20,7 @@
 
 #include <sourcemod>
 
+#undef REQUIRE_PLUGIN
 #define USES_STYLE_MULTIPLIERS
 #include <shavit>
 
diff --git a/scripting/shavit-replay.sp b/scripting/shavit-replay.sp
index 2a06582c..484c8fd5 100644
--- a/scripting/shavit-replay.sp
+++ b/scripting/shavit-replay.sp
@@ -23,6 +23,7 @@
 #include <sdktools>
 #include <sdkhooks>
 
+#undef REQUIRE_PLUGIN
 #define USES_STYLE_NAMES
 #define USES_SHORT_STYLE_NAMES
 #define USES_STYLE_PROPERTIES
diff --git a/scripting/shavit-sounds.sp b/scripting/shavit-sounds.sp
index d4d83045..a56b3a59 100644
--- a/scripting/shavit-sounds.sp
+++ b/scripting/shavit-sounds.sp
@@ -20,6 +20,8 @@
 
 #include <sourcemod>
 #include <sdktools>
+
+#undef REQUIRE_PLUGIN
 #include <shavit>
 
 #pragma semicolon 1
diff --git a/scripting/shavit-stats.sp b/scripting/shavit-stats.sp
index 49003e52..2e6b39e5 100644
--- a/scripting/shavit-stats.sp
+++ b/scripting/shavit-stats.sp
@@ -21,6 +21,7 @@
 #include <sourcemod>
 #include <cstrike>
 
+#undef REQUIRE_PLUGIN
 #define USES_STYLE_NAMES
 #define USES_SHORT_STYLE_NAMES
 #define USES_STYLE_PROPERTIES
diff --git a/scripting/shavit-timelimit.sp b/scripting/shavit-timelimit.sp
index b8ec5fe7..a8220196 100644
--- a/scripting/shavit-timelimit.sp
+++ b/scripting/shavit-timelimit.sp
@@ -21,6 +21,8 @@
 // original idea from ckSurf.
 
 #include <sourcemod>
+
+#undef REQUIRE_PLUGIN
 #include <shavit>
 
 #pragma semicolon 1
diff --git a/scripting/shavit-wr.sp b/scripting/shavit-wr.sp
index 1590876b..fa3cc5b9 100644
--- a/scripting/shavit-wr.sp
+++ b/scripting/shavit-wr.sp
@@ -20,11 +20,10 @@
 
 #include <sourcemod>
 
+#undef REQUIRE_PLUGIN
 #define USES_STYLE_NAMES
 #define USES_STYLE_PROPERTIES
 #include <shavit>
-
-#undef REQUIRE_PLUGIN
 #include <adminmenu>
 
 #pragma semicolon 1
diff --git a/scripting/shavit-zones.sp b/scripting/shavit-zones.sp
index 036328ca..39afce4b 100644
--- a/scripting/shavit-zones.sp
+++ b/scripting/shavit-zones.sp
@@ -21,9 +21,9 @@
 #include <sourcemod>
 #include <sdktools>
 #include <cstrike>
-#include <shavit>
 
 #undef REQUIRE_PLUGIN
+#include <shavit>
 #include <adminmenu>
 
 #pragma semicolon 1