Skip to content

Commit 296c262

Browse files
committed
Major return values correction
1 parent 7e2ad4a commit 296c262

File tree

6 files changed

+188
-80
lines changed

6 files changed

+188
-80
lines changed

amx/server/natives/a_actors.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ function DestroyActor(amx, actor)
1313

1414
removeElem(g_Actors, actor)
1515
destroyElement(actor)
16+
return true
1617
end
1718

1819
function IsActorStreamedIn(amx, actorId, player)
@@ -22,27 +23,30 @@ end
2223
function ApplyActorAnimation(amx, actor, animlib, animname, fDelta, loop, lockx, locky, freeze, time)
2324
setPedAnimation(actor, animlib, animname, time, loop, lockx or locky, false, freeze)
2425
setPedAnimationSpeed(actor, animname, fDelta)
26+
return true
2527
end
2628

2729
function ClearActorAnimations(amx, actor)
28-
setPedAnimation(actor, false)
30+
return setPedAnimation(actor, false)
2931
end
3032

3133
function SetActorFacingAngle(amx, actor, ang)
3234
local rotX, rotY, rotZ = getElementRotation(actor) -- get the local players's rotation
33-
setElementRotation(actor, rotX, rotY, ang, "default", true) -- turn the player 10 degrees clockwise
35+
return setElementRotation(actor, rotX, rotY, ang, "default", true) -- turn the player 10 degrees clockwise
3436
end
3537

3638
function GetActorFacingAngle(amx, actor, refAng)
3739
local rX, rY, rZ = getElementRotation(actor)
3840
writeMemFloat(amx, refAng, rZ)
41+
return true
3942
end
4043

4144
function GetActorPos(amx, actor, refX, refY, refZ)
4245
local x, y, z = getElementPosition(actor)
4346
writeMemFloat(amx, refX, x)
4447
writeMemFloat(amx, refY, y)
4548
writeMemFloat(amx, refZ, z)
49+
return true
4650
end
4751

4852
-- stub

amx/server/natives/a_mta.lua

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function AddPlayerClothes(amx, player, type, index)
22
local texture, model = getClothesByTypeIndex(type, index)
3-
addPedClothes(player, texture, model, type)
3+
return addPedClothes(player, texture, model, type)
44
end
55

66
function GetPlayerClothes(amx, player, type)
@@ -13,7 +13,7 @@ function GetPlayerClothes(amx, player, type)
1313
end
1414

1515
function RemovePlayerClothes(amx, player, type)
16-
removePedClothes(player, type)
16+
return removePedClothes(player, type)
1717
end
1818

1919
-----------------------------------------------------
@@ -69,8 +69,7 @@ end
6969

7070
function SetPlayerDoingDriveBy(amx, ped, state)
7171
clientCall(root, 'setPedDoingGangDriveby', ped, state)
72-
setElementData(ped, 'DoingDriveBy', state)
73-
return true
72+
return setElementData(ped, 'DoingDriveBy', state)
7473
end
7574

7675
function GetPlayerCanBeKnockedOffBike(amx, ped)
@@ -79,7 +78,7 @@ end
7978

8079
function SetPlayerCanBeKnockedOffBike(amx, ped, state)
8180
clientCall(root, 'setPedCanBeKnockedOffBike', ped, state)
82-
setElementData(ped, 'CanBeKnockedOffBike', state)
81+
return setElementData(ped, 'CanBeKnockedOffBike', state)
8382
end
8483

8584
function SetPlayerWeaponSlot(amx, ped, slot)
@@ -141,6 +140,7 @@ end
141140
function DestroyBot(amx, bot)
142141
removeElem(g_Bots, bot)
143142
destroyElement(bot)
143+
return true
144144
end
145145

146146
function GetBotState(amx, bot)
@@ -181,10 +181,11 @@ function GetBotRot(amx, ped, refX, refY, refZ)
181181
writeMemFloat(amx, refX, rX)
182182
writeMemFloat(amx, refY, rY)
183183
writeMemFloat(amx, refZ, rZ)
184+
return true
184185
end
185186

186187
function SetBotRot(amx, Ped, rX, rY, rY)
187-
setPedRotation(ped, rX, rY, rZ)
188+
return setPedRotation(ped, rX, rY, rZ)
188189
end
189190

190191
function GetBotName(amx, bot, nameBuf, bufSize)
@@ -580,7 +581,7 @@ end
580581
-----------------------------------------------------
581582

582583
function ShowCursor(amx, player, show, controls)
583-
showCursor(player, show, controls)
584+
return showCursor(player, show, controls)
584585
end
585586

586587
function AddEventHandler(amx, event, func)

amx/server/natives/a_objects.lua

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function AttachObjectToObject(amx)
1919
end
2020

2121
function AttachObjectToPlayer(amx, object, player, offsetX, offsetY, offsetZ, rX, rY, rZ)
22-
attachElements(object, player, offsetX, offsetY, offsetZ, rX, rY, rZ)
22+
return attachElements(object, player, offsetX, offsetY, offsetZ, rX, rY, rZ)
2323
end
2424

2525
function SetObjectPos(amx, object, x, y, z)
@@ -34,24 +34,28 @@ function SetObjectPos(amx, object, x, y, z)
3434
setElementVelocity(object, 0, 0, 0)
3535
setTimer(setElementFrozen, 500, 1, object, false)
3636
end
37+
38+
return true
3739
end
3840

