Merge pull request #747 from xunder-matth/fix-GetObjectMaterial

Correctly retrieve `modelid` and material colors in `GetObjectMaterial(Text)`
openmultiplayer · Oct 21, 2023 · fe77600 · fe77600
2 parents 87710d4 + 4ac63eb
commit fe77600
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Server/Components/Pawn/Scripting/Object/Natives.cpp b/Server/Components/Pawn/Scripting/Object/Natives.cpp
@@ -282,9 +282,10 @@ SCRIPT_API(GetObjectMaterial, bool(IObject& object, int materialIndex, int& mode
 	bool result = object.getMaterialData(materialIndex, data);
 	if (result)
 	{
+		modelid = data->model;
 		textureLibrary = data->textOrTXD;
 		textureName = data->fontOrTexture;
-		materialColour = data->materialColour.RGBA();
+		materialColour = data->materialColour.ARGB();
 	}
 	return result;
 }
@@ -300,8 +301,8 @@ SCRIPT_API(GetObjectMaterialText, bool(IObject& object, int materialIndex, Outpu
 		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;