thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix obj_get_model_id_extended returning wrong model ids (#757)

Browse source
This commit is contained in:
PeachyPeach 2025-04-27 23:22:58 +02:00 • committed by GitHub
parent ea353af5c9
commit 04ae492e8b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/pc/lua/utils/smlua_model_utils.c
View file

@ -504,12 +504,22 @@ u16 smlua_model_util_load(enum ModelExtendedId extId) {
return (u16)id;
}
static void smlua_model_util_unregister_model_id(u32 id, struct ModelUtilsInfo *models, u32 count) {
for (u32 i = 0; i < count; i++) {
struct ModelUtilsInfo *m = &models[i];
if (m->loadedId == id) {
m->loadedId = UNLOADED_ID;
}
}
}
// Links the regular model id created by DynOS to our models list
void smlua_model_util_register_model_id(u32 id, const void *asset) {
if (id < VANILLA_ID_END) {
for (u32 i = 0; i < E_MODEL_MAX; i++) {
struct ModelUtilsInfo* m = &sModels[i];
if (m->asset == asset) {
smlua_model_util_unregister_model_id(id, sModels, E_MODEL_MAX);
m->loadedId = id;
return;
}
@ -518,6 +528,7 @@ void smlua_model_util_register_model_id(u32 id, const void *asset) {
for (u32 i = 0; i < sCustomModelsCount; i++) {
struct ModelUtilsInfo* m = &sCustomModels[i];
if (m->asset == asset) {
smlua_model_util_unregister_model_id(id, sCustomModels, sCustomModelsCount);
m->loadedId = id;
return;
}