From 936999e9d209c6a2b5cc6a64a26b38d3eb620d34 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 13 Nov 2022 10:10:44 +1000 Subject: [PATCH] Remove modelmgrPrintCounts --- src/game/lv.c | 1 - src/game/modelmgr.c | 66 ---------------------------------------- src/game/modelmgrreset.c | 6 ---- 3 files changed, 73 deletions(-) diff --git a/src/game/lv.c b/src/game/lv.c index 63a9efd0b..68ae0ad35 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -2052,7 +2052,6 @@ void lvTick(void) PROFILE(PROFILEMARKER_LVT_SND, sndTick()); PROFILE(PROFILEMARKER_LVT_PAK, pakExecuteDebugOperations()); PROFILE(PROFILEMARKER_LVT_LIGHTING, lightingTick()); - PROFILE(PROFILEMARKER_LVT_MODELMGR, modelmgrPrintCounts()); PROFILE(PROFILEMARKER_LVT_BOLTBEAMS, boltbeamsTick()); if (g_AmActive) { diff --git a/src/game/modelmgr.c b/src/game/modelmgr.c index f8e278ae2..7bace3331 100644 --- a/src/game/modelmgr.c +++ b/src/game/modelmgr.c @@ -16,11 +16,6 @@ struct modelrwdatabinding *g_ModelRwdataBindings[3]; s32 g_MaxModels = 0; s32 g_MaxAnims = 0; bool g_ModelIsLvResetting = false; -s32 g_ModelMostType1 = 0; -s32 g_ModelMostType2 = 0; -s32 g_ModelMostType3 = 0; -s32 g_ModelMostModels = 0; -s32 g_ModelMostAnims = 0; #define NUMTYPE1() 35 #define NUMTYPE2() 25 @@ -32,67 +27,6 @@ bool modelmgrCanSlotFitRwdata(struct model *modelslot, struct modelfiledata *mod || (modelslot->rwdatas != NULL && modelslot->rwdatalen >= modeldef->rwdatalen); } -void modelmgrPrintCounts(void) -{ - s32 i; - s32 numtype1 = 0; - s32 numtype2 = 0; - s32 numtype3 = 0; - s32 nummodels = 0; - s32 numanims = 0; - - for (i = 0; i < NUMTYPE1(); i++) { - if (g_ModelRwdataBindings[0][i].model) { - numtype1++; - } - } - - for (i = 0; i < NUMTYPE2(); i++) { - if (g_ModelRwdataBindings[1][i].model) { - numtype2++; - } - } - - for (i = 0; i < NUMTYPE3(); i++) { - if (g_ModelRwdataBindings[2][i].model) { - numtype3++; - } - } - - for (i = 0; i < g_MaxModels; i++) { - if (g_ModelSlots[i].filedata) { - nummodels++; - } - } - - for (i = 0; i < g_MaxAnims; i++) { - if (g_AnimSlots[i].animnum != -1) { - numanims++; - } - } - - if (numtype1 > g_ModelMostType1) { - g_ModelMostType1 = numtype1; - } - - if (numtype2 > g_ModelMostType2) { - g_ModelMostType2 = numtype2; - } - - if (numtype3 > g_ModelMostType3) { - g_ModelMostType3 = numtype3; - } - - if (nummodels > g_ModelMostModels) { - g_ModelMostModels = nummodels; - } - - if (numanims > g_ModelMostAnims) { - g_ModelMostAnims = numanims; - } - -} - struct model *modelmgrInstantiateModel(struct modelfiledata *modeldef, bool withanim) { struct model *model = NULL; diff --git a/src/game/modelmgrreset.c b/src/game/modelmgrreset.c index c33a23f7f..920cf76ce 100644 --- a/src/game/modelmgrreset.c +++ b/src/game/modelmgrreset.c @@ -148,12 +148,6 @@ void modelmgrAllocateSlots(s32 numobjs, s32 numchrs) for (i = 0; i < g_MaxAnims; i++) { g_AnimSlots[i].animnum = -1; } - - g_ModelMostType1 = 0; - g_ModelMostType2 = 0; - g_ModelMostType3 = 0; - g_ModelMostModels = 0; - g_ModelMostAnims = 0; } bool modelmgrLoadProjectileModeldefs(s32 weaponnum)