AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-15 10:35:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

C client: Fix invalid chibi texture, fixes #541 (thanks igor725)

Browse Source
This commit is contained in:
UnknownShadow200 2018-09-17 00:32:29 +10:00
parent 44173bb36e
commit eb623f2746
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ModelCache.c
View File

@ -934,7 +934,8 @@ static void ChibiModel_CreateParts(void) {
static struct BoxDesc torso = { static struct BoxDesc torso = {
BOXDESC_TEX(16,16), 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_ROT(0,6,0),
}; BoxDesc_BuildBox(&Chibi_Set.Torso, &torso); }; BoxDesc_BuildBox(&Chibi_Set.Torso, &torso);
@ -947,19 +948,21 @@ static void ChibiModel_CreateParts(void) {
static struct BoxDesc torsoL = { static struct BoxDesc torsoL = {
BOXDESC_TEX(16,32), 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_BOUNDS(-1.75f,5.75f,-0.75f, 2.25f,12.25f,1.25f),
BOXDESC_ROT(0,6,0), BOXDESC_ROT(0,6,0),
}; BoxDesc_BuildBox(&Chibi_Set.TorsoLayer, &torsoL); }; BoxDesc_BuildBox(&Chibi_Set.TorsoLayer, &torsoL);
static struct BoxDesc arm = { static struct BoxDesc arm = {
BOXDESC_TEX(0,16), BOXDESC_TEX(40,16),
BOXDESC_BOX(2,6,-1, 4,12,1), BOXDESC_DIMS(4,12,-2, 8,24,2),
BOXDESC_BOUNDS(2,6,-1, 4,12,1),
BOXDESC_ROT(2.5f,11,0), BOXDESC_ROT(2.5f,11,0),
}; };
static struct BoxDesc leg = { static struct BoxDesc leg = {
BOXDESC_TEX(40,16), BOXDESC_TEX(0,16),
BOXDESC_BOX(0,0,-1, 2,6,1), BOXDESC_DIMS(0,0,-2, 4,12,2),
BOXDESC_BOUNDS(0,0,-1, 2,6,1),
BOXDESC_ROT(0,6,0), BOXDESC_ROT(0,6,0),
}; };
HumanModel_CreateLimbs(&Chibi_Set, 0.25f, &arm, &leg); HumanModel_CreateLimbs(&Chibi_Set, 0.25f, &arm, &leg);

1
src/Platform.c
View File

@ -703,6 +703,7 @@ void Font_Make(FontDesc* desc, STRING_PURE String* fontName, UInt16 size, UInt16
} }
void Font_Free(FontDesc* desc) { void Font_Free(FontDesc* desc) {
if (!desc->Handle) return;
if (!DeleteObject(desc->Handle)) ErrorHandler_Fail("Deleting font handle failed"); if (!DeleteObject(desc->Handle)) ErrorHandler_Fail("Deleting font handle failed");
desc->Handle = NULL; desc->Handle = NULL;
} }