Fun: Add HITZONE* constants for use with set/get_user_hitzone()

alliedmodders · Aug 25, 2018 · f429be6 · f429be6
1 parent df38895
commit f429be6
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 34 deletions.
diff --git a/modules/fun/fun.cpp b/modules/fun/fun.cpp
@@ -290,7 +290,7 @@ static cell AMX_NATIVE_CALL get_user_gravity(AMX *amx, cell *params)
 	return amx_ftoc(pPlayer->v.gravity); 
 }
 
-// native set_user_hitzones(index = 0, target = 0, body = 255)
+// native set_user_hitzones(index = 0, target = 0, body = HITZONES_DEFAULT)
 static cell AMX_NATIVE_CALL set_user_hitzones(AMX *amx, cell *params)
 {
 	enum args { arg_count, arg_attacker, arg_target, arg_hitzones };
@@ -445,28 +445,28 @@ AMX_NATIVE_INFO fun_Exports[] =
 {
 	{ "get_client_listen" , get_client_listening },
 	{ "set_client_listen" , set_client_listening },
-	{ "set_user_godmode"  , set_user_godmode },
-	{ "get_user_godmode"  , get_user_godmode },
-	{ "set_user_health"   , set_user_health },
-	{ "give_item"         , give_item },
-	{ "spawn"             , spawn },
-	{ "set_user_frags"    , set_user_frags },
-	{ "set_user_armor"    , set_user_armor },
-	{ "set_user_origin"   , set_user_origin },
-	{ "set_user_rendering", set_user_rendering },
-	{ "get_user_rendering",	get_user_rendering},
-	{ "set_user_maxspeed" , set_user_maxspeed },
-	{ "get_user_maxspeed" , get_user_maxspeed },
-	{ "set_user_gravity"  , set_user_gravity },
-	{ "get_user_gravity"  , get_user_gravity },
-	{ "get_user_footsteps", get_user_footsteps },
-	{ "set_user_hitzones" , set_user_hitzones },
-	{ "get_user_hitzones" , get_user_hitzones },
-	{ "set_user_noclip"   , set_user_noclip },
-	{ "get_user_noclip"   , get_user_noclip },
-	{ "set_user_footsteps", set_user_footsteps },
-	{ "strip_user_weapons", strip_user_weapons },
-	{ NULL                , NULL }
+	{ "set_user_godmode"  , set_user_godmode     },
+	{ "get_user_godmode"  , get_user_godmode     },
+	{ "set_user_health"   , set_user_health      },
+	{ "give_item"         , give_item            },
+	{ "spawn"             , spawn                },
+	{ "set_user_frags"    , set_user_frags       },
+	{ "set_user_armor"    , set_user_armor       },
+	{ "set_user_origin"   , set_user_origin      },
+	{ "set_user_rendering", set_user_rendering   },
+	{ "get_user_rendering",	get_user_rendering   },
+	{ "set_user_maxspeed" , set_user_maxspeed    },
+	{ "get_user_maxspeed" , get_user_maxspeed    },
+	{ "set_user_gravity"  , set_user_gravity     },
+	{ "get_user_gravity"  , get_user_gravity     },
+	{ "get_user_footsteps", get_user_footsteps   },
+	{ "set_user_hitzones" , set_user_hitzones    },
+	{ "get_user_hitzones" , get_user_hitzones    },
+	{ "set_user_noclip"   , set_user_noclip      },
+	{ "get_user_noclip"   , get_user_noclip      },
+	{ "set_user_footsteps", set_user_footsteps   },
+	{ "strip_user_weapons", strip_user_weapons   },
+	{ nullptr             , nullptr              }
 };
 
 

diff --git a/plugins/include/fun.inc b/plugins/include/fun.inc
@@ -21,6 +21,21 @@
 	#pragma loadlib fun
 #endif
 
+
+/**
+ * Parts of body for hits, for use with set_user_hitzones().
+ */
+const HITZONE_GENERIC  = (1 << HIT_GENERIC);   // 1
+const HITZONE_HEAD     = (1 << HIT_HEAD);      // 2
+const HITZONE_CHEST    = (1 << HIT_CHEST);     // 4
+const HITZONE_STOMATCH = (1 << HIT_STOMATCH);  // 8
+const HITZONE_LEFTARM  = (1 << HIT_LEFTARM);   // 16
+const HITZONE_RIGHTARM = (1 << HIT_RIGHTARM);  // 32
+const HITZONE_LEFTLEG  = (1 << HIT_LEFTLEG);   // 64
+const HITZONE_RIGHTLEG = (1 << HIT_RIGHTLEG);  // 128
+const HITZONES_DEFAULT = HITZONE_GENERIC | HITZONE_HEAD     | HITZONE_CHEST   | HITZONE_STOMATCH | 
+                         HITZONE_LEFTARM | HITZONE_RIGHTARM | HITZONE_LEFTLEG | HITZONE_RIGHTLEG; // 255
+
 /**
  * Tells whether receiver hears sender via voice communication.
  *
@@ -169,26 +184,18 @@ native give_item(index, const item[]);
  *
  * @param index         Client index
  * @param target        The target player
- * @param body          A bitsum of the body parts that can/can't be shot:
- *                      1   - generic
- *                      2   - head
- *                      4   - chest
- *                      8   - stomach
- *                      16  - left arm
- *                      32  - right arm
- *                      64  - left leg
- *                      128 - right leg
+ * @param body          A bitsum of the body parts that can/can't be shot. See HITZONE* constants.
  *
  * @noreturn
  * @error               If player is not connected or not within the range
  *                      of 1 to MaxClients.
  */
-native set_user_hitzones(index = 0, target = 0, body = 255);
+native set_user_hitzones(index = 0, target = 0, body = HITZONES_DEFAULT);
 
 /**
  * Gets the set of hit zone "rules" between @index and @target players.
  *
- * @note For the body part bitsum take a look at the set_user_hitzones() native.
+ * @note For the body part bitsum, see HITZONE* constants.
  *
  * @param index         Client index
  * @param target        The target player