From 444851328a0d431c03e31967d64695a3e6c6d32f Mon Sep 17 00:00:00 2001 From: Evgeniy Date: Mon, 26 Aug 2024 11:56:10 +0300 Subject: [PATCH 1/2] remove compile error --- sscanf2.inc | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/sscanf2.inc b/sscanf2.inc index f6ee62e..c9edad2 100644 --- a/sscanf2.inc +++ b/sscanf2.inc @@ -120,11 +120,6 @@ #undef SSCANF_STATIC__ #define SSCANF_STATIC__ static #endif -#if __pawn_build == 0 - #if !defined SSCANF_NO_NICE_FEATURES - #error sscanf utilises community compiler features. Use `#define SSCANF_NO_NICE_FEATURES` to live without (if you can call that living) or better yet download it here: github.com/pawn-lang/compiler/releases - #endif -#endif /** * sscanf @@ -717,9 +712,8 @@ native unformat(const data[], const format[], {T_WEAPON, Float, _}:...); * sscanf * * The fallback for the filename in sscanf on the old compiler, which - * doesn't have the inbuilt __file macro. This is the "feature" enabled - * by SSCANF_NO_NICE_FEATURES. Appends "unknown file" in the - * plugin when line number < 0. + * doesn't have the inbuilt __file macro. Appends "unknown file" + * in the plugin when line number < 0. * */ stock const SSCANF_UNK_[] = "sscanf"; @@ -728,9 +722,8 @@ stock const SSCANF_UNK_[] = "sscanf"; * sscanf * * The fallback for the filename in unformat on the old compiler, which - * doesn't have the inbuilt __file macro. This is the "feature" enabled - * by SSCANF_NO_NICE_FEATURES. Appends "unknown file" in the - * plugin when line number < 0. + * doesn't have the inbuilt __file macro. Appends "unknown file" + * in the plugin when line number < 0. * */ stock const SSCANF_FOM_[] = "unformat"; @@ -739,9 +732,8 @@ stock const SSCANF_FOM_[] = "unformat"; * sscanf * * The fallback for the filename in extract on the old compiler, which - * doesn't have the inbuilt __file macro. This is the "feature" enabled - * by SSCANF_NO_NICE_FEATURES. Appends "unknown file" in the - * plugin when line number < 0. + * doesn't have the inbuilt __file macro. Appends "unknown file" + * in the plugin when line number < 0. * */ stock const SSCANF_EXT_[] = "extract"; @@ -2061,9 +2053,6 @@ stock SSCANF_Debug() printf(" | Plugin%s %d.%d%d.%d%d |", v2 > v1 ? (" (newer):") : (": "), v2 >>> 16, v2 >>> 12 & 0xF, v2 >>> 8 & 0xF, v2 >>> 4 & 0xF, v2 & 0xF); printf(gap); printf(" | __pawn_build: %10d |", __pawn_build); - #if __pawn_build == 0 - printf(" | SSCANF_NO_NICE_FEATURES |"); - #endif #if SSCANF_NPC printf(" | SSCANF_NPC |"); #endif From b2ca3be9cd498c7d5a1b1051454f1b129f689980 Mon Sep 17 00:00:00 2001 From: Evgeniy Date: Mon, 26 Aug 2024 12:04:01 +0300 Subject: [PATCH 2/2] Correct typo in weapon names --- sscanf2.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sscanf2.inc b/sscanf2.inc index c9edad2..21b4f41 100644 --- a/sscanf2.inc +++ b/sscanf2.inc @@ -1633,9 +1633,9 @@ stock SSCANF_GetClosestValue(const input[], const candidates[][], const results[ "Missile Launcher", "Flame Thrower", "Minigun", - "Sachel Charges", + "Satchel Charges", "Detonator", - "Spray Paint", + "Spraycan", "Fire Extinguisher", "Camera", "Nightvision Goggles",