Merge pull request #795 from mrreus/patch-1

Retrieve player objects material colors in a ARGB format
openmultiplayer · Dec 3, 2023 · a00777d · a00777d
2 parents 5490c87 + 49894e3
commit a00777d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Server/Components/Pawn/Scripting/Object/PlayerNatives.cpp b/Server/Components/Pawn/Scripting/Object/PlayerNatives.cpp
@@ -243,7 +243,7 @@ SCRIPT_API(GetPlayerObjectMaterial, bool(IPlayer& player, IPlayerObject& object,
 	{
 		textureLibrary = data->textOrTXD;
 		textureName = data->fontOrTexture;
-		materialColour = data->materialColour.RGBA();
+		materialColour = data->materialColour.ARGB();
 	}
 	return result;
 }
@@ -259,8 +259,8 @@ SCRIPT_API(GetPlayerObjectMaterialText, bool(IPlayer& player, IPlayerObject& obj
 		fontFace = data->fontOrTexture;
 		fontSize = data->fontSize;
 		bold = data->bold;
-		fontColour = data->fontColour.RGBA();
-		backgroundColour = data->backgroundColour.RGBA();
+		fontColour = data->fontColour.ARGB();
+		backgroundColour = data->backgroundColour.ARGB();
 		textAlignment = data->alignment;
 	}
 	return result;