Make 3d text labels show, also fix formatting. Fixes regarding vehicle deletion. Remove some dummy functions that actually had their implementations already added.

Author: colistro123

amx/client/client.lua

@@ -1139,22 +1139,16 @@ function renderTextLabels()
 			end
 
 			local screenX, screenY = getScreenFromWorldPosition(textlabel.X, textlabel.Y, textlabel.Z, textlabel.dist, false)
-			local pX, pY, pZ = getElementPosition(localPlayer)
+			local pX, pY, pZ, _, _, _ = getCameraMatrix()--getElementPosition(localPlayer)
 			local dist = getDistanceBetweenPoints3D(pX, pY, pZ, textlabel.X, textlabel.Y, textlabel.Z)
 			local vw = getElementDimension(localPlayer)
-			--[[if textlabel.attached then
-				local LOS = isLineOfSightClear(pX, pY, pZ, textlabel.X, textlabel.Y, textlabel.Z, true, true, true, true, true, false, false, textlabel.attachedTo)
-			else]] --íåðàáîòàåò, ïîõîæå ôóíêöèÿ isLineOfSightClearíå ðàáîòàåò ñ àðãóìåíòîì ignoredElement.
-				local LOS = isLineOfSightClear(pX, pY, pZ, textlabel.X, textlabel.Y, textlabel.Z, true, false, false)--ïîêà òàê, ïîòîì ðàçáåðóòñÿ ñ ôóíêöèåé ñäåëàåêàê íóæíî :)
-			--end
-			local len = string.len(textlabel.text)
-			if screenX and dist <= textlabel.dist and vw == textlabel.vw then
+			local LOS = isLineOfSightClear(pX, pY, pZ, textlabel.X, textlabel.Y, textlabel.Z, true, false, false)
+			
+			if screenX and dist <= textlabel.dist and (vw == textlabel.vw or textlabel.vw == -1) then --Because player textlabels don't have VW's, since we're processing both here
 				if not textlabel.los then
-					--dxDrawText(textlabel.text, screenX, screenY, screenWidth, screenHeight, tocolor ( 0, 0, 0, 255 ), 1, "default")--, "center", "center")--, true, false)
-					dxDrawText(textlabel.text, screenX, screenY, screenWidth, screenHeight, tocolor(textlabel.color.r, textlabel.color.g, textlabel.color.b, textlabel.color.a), 1, "default-bold")--, "center", "center", true, false)
+					dxDrawText(textlabel.text, screenX, screenY, screenX, screenY, tocolor(textlabel.color.r, textlabel.color.g, textlabel.color.b, textlabel.color.a), 1.0, "default-bold", "center", "top", false, false, false, true)
 				elseif LOS then
-					--dxDrawText(textlabel.text, screenX, screenY, screenWidth, screenHeight, tocolor ( 0, 0, 0, 255 ), 1, "default")--, "center", "center")--, true, false)
-					dxDrawText(textlabel.text, screenX - (len), screenY, screenWidth, screenHeight, tocolor(textlabel.color.r, textlabel.color.g, textlabel.color.b, textlabel.color.a), 1, "default-bold")--, "center", "center", true, false)
+					dxDrawText(textlabel.text, screenX, screenY, screenX, screenY, tocolor(textlabel.color.r, textlabel.color.g, textlabel.color.b, textlabel.color.a), 1.0, "default-bold", "center", "top", false, false, false, true)
 				end
 			end
 		end
@@ -1182,6 +1176,7 @@ function Create3DTextLabel(id, textlabel)
 	textlabel.id = id
 	textlabel.enabled = false
 	g_TextLabels[id] = textlabel
+	outputConsole('Created text label with id ' .. textlabel.id)
 end
 
 function Delete3DTextLabel(id)
@@ -1190,7 +1185,9 @@ function Delete3DTextLabel(id)
 end
 
 function Attach3DTextLabel(textlabel)
+	outputConsole('Attaching text label with id ' .. textlabel.id)
 	local id = textlabel.id
+	textlabel.enabled = true
 	g_TextLabels[id] = textlabel
 end
 

amx/server/defines.lua

@@ -201,6 +201,8 @@ PLAYER_VARTYPE_FLOAT = 3
 
 INVALID_ACTOR_ID = 0xFFFF
 INVALID_OBJECT_ID = 0xFFFF
+INVALID_PLAYER_ID = 0xFFFF
+INVALID_VEHICLE_ID = 0xFFFF
 
 ManualVehEngineAndLights = false
 ShowUnimplementedErrors = false

amx/server/events.lua

