Fixes #568

GrognardsFromHell · Mar 18, 2022 · c0fe23b · c0fe23b
1 parent ffcc8cc
commit c0fe23b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/TemplePlus/critter.cpp b/TemplePlus/critter.cpp
@@ -1224,6 +1224,8 @@ std::string LegacyCritterSystem::GetHairStyleFile(HairStyle style, const char *
 // Originally @ 1007E9D0
 void LegacyCritterSystem::UpdateModelEquipment(objHndl obj)
 {
+	if (mSuspendModelUpdate)
+		return;
 
 	UpdateAddMeshes(obj);
 	auto raceOffset = GetModelRaceOffset(obj, false);
@@ -1263,6 +1265,11 @@ void LegacyCritterSystem::UpdateModelEquipment(objHndl obj)
 	}
 }
 
+void LegacyCritterSystem::SuspendModelUpdate(bool state)
+{
+	mSuspendModelUpdate = state;
+}
+
 void LegacyCritterSystem::AddNpcAddMeshes(objHndl obj)
 {
 

diff --git a/TemplePlus/critter.h b/TemplePlus/critter.h
@@ -273,6 +273,7 @@ struct LegacyCritterSystem : temple::AddressTable
 	gfx::EncodedAnimId GetAnimId(objHndl critter, gfx::WeaponAnim anim);
 
 	void UpdateModelEquipment(objHndl obj);
+	void SuspendModelUpdate(bool state);
 
 	/**
 	 * This is called initially when the model is loaded for an object
@@ -380,6 +381,8 @@ struct LegacyCritterSystem : temple::AddressTable
 	std::unordered_map<int, std::vector<std::string>> mAddMeshes;
 
 	const std::vector<std::string>& GetAddMeshes(int matIdx, int raceOffset);
+
+	bool mSuspendModelUpdate = false;
 };
 
 extern LegacyCritterSystem critterSys;

diff --git a/TemplePlus/gamesystems/gamesystems.cpp b/TemplePlus/gamesystems/gamesystems.cpp
@@ -463,6 +463,10 @@ void GameSystems::AdvanceTime() {
 
 	for (auto system : mTimeAwareSystems) {
 		system->AdvanceTime(now);
+		/*if (timeGetTime() - now > 200) {
+			auto asdf = 1;
+			logger->debug("{} taking longer", system->GetName());
+		}*/
 	}
 
 }

diff --git a/TemplePlus/gamesystems/timeevents.cpp b/TemplePlus/gamesystems/timeevents.cpp
@@ -18,6 +18,7 @@
 #include "graphics/mapterrain.h"
 #include "objfade.h"
 #include "ui/ui_dialog.h"
+#include <tig/tig_timer.h>
 
 /*
 Internal system specification used by the time event system
@@ -1112,7 +1113,7 @@ void TimeEventSystem::AdvanceTime(uint32_t newTimeMs) {
 
 			// Expire event
 			auto sysSpec = GetTimeEventTypeSpec(node->evt.system);
-
+			auto now = TigGetSystemTime();
 			if (node->IsValid(0)) {
 				lastValid = *node;
 				sysSpec.expiredCallback(&node->evt);
@@ -1121,7 +1122,9 @@ void TimeEventSystem::AdvanceTime(uint32_t newTimeMs) {
 			if (sysSpec.removedCallback) {
 				sysSpec.removedCallback(&node->evt);
 			}
-
+			/*if (TigElapsedSystemTime(now) > 100) {
+				logger->trace("Slow callback detected on system {}",(int) node->evt.system);
+			}*/
 			auto evtSystemId = node->evt.system;
 			free(node);
 

diff --git a/TemplePlus/inventory.cpp b/TemplePlus/inventory.cpp
@@ -1606,9 +1606,13 @@ obj_f InventorySystem::GetInventoryNumField(objHndl objHnd)
 
 void InventorySystem::WieldBestAll(objHndl critter, objHndl tgt){
 
+	critterSys.SuspendModelUpdate(true); // added to improve perf
 	for (auto invIdx = INVENTORY_WORN_IDX_START; invIdx <  INVENTORY_WORN_IDX_END; invIdx++){
 		WieldBest(critter, invIdx, tgt);
 	}
+	critterSys.SuspendModelUpdate(false);
+
+	critterSys.UpdateModelEquipment(critter);
 }
 
 void InventorySystem::ForceRemove(objHndl item, objHndl parent){

diff --git a/TemplePlus/tig/tig_timer.h b/TemplePlus/tig/tig_timer.h
@@ -4,11 +4,11 @@
 #include <timeapi.h>
 
 /* 0x101E3500 */
-uint32_t TigGetSystemTime() {
+inline uint32_t TigGetSystemTime() {
 	return timeGetTime();
 }
 
 /* 0x101E3510 */
-int TigElapsedSystemTime(int refTime) {
+inline int TigElapsedSystemTime(int refTime) {
 	return timeGetTime() - refTime;
 }