fix class init

youneuoy · Oct 29, 2024 · 556715b · 556715b
1 parent e24fea6
commit 556715b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/M2TWEOP Code/M2TWEOP library/techFuncs.h b/M2TWEOP Code/M2TWEOP library/techFuncs.h
@@ -53,6 +53,7 @@ namespace techFuncs
 			add esp, 0x4
 			mov retMem, eax
 		}
+		std::memset(reinterpret_cast<void*>(retMem), 0, amount);
 		return reinterpret_cast<T*>(retMem);
 	}
 

diff --git a/M2TWEOP Code/M2TWEOP library/types/faction.cpp b/M2TWEOP Code/M2TWEOP library/types/faction.cpp
@@ -133,8 +133,11 @@ void factionRecord::setFactionBattleModel(const std::string& model, const int ch
 	const auto charTypeEntry = &descrCharacterPtr->entries[characterType];
 	const auto factionEntry = charTypeEntry->ptrsToDescrCharacterFactionEntries[id];
 	factionEntry->battleMod = techFuncs::createGameClass<eduOfficer>();
+	factionEntry->battleMod->name = nullptr;
+	factionEntry->battleMod->nameHash = 0;
 	factionEntry->battleMod->modelGroup = 0;
 	factionEntry->battleMod->modelIndex = 0;
+	factionEntry->battleMod->modelEntry = nullptr;
 	gameStringHelpers::setHashedString(&factionEntry->battleMod->name, model.c_str());
 	factionEntry->battleMod->modelEntry = battleMod;
 }