@@ -415,7 +415,7 @@ addEventHandler('onVehicleEnter', root,
 		end
 
 		if ManualVehEngineAndLights then
-			if (getVehicleType(source) ~= "Plane" and getVehicleType(source) ~= "Helicopter") then
+			if (g_Vehicles[vehID] and getVehicleType(source) ~= "Plane" and getVehicleType(source) ~= "Helicopter") then
 				setVehicleEngineState(source, g_Vehicles[vehID].engineState)
 			end
 		end
@@ -495,7 +495,7 @@ addEventHandler('onVehicleExplode', root,
 
 		procCallOnAll('OnVehicleDeath', vehID, 0)		-- NOES, MY VEHICLE DIED
 
-		if g_Vehicles[vehID].respawntimer then
+		if g_Vehicles[vehID] and g_Vehicles[vehID].respawntimer then
 			killTimer(g_Vehicles[vehID].respawntimer)
 			g_Vehicles[vehID].respawntimer = nil
 		end

amx/server/natives/a_objects.lua

@@ -1,5 +1,4 @@
 function CreateObject(amx, model, x, y, z, rX, rY, rZ)
-	outputConsole('CreateObject(' .. model .. ')')
 	local obj = createObject(model, x, y, z, rX, rY, rZ)
 	if obj == false then
 		obj = createObject(1337, x, y, z, rX, rY, rZ) --Create a dummy object anyway since createobject can also be used to make camera attachments
@@ -88,7 +87,6 @@ function IsObjectMoving(amx)
 end
 
 function CreatePlayerObject(amx, player, model, x, y, z, rX, rY, rZ)
-	outputConsole('CreatePlayerObject(' .. model .. ')')
 	if not g_PlayerObjects[player] then
 		g_PlayerObjects[player] = {}
 	end

amx/server/natives/a_players.lua

@@ -854,11 +854,6 @@ function SetPlayerVirtualWorld(amx, player, dimension)
 	setElementDimension(player, dimension)
 end
 
-function GetPlayerVirtualWorld(amx)
-	notImplemented('GetPlayerVirtualWorld')
-	return false
-end
-
 function EnableStuntBonusForAll(amx, enable)
 	notImplemented('EnableStuntBonusForAll')
 end

amx/server/natives/a_samp.lua

@@ -201,12 +201,6 @@ function GetVehiclePoolSize(amx)
 	return highestId
 end
 
-
-function GetActorPoolSize(amx)
-	notImplemented('GetActorPoolSize')
-	return false
-end
-
 -- Security
 
 function SHA256_PassHash(amx, pass, salt, ret_hash, ret_hash_len)
@@ -824,11 +818,7 @@ function GangZoneStopFlashForAll(amx, zone)
 end
 
 function Create3DTextLabel(amx, text, r, g, b, a, x, y, z, dist, vw, los)
-	text = text:lower()
-	for mta,samp in pairs(g_CommandMapping) do
-		text = text:gsub('/' .. samp, '/' .. mta)
-	end
-	local textlabel = { text = text, color = {r = r, g = g, b = b, a = a}, X = x, Y = y, Z = z, dist = dist, vw = vw, los = los }
+	local textlabel = { text = colorizeString(text), color = {r = r, g = g, b = b, a = a}, X = x, Y = y, Z = z, dist = dist, vw = vw, los = los }
 	local id = table.insert(g_TextLabels, textlabel)
 
 	textlabel.id = id
@@ -837,17 +827,29 @@ function Create3DTextLabel(amx, text, r, g, b, a, x, y, z, dist, vw, los)
 	return id
 end
 
-function CreatePlayer3DTextLabel(amx, player, text, r, g, b, a, x, y, z, dist, vw, los)
-	text = text:lower()
-	for mta,samp in pairs(g_CommandMapping) do
-		text = text:gsub('/' .. samp, '/' .. mta)
-	end
-	local textlabel = { text = text, color = {r = r, g = g, b = b, a = a}, X = x, Y = y, Z = z, dist = dist, vw = vw, los = los }
+function CreatePlayer3DTextLabel(amx, player, text, r, g, b, a, x, y, z, dist, attachedplayer, attachedvehicle, los)
+	local textlabel = { text = colorizeString(text), color = {r = r, g = g, b = b, a = a}, X = x, Y = y, Z = z, dist = dist, vw = -1, los = los, attached = false }
 	local id = table.insert(g_TextLabels, textlabel)
 
-	textlabel.id = id
+	textlabel.id = id	
+	if attachedplayer ~= INVALID_PLAYER_ID or attachedvehicle ~= INVALID_VEHICLE_ID then
+		textlabel.attached = true
+	end
 
+	if attachedplayer ~= INVALID_PLAYER_ID then
+		textlabel.attachedTo = g_Players[attachedplayer] and g_Players[attachedplayer].elem
+	end
+
+	if attachedvehicle ~= INVALID_VEHICLE_ID then
+		textlabel.attachedTo = g_Vehicles[attachedvehicle] and g_Vehicles[attachedvehicle].elem
+	end
+	
+	textlabel.offX = 0.0
+	textlabel.offY = 0.0
+	textlabel.offZ = 0.0
+	
 	clientCall(root, 'Create3DTextLabel', id, textlabel)
+
 	return id
 end
 

amx/server/natives/a_vehicles.lua

@@ -1,12 +1,12 @@
 CreateVehicle = AddStaticVehicleEx
 
 function DestroyVehicle(amx, vehicle)
-	clientCall(root, 'DestroyVehicle', getElemID(vehicle))
-	removeElem(g_Vehicles, vehicle)
 	local vehicleID = getElemID(vehicle)
+	clientCall(root, 'DestroyVehicle', vehicleID)
 	for i,playerdata in pairs(g_Players) do
 		playerdata.streamedVehicles[vehicleID] = nil
 	end
+	removeElem(g_Vehicles, vehicle)
 	destroyElement(vehicle)
 end
 

amx/server/syscalls.lua

@@ -655,7 +655,7 @@ g_SAMPSyscallPrototypes = {
 	HTTP = {'i', 'i', 's', 's', 's'},
 
 	Create3DTextLabel = {'s', 'c', 'f', 'f', 'f', 'f', 'i', 'i'},
-	CreatePlayer3DTextLabel = {'p', 's', 'c', 'f', 'f', 'f', 'f', 'i', 'i'},
+	CreatePlayer3DTextLabel = {'p', 's', 'c', 'f', 'f', 'f', 'f', 'i', 'i', 'i'},
 	Delete3DTextLabel = {'a'},
 	DeletePlayer3DTextLabel = {'p', 'a'},
 	Attach3DTextLabelToPlayer = {'a', 'p', 'f', 'f', 'f'},