From 23a08ff0bd61c1b200c6e52c3709196adbd61b2e Mon Sep 17 00:00:00 2001 From: Abyss Morgan <14877700+AbyssMorgan@users.noreply.github.com> Date: Tue, 21 Dec 2021 18:31:26 +0100 Subject: [PATCH] fix --- .gitattributes | 3 +-- 3DTryg.inc | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.gitattributes b/.gitattributes index dfe0770..0c03a5d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ -# Auto detect text files and perform LF normalization -* text=auto +*.inc linguist-language=Pawn \ No newline at end of file diff --git a/3DTryg.inc b/3DTryg.inc index 3c7b7a2..e381ea4 100644 --- a/3DTryg.inc +++ b/3DTryg.inc @@ -836,7 +836,9 @@ enum 'StreamType' #error [ADM] Module already defined: TRYG3D_MOD_GRENADEDETECTION #endif #if defined TRYG3D_ENABLE_GRENADEDETECTION - #if !defined TRYG3D_MOD_COLANDREAS + #if !defined TRYG3D_MOD_PLAYER + #error [ADM] Trying to enable Grenade Detection without Player Module + #elseif !defined TRYG3D_MOD_COLANDREAS #error [ADM] Trying to enable Grenade Detection without ColAndreas Module #else #define TRYG3D_MOD_GRENADEDETECTION "GrenadeDetection" @@ -1159,24 +1161,22 @@ enum LootArray { Float:ItemChance } -#if defined TRYG3D_MOD_UNIVERSAL - enum Item3D { - item_player, - item_npc, - item_actor, - item_object, - item_vehicle, - item_dynamic_object, - item_dynamic_pickup, - item_dynamic_cp, - item_dynamic_racecp, - item_dynamic_mapicon, - item_dynamic_3dtext, - item_dynamic_actor, - item_dynamic_vehicle, - item_fcnpc - } -#endif +enum Item3D { + item_player, + item_npc, + item_actor, + item_object, + item_vehicle, + item_dynamic_object, + item_dynamic_pickup, + item_dynamic_cp, + item_dynamic_racecp, + item_dynamic_mapicon, + item_dynamic_3dtext, + item_dynamic_actor, + item_dynamic_vehicle, + item_fcnpc +} #if defined TRYG3D_MOD_CATCHITEMS enum StreamType {