Skip to content

Commit e3b9b7b

Browse files
committed
0.3z-R1
1 parent 72df5f2 commit e3b9b7b

File tree

7 files changed

+25
-136
lines changed

7 files changed

+25
-136
lines changed

a_actor.inc

Lines changed: 0 additions & 34 deletions
This file was deleted.

a_objects.inc

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SA-MP Object Functions
22
*
3-
* (c) Copyright 2005-2015, SA-MP Team
3+
* (c) Copyright 2005-2012, SA-MP Team
44
*
55
*/
66
@@ -20,8 +20,6 @@ native SetObjectPos(objectid, Float:X, Float:Y, Float:Z);
2020
native GetObjectPos(objectid, &Float:X, &Float:Y, &Float:Z);
2121
native SetObjectRot(objectid, Float:RotX, Float:RotY, Float:RotZ);
2222
native GetObjectRot(objectid, &Float:RotX, &Float:RotY, &Float:RotZ);
23-
native GetObjectModel(objectid);
24-
native SetObjectNoCameraCol(objectid);
2523
native IsValidObject(objectid);
2624
native DestroyObject(objectid);
2725
native MoveObject(objectid, Float:X, Float:Y, Float:Z, Float:Speed, Float:RotX = -1000.0, Float:RotY = -1000.0, Float:RotZ = -1000.0);
@@ -37,8 +35,6 @@ native SetPlayerObjectPos(playerid, objectid, Float:X, Float:Y, Float:Z);
3735
native GetPlayerObjectPos(playerid, objectid, &Float:X, &Float:Y, &Float:Z);
3836
native SetPlayerObjectRot(playerid, objectid, Float:RotX, Float:RotY, Float:RotZ);
3937
native GetPlayerObjectRot(playerid, objectid, &Float:RotX, &Float:RotY, &Float:RotZ);
40-
native GetPlayerObjectModel(playerid, objectid);
41-
native SetPlayerObjectNoCameraCol(playerid, objectid);
4238
native IsValidPlayerObject(playerid, objectid);
4339
native DestroyPlayerObject(playerid, objectid);
4440
native MovePlayerObject(playerid, objectid, Float:X, Float:Y, Float:Z, Float:Speed, Float:RotX = -1000.0, Float:RotY = -1000.0, Float:RotZ = -1000.0);
@@ -69,6 +65,4 @@ native SetObjectMaterial(objectid, materialindex, modelid, txdname[], texturenam
6965
native SetPlayerObjectMaterial(playerid, objectid, materialindex, modelid, txdname[], texturename[], materialcolor=0);
7066
7167
native SetObjectMaterialText(objectid, text[], materialindex = 0, materialsize = OBJECT_MATERIAL_SIZE_256x128, fontface[] = "Arial", fontsize = 24, bold = 1, fontcolor = 0xFFFFFFFF, backcolor = 0, textalignment = 0);
72-
native SetPlayerObjectMaterialText(playerid, objectid, text[], materialindex = 0, materialsize = OBJECT_MATERIAL_SIZE_256x128, fontface[] = "Arial", fontsize = 24, bold = 1, fontcolor = 0xFFFFFFFF, backcolor = 0, textalignment = 0);
73-
74-
native SetObjectsDefaultCameraCol(disable);
68+
native SetPlayerObjectMaterialText(playerid, objectid, text[], materialindex = 0, materialsize = OBJECT_MATERIAL_SIZE_256x128, fontface[] = "Arial", fontsize = 24, bold = 1, fontcolor = 0xFFFFFFFF, backcolor = 0, textalignment = 0);

a_players.inc

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SA-MP Player Functions
22
*
3-
* (c) Copyright 2005-2015, SA-MP Team
3+
* (c) Copyright 2005-2012, SA-MP Team
44
*
55
*/
66
@@ -78,7 +78,6 @@ native SetPlayerAmmo(playerid, weaponslot, ammo);
7878
native GetPlayerAmmo(playerid);
7979
native GetPlayerWeaponState(playerid);
8080
native GetPlayerTargetPlayer(playerid);
81-
native GetPlayerTargetActor(playerid);
8281
native SetPlayerTeam(playerid, teamid);
8382
native GetPlayerTeam(playerid);
8483
native SetPlayerScore(playerid,score);
@@ -177,7 +176,7 @@ native GetPVarType(playerid, varname[]);
177176
#define MAX_CHATBUBBLE_LENGTH 144
178177
native SetPlayerChatBubble(playerid, text[], color, Float:drawdistance, expiretime);
179178
180-
// Player control
179+
// Player controls
181180
native PutPlayerInVehicle(playerid, vehicleid, seatid);
182181
native GetPlayerVehicleID(playerid);
183182
native GetPlayerVehicleSeat(playerid);
@@ -190,7 +189,6 @@ native GetPlayerAnimationIndex(playerid); // return the index of any running app
190189
native GetAnimationName(index, animlib[], len1, animname[], len2); // get the animation lib/name for the index
191190
native GetPlayerSpecialAction(playerid);
192191
native SetPlayerSpecialAction(playerid,actionid);
193-
native DisableRemoteVehicleCollisions(playerid, disable);
194192
195193
// Player world/map related
196194
native SetPlayerCheckpoint(playerid, Float:x, Float:y, Float:z, Float:size);
@@ -222,11 +220,6 @@ native SetCameraBehindPlayer(playerid);
222220
native GetPlayerCameraPos(playerid, &Float:x, &Float:y, &Float:z);
223221
native GetPlayerCameraFrontVector(playerid, &Float:x, &Float:y, &Float:z);
224222
native GetPlayerCameraMode(playerid);
225-
native EnablePlayerCameraTarget(playerid, enable);
226-
native GetPlayerCameraTargetObject(playerid);
227-
native GetPlayerCameraTargetVehicle(playerid);
228-
native GetPlayerCameraTargetPlayer(playerid);
229-
native GetPlayerCameraTargetActor(playerid);
230223
native Float:GetPlayerCameraAspectRatio(playerid);
231224
native Float:GetPlayerCameraZoom(playerid);
232225
native AttachCameraToObject(playerid, objectid);
@@ -267,7 +260,4 @@ native StartRecordingPlayerData(playerid, recordtype, recordname[]);
267260
native StopRecordingPlayerData(playerid);
268261
269262
native SelectTextDraw(playerid, hovercolor); // enables the mouse so the player can select a textdraw
270-
native CancelSelectTextDraw(playerid); // cancel textdraw selection with the mouse
271-
272-
// Explosion
273-
native CreateExplosionForPlayer(playerid, Float:X, Float:Y, Float:Z, type, Float:Radius);
263+
native CancelSelectTextDraw(playerid); // cancel textdraw selection with the mouse

a_samp.inc

Lines changed: 12 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SA-MP Functions
22
*
3-
* (c) Copyright 2005-2015, SA-MP Team
3+
* (c) Copyright 2005-2012, SA-MP Team
44
*
55
*/
66
@@ -23,17 +23,14 @@
2323
#include <a_players>
2424
#include <a_vehicles>
2525
#include <a_objects>
26-
#include <a_actor>
2726
#include <a_sampdb>
2827
2928
// Limits and internal constants
3029
#define MAX_PLAYER_NAME (24)
31-
#define MAX_PLAYERS (1000)
30+
#define MAX_PLAYERS (500)
3231
#define MAX_VEHICLES (2000)
33-
#define MAX_ACTORS (1000)
3432
#define INVALID_PLAYER_ID (0xFFFF)
3533
#define INVALID_VEHICLE_ID (0xFFFF)
36-
#define INVALID_ACTOR_ID (0xFFFF)
3734
#define NO_TEAM (255)
3835
#define MAX_OBJECTS (1000)
3936
#define INVALID_OBJECT_ID (0xFFFF)
@@ -61,8 +58,7 @@ native SendClientMessage(playerid, color, const message[]);
6158
native SendClientMessageToAll(color, const message[]);
6259
native SendPlayerMessageToPlayer(playerid, senderid, const message[]);
6360
native SendPlayerMessageToAll(senderid, const message[]);
64-
native SendDeathMessage(killer, killee, weapon);
65-
native SendDeathMessageToPlayer(playerid, killer, killee, weapon);
61+
native SendDeathMessage(killer,killee,weapon);
6662
native GameTextForAll(const string[],time,style);
6763
native GameTextForPlayer(playerid,const string[],time,style);
6864
native SetTimer(funcname[], interval, repeating);
@@ -77,39 +73,14 @@ native Float:asin(Float:value);
7773
native Float:acos(Float:value);
7874
native Float:atan(Float:value);
7975
native Float:atan2(Float:x, Float:y);
80-
native GetPlayerPoolSize();
81-
native GetVehiclePoolSize();
82-
native GetActorPoolSize();
83-
84-
// Hash
85-
native SHA256_PassHash(password[], salt[], ret_hash[], ret_hash_len); // SHA256 for password hashing
86-
87-
// Server wide persistent variable system (SVars)
88-
native SetSVarInt(varname[], int_value);
89-
native GetSVarInt(varname[]);
90-
native SetSVarString(varname[], string_value[]);
91-
native GetSVarString(varname[], string_return[], len);
92-
native SetSVarFloat(varname[], Float:float_value);
93-
native Float:GetSVarFloat(varname[]);
94-
native DeleteSVar(varname[]);
95-
96-
// SVar enumeration
97-
#define SERVER_VARTYPE_NONE 0
98-
#define SERVER_VARTYPE_INT 1
99-
#define SERVER_VARTYPE_STRING 2
100-
#define SERVER_VARTYPE_FLOAT 3
101-
102-
native GetSVarsUpperIndex();
103-
native GetSVarNameAtIndex(index, ret_varname[], ret_len);
104-
native GetSVarType(varname[]);
10576
10677
// Game
10778
native SetGameModeText(const string[]);
10879
native SetTeamCount(count);
10980
native AddPlayerClass(modelid, Float:spawn_x, Float:spawn_y, Float:spawn_z, Float:z_angle, weapon1, weapon1_ammo, weapon2, weapon2_ammo, weapon3, weapon3_ammo);
11081
native AddPlayerClassEx(teamid, modelid, Float:spawn_x, Float:spawn_y, Float:spawn_z, Float:z_angle, weapon1, weapon1_ammo, weapon2, weapon2_ammo, weapon3, weapon3_ammo);
11182
native AddStaticVehicle(modelid, Float:spawn_x, Float:spawn_y, Float:spawn_z, Float:z_angle, color1, color2);
112-
native AddStaticVehicleEx(modelid, Float:spawn_x, Float:spawn_y, Float:spawn_z, Float:z_angle, color1, color2, respawn_delay, addsiren=0);
83+
native AddStaticVehicleEx(modelid, Float:spawn_x, Float:spawn_y, Float:spawn_z, Float:z_angle, color1, color2, respawn_delay);
11384
native AddStaticPickup(model, type, Float:X, Float:Y, Float:Z, virtualworld = 0);
11485
native CreatePickup(model, type, Float:X, Float:Y, Float:Z, virtualworld = 0);
11586
native DestroyPickup(pickup);
@@ -144,20 +115,12 @@ native Kick(playerid);
144115
native Ban(playerid);
145116
native BanEx(playerid, const reason[]);
146117
native SendRconCommand(command[]);
147-
native GetPlayerNetworkStats(playerid, retstr[], retstr_size);
148-
native GetNetworkStats(retstr[], retstr_size);
149-
native GetPlayerVersion(playerid, const version[], len); // Returns the SA-MP client revision as reported by the player
150-
native BlockIpAddress(ip_address[], timems);
151-
native UnBlockIpAddress(ip_address[]);
152-
153-
// Deprecated:
154118
native GetServerVarAsString(const varname[], buffer[], len);
155119
native GetServerVarAsInt(const varname[]);
156120
native GetServerVarAsBool(const varname[]);
157-
// These are the same 3 functions as above although they avoid the name ambiguity/conflict with the SVar system.
158-
native GetConsoleVarAsString(const varname[], buffer[], len);
159-
native GetConsoleVarAsInt(const varname[]);
160-
native GetConsoleVarAsBool(const varname[]);
121+
native GetPlayerNetworkStats(playerid, retstr[], retstr_size);
122+
native GetNetworkStats(retstr[], retstr_size);
123+
native GetPlayerVersion(playerid, const version[], len); // Returns the SA-MP client revision as reported by the player
161124
162125
// Extended admin network stats
163126
native GetServerTickRate();
@@ -235,12 +198,10 @@ native DeletePlayer3DTextLabel(playerid, PlayerText3D:id);
235198
native UpdatePlayer3DTextLabelText(playerid, PlayerText3D:id, color, text[]);
236199
237200
// Player GUI Dialog
238-
#define DIALOG_STYLE_MSGBOX 0
239-
#define DIALOG_STYLE_INPUT 1
240-
#define DIALOG_STYLE_LIST 2
241-
#define DIALOG_STYLE_PASSWORD 3
242-
#define DIALOG_STYLE_TABLIST 4
243-
#define DIALOG_STYLE_TABLIST_HEADERS 5
201+
#define DIALOG_STYLE_MSGBOX 0
202+
#define DIALOG_STYLE_INPUT 1
203+
#define DIALOG_STYLE_LIST 2
204+
#define DIALOG_STYLE_PASSWORD 3
244205
245206
native ShowPlayerDialog(playerid, dialogid, style, caption[], info[], button1[], button2[]);
246207
@@ -371,7 +332,7 @@ forward OnEnterExitModShop(playerid, enterexit, interiorid);
371332
forward OnVehiclePaintjob(playerid, vehicleid, paintjobid);
372333
forward OnVehicleRespray(playerid, vehicleid, color1, color2);
373334
forward OnVehicleDamageStatusUpdate(vehicleid, playerid);
374-
forward OnUnoccupiedVehicleUpdate(vehicleid, playerid, passenger_seat, Float:new_x, Float:new_y, Float:new_z, Float:vel_x, Float:vel_y, Float:vel_z);
335+
forward OnUnoccupiedVehicleUpdate(vehicleid, playerid, passenger_seat, Float:new_x, Float:new_y, Float:new_z);
375336
forward OnPlayerSelectedMenuRow(playerid, row);
376337
forward OnPlayerExitedMenu(playerid);
377338
forward OnPlayerInteriorChange(playerid, newinteriorid, oldinteriorid);
@@ -382,19 +343,12 @@ forward OnPlayerStreamIn(playerid, forplayerid);
382343
forward OnPlayerStreamOut(playerid, forplayerid);
383344
forward OnVehicleStreamIn(vehicleid, forplayerid);
384345
forward OnVehicleStreamOut(vehicleid, forplayerid);
385-
forward OnActorStreamIn(actorid, forplayerid);
386-
forward OnActorStreamOut(actorid, forplayerid);
387346
forward OnDialogResponse(playerid, dialogid, response, listitem, inputtext[]);
388347
forward OnPlayerTakeDamage(playerid, issuerid, Float:amount, weaponid, bodypart);
389348
forward OnPlayerGiveDamage(playerid, damagedid, Float:amount, weaponid, bodypart);
390-
forward OnPlayerGiveDamageActor(playerid, damaged_actorid, Float:amount, weaponid, bodypart);
391349
forward OnPlayerClickMap(playerid, Float:fX, Float:fY, Float:fZ);
392350
forward OnPlayerClickTextDraw(playerid, Text:clickedid);
393351
forward OnPlayerClickPlayerTextDraw(playerid, PlayerText:playertextid);
394-
forward OnIncomingConnection(playerid, ip_address[], port);
395-
forward OnTrailerUpdate(playerid, vehicleid);
396-
forward OnVehicleSirenStateChange(playerid, vehicleid, newstate);
397-
forward OnPlayerFinishedDownloading(playerid, virtualworld);
398352
399353
#define CLICK_SOURCE_SCOREBOARD 0
400354
forward OnPlayerClickPlayer(playerid, clickedplayerid, source);

a_sampdb.inc

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
// SA-MP Native SQLite Database Functions
2-
//
3-
// (c) Copyright 2015, SA-MP Team
4-
//
1+
/* SA-MP Native SQLite Database Functions
2+
*
3+
* (c) Copyright 2007, SA-MP Team
4+
*
5+
*/
56

67
#if defined _sampdb_included
78
#endinput
@@ -11,20 +12,11 @@
1112

1213
native DB:db_open(name[]);
1314
native db_close(DB:db);
14-
native DBResult:db_query(DB:db, query[]);
15+
native DBResult:db_query(DB:db,query[]);
1516
native db_free_result(DBResult:dbresult);
1617
native db_num_rows(DBResult:dbresult);
1718
native db_next_row(DBResult:dbresult);
1819
native db_num_fields(DBResult:dbresult);
1920
native db_field_name(DBResult:dbresult, field, result[], maxlength);
2021
native db_get_field(DBResult:dbresult, field, result[], maxlength);
21-
native db_get_field_int(DBResult:result, field = 0);
22-
native Float:db_get_field_float(DBResult:result, field = 0);
23-
native db_get_field_assoc(DBResult:dbresult, const field[], result[], maxlength);
24-
native db_get_field_assoc_int(DBResult:result, const field[]);
25-
native Float:db_get_field_assoc_float(DBResult:result, const field[]);
26-
native db_get_mem_handle(DB:db);
27-
native db_get_result_mem_handle(DBResult:result);
28-
29-
native db_debug_openfiles();
30-
native db_debug_openresults();
22+
native db_get_field_assoc(DBResult:dbresult, const field[], result[], maxlength);

a_vehicles.inc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VEHICLE_PARAMS_ON 1
3131
3232
// Vehicle
33-
native CreateVehicle(vehicletype, Float:x, Float:y, Float:z, Float:rotation, color1, color2, respawn_delay, addsiren=0);
33+
native CreateVehicle(vehicletype, Float:x, Float:y, Float:z, Float:rotation, color1, color2, respawn_delay);
3434
native DestroyVehicle(vehicleid);
3535
native IsVehicleStreamedIn(vehicleid, forplayerid);
3636
native GetVehiclePos(vehicleid, &Float:x, &Float:y, &Float:z);
@@ -43,11 +43,6 @@ native SetVehicleParamsForPlayer(vehicleid,playerid,objective,doorslocked);
4343
native ManualVehicleEngineAndLights();
4444
native SetVehicleParamsEx(vehicleid, engine, lights, alarm, doors, bonnet, boot, objective);
4545
native GetVehicleParamsEx(vehicleid, &engine, &lights, &alarm, &doors, &bonnet, &boot, &objective);
46-
native GetVehicleParamsSirenState(vehicleid);
47-
native SetVehicleParamsCarDoors(vehicleid, driver, passenger, backleft, backright);
48-
native GetVehicleParamsCarDoors(vehicleid, &driver, &passenger, &backleft, &backright);
49-
native SetVehicleParamsCarWindows(vehicleid, driver, passenger, backleft, backright);
50-
native GetVehicleParamsCarWindows(vehicleid, &driver, &passenger, &backleft, &backright);
5146
native SetVehicleToRespawn(vehicleid);
5247
native LinkVehicleToInterior(vehicleid, interiorid);
5348
native AddVehicleComponent(vehicleid, componentid);

pawn.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"user": "sampctl",
33
"repo": "samp-stdlib",
4-
"entry": "test.pwn",
5-
"output": "test.amx",
64
"dependencies": ["sampctl/pawn-stdlib"]
75
}

0 commit comments

Comments
 (0)