3941
function GetObjectPos(amx, object, refX, refY, refZ)
4042
local x, y, z = getElementPosition(object)
4143
writeMemFloat(amx, refX, x)
4244
writeMemFloat(amx, refY, y)
4345
writeMemFloat(amx, refZ, z)
46+
return true
4447
end
4548

4649
function GetObjectRot(amx, object, refX, refY, refZ)
4750
local rX, rX, rZ = getObjectRotation(object)
4851
writeMemFloat(amx, refX, rX)
4952
writeMemFloat(amx, refY, rY)
5053
writeMemFloat(amx, refZ, rZ)
54+
return true
5155
end
5256

5357
function SetObjectRot(amx, object, rX, rY, rY)
54-
setObjectRotation(object, rX, rY, rZ)
58+
return setObjectRotation(object, rX, rY, rZ)
5559
end
5660

5761
function GetObjectModel(amx, objID)
@@ -72,17 +76,19 @@ end
7276
function DestroyObject(amx, object)
7377
removeElem(g_Objects, object)
7478
destroyElement(object)
79+
return true
7580
end
7681

7782
function MoveObject(amx, object, x, y, z, speed)
7883
local distance = getDistanceBetweenPoints3D(x, y, z, getElementPosition(object))
7984
local time = distance/speed*1000
8085
moveObject(object, time, x, y, z, 0, 0, 0)
8186
setTimer(procCallOnAll, time, 1, 'OnObjectMoved', getElemID(object))
87+
return true
8288
end
8389

8490
function StopObject(amx, object)
85-
stopObject(object)
91+
return stopObject(object)
8692
end
8793

8894
function IsObjectMoving(amx)
@@ -101,7 +107,7 @@ end
101107
function SetPlayerObjectPos(amx, player, objID, x, y, z)
102108
local obj = g_PlayerObjects[player] and g_PlayerObjects[player][objID]
103109
if not obj then
104-
return
110+
return false
105111
end
106112
if obj.moving then
107113
if isTimer(obj.moving.timer) then
@@ -111,15 +117,17 @@ function SetPlayerObjectPos(amx, player, objID, x, y, z)
111117
end
112118
obj.x, obj.y, obj.z = x, y, z
113119
clientCall(player, 'SetPlayerObjectPos', objID, x, y, z)
120+
return true
114121
end
115122

116123
function SetPlayerObjectRot(amx, player, objID, rX, rY, rZ)
117124
local obj = g_PlayerObjects[player] and g_PlayerObjects[player][objID]
118125
if not obj then
119-
return
126+
return false
120127
end
121128
obj.rx, obj.ry, obj.rz = rX, rY, rZ
122129
clientCall(player, 'SetPlayerObjectRot', objID, rX, rY, rZ)
130+
return true
123131
end
124132

125133
local function getPlayerObjectPos(amx, player, objID)
@@ -154,6 +162,7 @@ function GetPlayerObjectPos(amx, player, objID, refX, refY, refZ)
154162
writeMemFloat(amx, refX, x)
155163
writeMemFloat(amx, refY, y)
156164
writeMemFloat(amx, refZ, z)
165+
return true
157166
end
158167

159168
function GetPlayerObjectRot(amx, player, objID, refX, refY, refZ)
@@ -164,6 +173,7 @@ function GetPlayerObjectRot(amx, player, objID, refX, refY, refZ)
164173
writeMemFloat(amx, refX, obj.rx)
165174
writeMemFloat(amx, refY, obj.ry)
166175
writeMemFloat(amx, refZ, obj.rz)
176+
return true
167177
end
168178

169179
function GetPlayerObjectModel(amx, player, object)
@@ -178,12 +188,13 @@ end
178188
function DestroyPlayerObject(amx, player, objID)
179189
g_PlayerObjects[player][objID] = nil
180190
clientCall(player, 'DestroyPlayerObject', objID)
191+
return true
181192
end
182193

183194
function MovePlayerObject(amx, player, objID, x, y, z, speed)
184195
local obj = g_PlayerObjects[player] and g_PlayerObjects[player][objID]
185196
if not obj then
186-
return
197+
return false
187198
end
188199
local distance = getDistanceBetweenPoints3D(x, y, z, getPlayerObjectPos(amx, player, objID))
189200
local duration = distance/speed*1000
@@ -193,12 +204,13 @@ function MovePlayerObject(amx, player, objID, x, y, z, speed)
193204
local timer = setTimer(procCallOnAll, duration, 1, 'OnPlayerObjectMoved', getElemID(player), objID)
194205
obj.moving = { x = x, y = y, z = z, starttick = getTickCount(), duration = duration, timer = timer }
195206
clientCall(player, 'MovePlayerObject', objID, x, y, z, speed)
207+
return true
196208
end
197209

198210
function StopPlayerObject(amx, player, objID)
199211
local obj = g_PlayerObjects[player] and g_PlayerObjects[player][objID]
200212
if not obj then
201-
return
213+
return false
202214
end
203215
if obj.moving then
204216
obj.x, obj.y, obj.z = getPlayerObjectPos(amx, player, objID)
@@ -208,6 +220,7 @@ function StopPlayerObject(amx, player, objID)
208220
obj.moving = nil
209221
end
210222
clientCall(player, 'StopPlayerObject', objID)
223+
return true
211224
end
212225

213226

0 commit comments

Comments
 (0)