Merge pull request #215 from xPaw/no-version-check

Remove version checks from all include files

plugins/include/cstrike.inc

@@ -16,13 +16,9 @@
 #endif
 #define _cstrike_included
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqlib cstrike
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma loadlib cstrike
- #endif
-#else
- #pragma library cstrike
+#pragma reqlib cstrike
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib cstrike
 #endif
 
 /**

plugins/include/csx.inc

@@ -18,13 +18,9 @@
 
 #include <csstats>
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqclass xstats
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma defclasslib xstats csx
- #endif
-#else
- #pragma library csx
+#pragma reqclass xstats
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma defclasslib xstats csx
 #endif
 
 /**

plugins/include/dbi.inc

@@ -26,7 +26,7 @@
 //
 
 #if defined _dbi_included
-  #endinput
+	#endinput
 #endif
 #define _dbi_included
 
@@ -34,11 +34,7 @@
 // there's really no reason to anyway.
 #assert !defined _sqlx_included
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqclass dbi
-#else
- #pragma library dbi
-#endif
+#pragma reqclass dbi
 
 enum Sql
 {

plugins/include/dodfun.inc

@@ -12,19 +12,15 @@
 //
 
 #if defined _dodfun_included
-  #endinput
+	#endinput
 #endif
 #define _dodfun_included
 
 #include <dodconst>
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqlib dodfun
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma loadlib dodfun
- #endif
-#else
- #pragma library dodfun
+#pragma reqlib dodfun
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib dodfun
 #endif
 
 /* Function is called after grenade throw */

plugins/include/dodx.inc

@@ -12,20 +12,16 @@
 //
 
 #if defined _dodx_included
-  #endinput
+	#endinput
 #endif
 #define _dodx_included
 
 #include <dodconst>
 #include <dodstats>
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqclass xstats
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma defclasslib xstats dodx
- #endif
-#else
- #pragma library dodx
+#pragma reqclass xstats
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma defclasslib xstats dodx
 #endif
 
 /************* Shared Natives Start ********************************/

plugins/include/engine.inc

@@ -13,19 +13,15 @@
 //
 
 #if defined _engine_included
-  #endinput
+	#endinput
 #endif
 #define _engine_included
 
 #include <engine_const>
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqlib engine
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma loadlib engine
- #endif
-#else
- #pragma library engine
+#pragma reqlib engine
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib engine
 #endif
 
 native traceresult(type,any:...);

plugins/include/fakemeta.inc

@@ -18,13 +18,9 @@
 
 #include <fakemeta_const> 
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqlib fakemeta
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma loadlib fakemeta
- #endif
-#else
- #pragma library fakemeta
+#pragma reqlib fakemeta
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib fakemeta
 #endif
 
 /**

plugins/include/fun.inc

@@ -12,17 +12,13 @@
 //
 
 #if defined _fun_included
-  #endinput
+	#endinput
 #endif
 #define _fun_included
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqlib fun
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma loadlib fun
- #endif
-#else
- #pragma library fun
+#pragma reqlib fun
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib fun
 #endif
 
 /* Returns 1 if receiver hears sender via voice communication. */

plugins/include/geoip.inc

@@ -16,13 +16,9 @@
 #endif
 #define _geoip_included
 
-#if AMXX_VERSION_NUM >= 175
-	#pragma reqlib geoip
-	#if !defined AMXMODX_NOAUTOLOAD
-		#pragma loadlib geoip
-	#endif
-#else
-	#pragma library geoip
+#pragma reqlib geoip
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib geoip
 #endif
 
 /**

plugins/include/hamsandwich.inc

@@ -27,13 +27,9 @@
 
 #include <ham_const>
 
-#if AMXX_VERSION_NUM >= 175
-	#pragma reqlib hamsandwich
-	#if !defined AMXMODX_NOAUTOLOAD
-		#pragma loadlib hamsandwich
-	#endif
-#else
-	#pragma library hamsandwich
+#pragma reqlib hamsandwich
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib hamsandwich
 #endif
 
 /**
@@ -320,24 +316,24 @@ native GetHamItemInfo(iteminfo_handle, HamItemInfo:type, any:...);
  */
 native SetHamItemInfo(iteminfo_handle, HamItemInfo:type, any:...);
 
