Merge pull request #54 from NexiusTailer/master

Various tweaks for omp-stdlib

Author: NexiusTailer

_open_mp.inc

@@ -139,7 +139,7 @@ public const __OPEN_MP_VERSION = 0;
 	#if __pawn_build >= 11
 		#define OPEN_MP_TAGS {LANDING_GEAR_STATE, T_CONNECTION_STATUS, T_CP_TYPE, T_WEAPON, T_PLAYER_MARKERS_MODE, T_DIALOG_STYLE, T_HTTP_METHOD, T_HTTP_ERROR, T_DOWNLOAD_REQUEST, T_SELECT_OBJECT, T_OBJECT_MATERIAL_SIZE, T_OBJECT_MATERIAL_TEXT_ALIGN, T_EDIT_RESPONSE, T_PLAYER_STATE, T_SPECIAL_ACTION, T_FIGHT_STYLE, T_WEAPONSKILL, T_WEAPONSTATE, T_KEY, T_CAM_MODE, T_MAPICON, T_SPECTATE_MODE, T_PLAYER_RECORDING_TYPE, T_FORCE_SYNC, T_CLICK_SOURCE, T_BULLET_HIT_TYPE, T_TEXT_DRAW_FONT, T_TEXT_DRAW_ALIGN, T_VARTYPE, T_CARMODTYPE, T_VEHICLE_MODEL_INFO, T_VEHICLE_PANEL_STATUS, T_VEHICLE_DOOR_STATUS, T_VEHICLE_LIGHT_STATUS, T_VEHICLE_TYRE_STATUS, T_WEAPON_SLOT, Bit, Bitmap, XML, XMLEntry, Group, INI, Language, Style, DB, DBResult, Menu, Text, PlayerText, Text3D, PlayerText3D, File, Float, CUSTOM_TAG_TYPES, _}
 	#else
-		#define OPEN_MP_TAGS {T_WEAPON, Text, PlayerText, Text3D, PlayerText3D, File, Float, CUSTOM_TAG_TYPES, _}
+		#define OPEN_MP_TAGS {Text, PlayerText, Text3D, PlayerText3D, File, Float, CUSTOM_TAG_TYPES, _}
 	#endif
 #else // if defined WEAK_TAGS
 	#define __TAG(%0) t_%0
@@ -153,7 +153,7 @@ public const __OPEN_MP_VERSION = 0;
 	// but not for YSI internal tags.  Not having them here would be a change
 	// for many existing scripts that didn't previously have to specify those
 	// tags.  Having more here isn't a problem, so they're just all here.
-	#define OPEN_MP_TAGS {LANDING_GEAR_STATE, Bit, Bitmap, XML, XMLEntry, Group, INI, Language, Style, DB, DBResult, Menu, Text, PlayerText, Text3D, PlayerText3D, File, Float, CUSTOM_TAG_TYPES, _}
+	#define OPEN_MP_TAGS {Bit, Bitmap, XML, XMLEntry, Group, INI, Language, Style, DB, DBResult, Menu, Text, PlayerText, Text3D, PlayerText3D, File, Float, CUSTOM_TAG_TYPES, _}
 #else
 	// I say it isn't a problem - the old compiler is limited to only 16 tags,
 	// thus `CUSTOM_TAG_TYPES` is limited to eight tags.  To keep the numbers

a_npc.inc

@@ -2,4 +2,4 @@
 	#endinput
 #endif
 
-#error open.mp doesn't yet support NPC scripts.
+#error open.mp doesn't support NPC scripts.

omp_core.inc

@@ -697,7 +697,7 @@ native bool:SendDeathMessage(killer, killee, weapon);
  *   <b><c>0</c></b>: The function failed to execute.  The weapon specified does not exist.
  * </returns>
  */
-native bool:GetWeaponName(WEAPON:weaponid, weapon[], len = sizeof (weapon));
+native GetWeaponName(WEAPON:weaponid, weapon[], len = sizeof (weapon));
 
 /**
  * <library>omp_core</library>

omp_npc.inc

@@ -1043,7 +1043,7 @@ native bool:NPC_AddPointToPath(pathid, Float:x, Float:y, Float:z, Float:stopRang
 /**
  * <library>omp_npc</library>
  */
-native bool:NPC_RemovePointFromPath(pathid, point_index);
+native bool:NPC_RemovePointFromPath(pathid, pointIndex);
 
 /**
  * <library>omp_npc</library>
@@ -1058,7 +1058,7 @@ native NPC_GetPathPointCount(pathid);
 /**
  * <library>omp_npc</library>
  */
-native bool:NPC_GetPathPoint(pathid, point_index, &Float:x, &Float:y, &Float:z, &Float:stopRange);
+native bool:NPC_GetPathPoint(pathid, pointIndex, &Float:x, &Float:y, &Float:z, &Float:stopRange);
 
 /**
  * <library>omp_npc</library>
@@ -1130,7 +1130,7 @@ native bool:NPC_GetNodeInfo(nodeid, &vehnodes, &pednodes, &navinode);
 /**
  * <library>omp_npc</library>
  */
-native bool:NPC_PlayNode(npcid, nodeid, NPC_MOVE_TYPE:moveType = NPC_MOVE_TYPE_JOG, Float:speed = NPC_MOVE_SPEED_AUTO, Float:radius = 0.0, bool:setangle = true);
+native bool:NPC_PlayNode(npcid, nodeid, NPC_MOVE_TYPE:moveType = NPC_MOVE_TYPE_JOG, Float:speed = NPC_MOVE_SPEED_AUTO, Float:radius = 0.0, bool:setAngle = true);
 
 /**
  * <library>omp_npc</library>
@@ -1258,22 +1258,3 @@ forward OnNPCFinishMovePath(npcid, pathid);
  * <library>omp_npc</library>
  */
 forward OnNPCFinishMovePathPoint(npcid, pathid, pointid);
-
-/*
-native # Streamer Support();
-native          Streamer Support(
-native      ================================(
-native
-*/
-
-#if defined _streamer_included
-	stock NPC_SetSurfingDynamicObject(npcid, objectid)
-	{
-		return NPC_SetSurfingPlayerObject(npcid, Streamer_GetItemInternalID(npcid, STREAMER_TYPE_OBJECT, objectid));
-	}
-
-	stock NPC_GetSurfingDynamicObject(npcid)
-	{
-		return Streamer_GetItemStreamerID(npcid, STREAMER_TYPE_OBJECT, NPC_GetSurfingPlayerObject(npcid));
-	}
-#endif

omp_variable.inc

@@ -233,7 +233,7 @@ native GetSVarsUpperIndex();
  * <seealso name="GetSVarFloat" />
  * <seealso name="GetSVarString" />
  */
-native bool:GetSVarNameAtIndex(index, output[], size = sizeof (output));
+native GetSVarNameAtIndex(index, output[], size = sizeof (output));
 
 /**
  * <library>omp_variable</library>
@@ -418,7 +418,7 @@ native GetPVarsUpperIndex(playerid);
  * <seealso name="GetPVarFloat" />
  * <seealso name="GetPVarString" />
  */
-native bool:GetPVarNameAtIndex(playerid, index, output[], size = sizeof (output));
+native GetPVarNameAtIndex(playerid, index, output[], size = sizeof (output));
 
 /**
  * <library>omp_variable</library>