From: Mario <mario@smbclan.net>
Date: Fri, 28 Sep 2018 10:25:57 +0000 (+1000)
Subject: Fix client model fade distance fields being limited to 255
X-Git-Tag: xonotic-v0.8.5~1822
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5121eebf856be677b02ffc248f98eb29d9bf3cf9;p=xonotic%2Fxonotic-data.pk3dir.git

Fix client model fade distance fields being limited to 255
---

diff --git a/qcsrc/common/mapobjects/models.qc b/qcsrc/common/mapobjects/models.qc
index 4f07409b1..9fb61c230 100644
--- a/qcsrc/common/mapobjects/models.qc
+++ b/qcsrc/common/mapobjects/models.qc
@@ -148,10 +148,10 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
 			WriteVector(MSG_ENTITY, this.movedir);
 			WriteByte(MSG_ENTITY, floor(this.lip * 255));
 		}
-		WriteByte(MSG_ENTITY, this.fade_start);
-		WriteByte(MSG_ENTITY, this.fade_end);
-		WriteByte(MSG_ENTITY, this.alpha_max);
-		WriteByte(MSG_ENTITY, this.alpha_min);
+		WriteShort(MSG_ENTITY, bound(0, this.fade_start, 65535));
+		WriteShort(MSG_ENTITY, bound(0, this.fade_end, 65535));
+		WriteByte(MSG_ENTITY, floor(this.alpha_max * 256));
+		WriteByte(MSG_ENTITY, floor(this.alpha_min * 256));
 		WriteByte(MSG_ENTITY, this.inactive);
 		WriteShort(MSG_ENTITY, this.fade_vertical_offset);
 	}
@@ -390,10 +390,10 @@ NET_HANDLE(ENT_CLIENT_WALL, bool isnew)
 			this.movedir = ReadVector();
 			this.lip = ReadByte() / 255.0;
 		}
-		this.fade_start = ReadByte();
-		this.fade_end = ReadByte();
-		this.alpha_max = ReadByte();
-		this.alpha_min = ReadByte();
+		this.fade_start = ReadShort();
+		this.fade_end = ReadShort();
+		this.alpha_max = ReadByte() / 255.0;
+		this.alpha_min = ReadByte() / 255.0;
 		this.inactive = ReadByte();
 		this.fade_vertical_offset = ReadShort();
 		BGMScript_InitEntity(this);