From eb623f2746ebf52d0d35d7cea6e5ea0b7c65d789 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Mon, 17 Sep 2018 00:32:29 +1000
Subject: [PATCH] C client: Fix invalid chibi texture, fixes #541 (thanks
 igor725)

---
 src/ModelCache.c | 15 +++++++++------
 src/Platform.c   |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/ModelCache.c b/src/ModelCache.c
index 893b0c06e..cb1085a3b 100644
--- a/src/ModelCache.c
+++ b/src/ModelCache.c
@@ -934,7 +934,8 @@ static void ChibiModel_CreateParts(void) {
 
 	static struct BoxDesc torso = {
 		BOXDESC_TEX(16,16),
-		BOXDESC_BOX(-2,6,-1, 2,12,1),
+		BOXDESC_DIMS(-4,12,-2, 4,24,2),
+		BOXDESC_BOUNDS(-2,6,-1, 2,12,1),
 		BOXDESC_ROT(0,6,0),
 	}; BoxDesc_BuildBox(&Chibi_Set.Torso, &torso);
 
@@ -947,19 +948,21 @@ static void ChibiModel_CreateParts(void) {
 
 	static struct BoxDesc torsoL = {
 		BOXDESC_TEX(16,32),
-		BOXDESC_DIMS(-2,6,-1, 2,12,1),
+		BOXDESC_DIMS(-4,12,-2, 4,24,2),
 		BOXDESC_BOUNDS(-1.75f,5.75f,-0.75f, 2.25f,12.25f,1.25f),
 		BOXDESC_ROT(0,6,0),
 	}; BoxDesc_BuildBox(&Chibi_Set.TorsoLayer, &torsoL);
 
 	static struct BoxDesc arm = {
-		BOXDESC_TEX(0,16),
-		BOXDESC_BOX(2,6,-1, 4,12,1),
+		BOXDESC_TEX(40,16),
+		BOXDESC_DIMS(4,12,-2, 8,24,2),
+		BOXDESC_BOUNDS(2,6,-1, 4,12,1),
 		BOXDESC_ROT(2.5f,11,0),
 	};
 	static struct BoxDesc leg = {
-		BOXDESC_TEX(40,16),
-		BOXDESC_BOX(0,0,-1, 2,6,1),
+		BOXDESC_TEX(0,16),
+		BOXDESC_DIMS(0,0,-2, 4,12,2),
+		BOXDESC_BOUNDS(0,0,-1, 2,6,1),
 		BOXDESC_ROT(0,6,0),
 	};
 	HumanModel_CreateLimbs(&Chibi_Set, 0.25f, &arm, &leg);
diff --git a/src/Platform.c b/src/Platform.c
index 204793f22..af7dd4e45 100644
--- a/src/Platform.c
+++ b/src/Platform.c
@@ -703,6 +703,7 @@ void Font_Make(FontDesc* desc, STRING_PURE String* fontName, UInt16 size, UInt16
 }
 
 void Font_Free(FontDesc* desc) {
+	if (!desc->Handle) return;
 	if (!DeleteObject(desc->Handle)) ErrorHandler_Fail("Deleting font handle failed");
 	desc->Handle = NULL;
 }