-/**
- * Creates an ItemInfo handle.  This value should never be altered.
- * The handle can be used in Get/SetHamItemInfo.
- *
- * NOTE: You must call FreeHamItemInfo() on every handle made with CreateHamItemInfo().
- *
- * @return			A new ItemInfo handle.
- */
-native CreateHamItemInfo();
-
-/** 
- * Frees an ItemIndo handle created with CreateHamItemInfo().  Do not call
- * this more than once per handle, or on handles not created through
- * CreateHamItemInfo().
- *
- * @param itemInfo_handle	ItemInfo handle created via CreateHamItemInfo().
- * @noreturn
- */
+/**
+ * Creates an ItemInfo handle.  This value should never be altered.
+ * The handle can be used in Get/SetHamItemInfo.
+ *
+ * NOTE: You must call FreeHamItemInfo() on every handle made with CreateHamItemInfo().
+ *
+ * @return			A new ItemInfo handle.
+ */
+native CreateHamItemInfo();
+
+/** 
+ * Frees an ItemIndo handle created with CreateHamItemInfo().  Do not call
+ * this more than once per handle, or on handles not created through
+ * CreateHamItemInfo().
+ *
+ * @param itemInfo_handle	ItemInfo handle created via CreateHamItemInfo().
+ * @noreturn
+ */
 native FreeHamItemInfo(itemInfo_handle);
 
 

plugins/include/ns.inc

@@ -14,19 +14,13 @@
 #if defined NS_INC
 	#endinput
 #endif
-#define NS_INC	
+#define NS_INC
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqlib ns
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma loadlib ns
- #endif
-#else
- #pragma library ns
+#pragma reqlib ns
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib ns
 #endif
 
-
-
 #include <ns_const>
 
 

plugins/include/nvault.inc

@@ -12,17 +12,13 @@
 //
 
 #if defined _nvault_included
-  #endinput
+	#endinput
 #endif
 #define _nvault_included
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqlib nvault
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma loadlib nvault
- #endif
-#else
- #pragma library nvault
+#pragma reqlib nvault
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib nvault
 #endif
 
 /* All timestamps are in UNIX epoch form. */

plugins/include/regex.inc

@@ -16,13 +16,9 @@
 #endif
 #define _regex_included
 
-#if AMXX_VERSION_NUM >= 175
-	#pragma reqlib regex
-	#if !defined AMXMODX_NOAUTOLOAD
-		#pragma loadlib regex
-	#endif
-#else
-	#pragma library regex
+#pragma reqlib regex
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib regex
 #endif
 
 

plugins/include/sockets.inc

@@ -19,13 +19,9 @@
 #endif
 #define _socket_included
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqlib sockets
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma loadlib sockets
- #endif
-#else
- #pragma library socket
+#pragma reqlib sockets
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib sockets
 #endif
 
 // Use SOCKET_TCP for TCP Socket connections

plugins/include/sqlx.inc

@@ -12,19 +12,17 @@
 //
 
 #if defined _sqlx_included
-  #endinput
+	#endinput
 #endif
 #define _sqlx_included
 
 //eh..
 #define SQL_NumRows SQL_NumResults
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqclass sqlx
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma defclasslib sqlx mysql
- #endif //!defined AMXMODX_NOAUTOLOAD
-#endif //AMXX_VERSION_NUM
+#pragma reqclass sqlx
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma defclasslib sqlx mysql
+#endif
 
 enum Handle
 {

plugins/include/tfcx.inc

@@ -12,20 +12,16 @@
 //
 
 #if defined _tfcx_included
-  #endinput
+	#endinput
 #endif
 #define _tfcx_included
 
 #include <tfcconst>
 #include <tfcstats>
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqclass xstats
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma defclasslib xstats tfcx
- #endif
-#else
- #pragma library tfcx
+#pragma reqclass xstats
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma defclasslib xstats tfcx
 #endif
 
 /************* Shared Natives Start ********************************/

plugins/include/tsfun.inc

@@ -12,7 +12,7 @@
 //
 
 #if defined _tsxfun_included
-  #endinput
+	#endinput
 #endif
 #define _tsxfun_included
 
@@ -27,13 +27,9 @@ enum {
   XMF_DEATH,
 };
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqlib tsfun
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma loadlib tsfun
- #endif
-#else
- #pragma library tsfun
+#pragma reqlib tsfun
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma loadlib tsfun
 #endif
 
 /************* Shared Natives End ********************************/

plugins/include/tsx.inc

@@ -12,19 +12,15 @@
 //
 
 #if defined _tsx_included
-  #endinput
+	#endinput
 #endif
 #define _tsx_included
 
 #include <tsstats>
 
-#if AMXX_VERSION_NUM >= 175
- #pragma reqclass xstats
- #if !defined AMXMODX_NOAUTOLOAD
-  #pragma defclasslib xstats tsx
- #endif
-#else
- #pragma library tsx
+#pragma reqclass xstats
+#if !defined AMXMODX_NOAUTOLOAD
+	#pragma defclasslib xstats tsx
 #endif
 
 /************* Shared Natives Start ********************************/