Skip to content

Commit 23a08ff

Browse files
committed
fix
1 parent 0f4cb04 commit 23a08ff

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

.gitattributes

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
# Auto detect text files and perform LF normalization
2-
* text=auto
1+
*.inc linguist-language=Pawn

3DTryg.inc

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,9 @@ enum 'StreamType'
836836
#error [ADM] Module already defined: TRYG3D_MOD_GRENADEDETECTION
837837
#endif
838838
#if defined TRYG3D_ENABLE_GRENADEDETECTION
839-
#if !defined TRYG3D_MOD_COLANDREAS
839+
#if !defined TRYG3D_MOD_PLAYER
840+
#error [ADM] Trying to enable Grenade Detection without Player Module
841+
#elseif !defined TRYG3D_MOD_COLANDREAS
840842
#error [ADM] Trying to enable Grenade Detection without ColAndreas Module
841843
#else
842844
#define TRYG3D_MOD_GRENADEDETECTION "GrenadeDetection"
@@ -1159,24 +1161,22 @@ enum LootArray {
11591161
Float:ItemChance
11601162
}
11611163

1162-
#if defined TRYG3D_MOD_UNIVERSAL
1163-
enum Item3D {
1164-
item_player,
1165-
item_npc,
1166-
item_actor,
1167-
item_object,
1168-
item_vehicle,
1169-
item_dynamic_object,
1170-
item_dynamic_pickup,
1171-
item_dynamic_cp,
1172-
item_dynamic_racecp,
1173-
item_dynamic_mapicon,
1174-
item_dynamic_3dtext,
1175-
item_dynamic_actor,
1176-
item_dynamic_vehicle,
1177-
item_fcnpc
1178-
}
1179-
#endif
1164+
enum Item3D {
1165+
item_player,
1166+
item_npc,
1167+
item_actor,
1168+
item_object,
1169+
item_vehicle,
1170+
item_dynamic_object,
1171+
item_dynamic_pickup,
1172+
item_dynamic_cp,
1173+
item_dynamic_racecp,
1174+
item_dynamic_mapicon,
1175+
item_dynamic_3dtext,
1176+
item_dynamic_actor,
1177+
item_dynamic_vehicle,
1178+
item_fcnpc
1179+
}
11801180

11811181
#if defined TRYG3D_MOD_CATCHITEMS
11821182
enum StreamType {

0 commit comments

Comments
 (0)