From 1a5d415ecbed4fb73f03c8e65e1271c4fdfd56ff Mon Sep 17 00:00:00 2001
From: GenZmeY <genzmey@gmail.com>
Date: Sun, 21 Mar 2021 01:22:49 +0300
Subject: [PATCH] fix character skins

- fixed a bug where the player couldn't choose a skin for steampunk outfit;
- fixed a bug when the effects of the costume were not displayed (for example, the glow of the reaper outfit).
---
 ServerExt/Classes/ExtCharacterInfo.uc | 34 +++------------------------
 ServerExt/Classes/ExtMenu_Gear.uc     |  2 +-
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/ServerExt/Classes/ExtCharacterInfo.uc b/ServerExt/Classes/ExtCharacterInfo.uc
index 3fdeba8..c0b4d94 100644
--- a/ServerExt/Classes/ExtCharacterInfo.uc
+++ b/ServerExt/Classes/ExtCharacterInfo.uc
@@ -2,32 +2,6 @@
 class ExtCharacterInfo extends Object
 	abstract;
 
-// Hack fix for not being able to compile materials in run-time.
-static final function CloneMIC(MaterialInstanceConstant B)
-{
-	local int i;
-	local MaterialInstanceConstant M;
-	local LinearColor C;
-	
-	M = MaterialInstanceConstant(B.Parent);
-	if (M==None)
-		return;
-	B.SetParent(M.Parent);
-	
-	for (i=0; i<M.TextureParameterValues.Length; ++i)
-		if (M.TextureParameterValues[i].ParameterValue!=None)
-			B.SetTextureParameterValue(M.TextureParameterValues[i].ParameterName,M.TextureParameterValues[i].ParameterValue);
-
-	for (i=0; i<M.ScalarParameterValues.Length; ++i)
-		B.SetScalarParameterValue(M.ScalarParameterValues[i].ParameterName,M.ScalarParameterValues[i].ParameterValue);
-	
-	for (i=0; i<M.VectorParameterValues.Length; ++i)
-	{
-		C = M.VectorParameterValues[i].ParameterValue;
-		B.SetVectorParameterValue(M.VectorParameterValues[i].ParameterName,C);
-	}
-}
-
 static final function Object SafeLoadObject(string S, Class ObjClass)
 {
 	local Object O;
@@ -51,7 +25,6 @@ static function InitCharacterMICs(KFCharacterInfo_Human C, KFPawn P, optional bo
 	if (P.Mesh != None)
 	{
 		P.CharacterMICs[0] = P.Mesh.CreateAndSetMaterialInstanceConstant(C.BodyMaterialID);
-		CloneMIC(P.CharacterMICs[0]);
 	}
 
 	// head MIC
@@ -143,8 +116,8 @@ static final function SetCharacterMeshFromArch(KFCharacterInfo_Human C, KFPawn K
 }
 
 static final function SetBodyMeshAndSkin(KFCharacterInfo_Human C,
-	byte CurrentBodyMeshIndex,
-	byte CurrentBodySkinIndex,
+	int CurrentBodyMeshIndex,
+	int CurrentBodySkinIndex,
 	KFPawn KFP,
 	KFPlayerReplicationInfo KFPRI)
 {
@@ -193,7 +166,7 @@ static final function SetBodyMeshAndSkin(KFCharacterInfo_Human C,
 	}
 }
 
-static final function SetBodySkinMaterial(KFCharacterInfo_Human C, OutfitVariants CurrentVariant, byte NewSkinIndex, KFPawn KFP)
+static final function SetBodySkinMaterial(KFCharacterInfo_Human C, OutfitVariants CurrentVariant, int NewSkinIndex, KFPawn KFP)
 {
 	local int i;
 
@@ -639,7 +612,6 @@ static final function SetFirstPersonArmsFromArch(KFCharacterInfo_Human C, KFPawn
 	if (bCustom && KFP.ArmsMesh.SkeletalMesh!=None && KFP.ArmsMesh.GetMaterial(0)!=None)
 	{
 		M = KFP.ArmsMesh.CreateAndSetMaterialInstanceConstant(0);
-		CloneMIC(M);
 	}
 }
 
diff --git a/ServerExt/Classes/ExtMenu_Gear.uc b/ServerExt/Classes/ExtMenu_Gear.uc
index 67148b1..599466d 100644
--- a/ServerExt/Classes/ExtMenu_Gear.uc
+++ b/ServerExt/Classes/ExtMenu_Gear.uc
@@ -388,7 +388,7 @@ function SetCurrentCharacterButtons()
 {
 	local bool bCustom;
 	local GFxObject DataObject;
-	local byte CharacterIndex, HeadMeshIndex, HeadSkinIndex, BodyMeshIndex, BodySkinIndex;
+	local int CharacterIndex, HeadMeshIndex, HeadSkinIndex, BodyMeshIndex, BodySkinIndex;
 
 	bCustom = ExtPRI.UsesCustomChar();
 	DataObject = CreateObject("Object");