Skip to content

Various tweaks for omp-stdlib #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _open_mp.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 7 additions & 1 deletion omp_core.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -1411,6 +1411,12 @@ native SHA256_Hash(const content[], const salt[], output[], size = sizeof (outpu
#pragma deprecated Use `CountRunningTimers`.
native GetRunningTimers() = CountRunningTimers;

/**
* <library>omp_core</library>
*/
#pragma deprecated Use `CountRunningTimers`.
native GetActiveTimers() = CountRunningTimers;

/*

,ad8888ba, 88 88 88 88
Expand Down
4 changes: 2 additions & 2 deletions omp_variable.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down