Weapon fire types.

pawn-lang · Dec 17, 2023 · 538b312 · 538b312
1 parent 3ac3c88
commit 538b312
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/YSI_Core/y_core/y_utils_tests.inc b/YSI_Core/y_core/y_utils_tests.inc
@@ -255,6 +255,7 @@ public y_utils_va_return(const str[])
 	ASSERT(!IsRPName("0_0"));
 	ASSERT(!IsRPName("Tim1 Tom"));
 	ASSERT(!IsRPName("Tim_"));
+	ASSERT(!IsRPName("Timothy_"));
 }
 
 @test(.group = "y_utils") IsRPName2()

diff --git a/YSI_Core/y_utils/y_utils_names.inc b/YSI_Core/y_utils/y_utils_names.inc
@@ -112,6 +112,8 @@ stock ReturnPlayerName(playerid)
  *   GetPlayerRPName
  * </summary>
  * <param name="playerid">Player whose name you want to get.</param>
+ * <param name="name">The destination array to save the name in.</param>
+ * <param name="len">The length of the destination.</param>
  * <remarks>
  *   Get a player's name, with <c>_</c> replaced by <c> </c>.
  * </remarks>
@@ -187,7 +189,8 @@ stock GetPlayerRPComponents(playerid, string:names[][], components = sizeof (nam
  *   not <c>james</c>.</param>
  * <param name="longNames">Allow more than two name parts?</param>
  * <remarks>
- *   Is this name in the form <c>First_Last</c>?
+ *   Is this name in the form <c>First_Last</c>?  Note this doesn't handle names
+ *   like "MacLeod", nor double-barralled surnames like "Smith-Thompson".
  * </remarks>
  *//*------------------------------------------------------------------------**/
 

diff --git a/YSI_Game/y_weapondata/y_weapondata_entry.inc b/YSI_Game/y_weapondata/y_weapondata_entry.inc
@@ -196,10 +196,10 @@ static stock YSI_g_WeaponFireType[47] = {
 	WEAPON_FIRE_TYPE_USE, //{"Detonator", 40, 12, 364 },
 	WEAPON_FIRE_TYPE_AREA_EFFECT, //{"Spraycan", 41, 9, 365 },
 	WEAPON_FIRE_TYPE_AREA_EFFECT, //{"Fire Extinguisher", 42, 9, 366 },
-	WEAPON_FIRE_TYPE_AREA_CAMERA, //{"Camera", 43, 9, 367 },
-	WEAPON_FIRE_TYPE_AREA_USE, //{"Night Vis Goggles", 44, 11, 368 },
-	WEAPON_FIRE_TYPE_AREA_USE, //{"Thermal Goggles", 45, 11, 369 },
-	WEAPON_FIRE_TYPE_AREA_USE  //{"Parachute", 46, 11, 371 }
+	WEAPON_FIRE_TYPE_CAMERA, //{"Camera", 43, 9, 367 },
+	WEAPON_FIRE_TYPE_USE, //{"Night Vis Goggles", 44, 11, 368 },
+	WEAPON_FIRE_TYPE_USE, //{"Thermal Goggles", 45, 11, 369 },
+	WEAPON_FIRE_TYPE_USE  //{"Parachute", 46, 11, 371 }
 };
 
 stock Weapon_GetFireType(weaponid)