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

Fix sitting model crashing

Browse Source
This commit is contained in:
UnknownShadow200 2018-08-02 00:32:31 +10:00
parent 967505a469
commit 42a99951eb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ClassicalSharp/Entities/Model/ModelCache.cs
View File

@ -79,6 +79,7 @@ namespace ClassicalSharp.Model {
void InitModel(CachedModel m) { void InitModel(CachedModel m) {
m.Instance.CreateParts(); m.Instance.CreateParts();
m.Instance.index = 0;
m.Instance.initalised = true; m.Instance.initalised = true;
} }

12
src/Client/ModelCache.c
View File

@ -28,6 +28,12 @@ static void ModelCache_ContextRecreated(void* obj) {
ModelCache_Vb = Gfx_CreateDynamicVb(VERTEX_FORMAT_P3FT2FC4B, MODELCACHE_MAX_VERTICES); ModelCache_Vb = Gfx_CreateDynamicVb(VERTEX_FORMAT_P3FT2FC4B, MODELCACHE_MAX_VERTICES);
} }
static void ModelCache_InitModel(struct IModel* model) {
model->CreateParts();
model->initalised = true;
model->index = 0;
}
struct IModel* ModelCache_Get(STRING_PURE String* name) { struct IModel* ModelCache_Get(STRING_PURE String* name) {
UInt32 i; UInt32 i;
for (i = 0; i < ModelCache_modelCount; i++) { for (i = 0; i < ModelCache_modelCount; i++) {
@ -35,8 +41,7 @@ struct IModel* ModelCache_Get(STRING_PURE String* name) {
if (!String_CaselessEquals(&m->Name, name)) continue; if (!String_CaselessEquals(&m->Name, name)) continue;
if (!m->Instance->initalised) { if (!m->Instance->initalised) {
m->Instance->CreateParts(); ModelCache_InitModel(m->Instance);
m->Instance->initalised = true;
} }
return m->Instance; return m->Instance;
} }
@ -1282,8 +1287,7 @@ static void ModelCache_RegisterDefaultModels(void) {
ModelCache_RegisterTexture("zombie.png"); ModelCache_RegisterTexture("zombie.png");
ModelCache_Register("humanoid", "char.png", HumanoidModel_GetInstance()); ModelCache_Register("humanoid", "char.png", HumanoidModel_GetInstance());
HumanoidModel_CreateParts(); ModelCache_InitModel(&HumanoidModel);
HumanoidModel.initalised = true;
ModelCache_Register("chicken", "chicken.png", ChickenModel_GetInstance()); ModelCache_Register("chicken", "chicken.png", ChickenModel_GetInstance());
ModelCache_Register("creeper", "creeper.png", CreeperModel_GetInstance()); ModelCache_Register("creeper", "creeper.png", CreeperModel_GetInstance());