Fix enum codegen

Author: OrfeasZ

Libraries/CodeGenLib/Src/CodeGen.cpp

@@ -40,6 +40,8 @@ void CodeGen::Generate(ZTypeRegistry* p_Registry, const std::filesystem::path& p
 	m_SDKEnumsHeader << std::endl;
 	m_SDKEnumsHeader << "#pragma once" << std::endl;
 	m_SDKEnumsHeader << std::endl;
+	m_SDKEnumsHeader << "#include <cstdint>" << std::endl;
+	m_SDKEnumsHeader << std::endl;
 
 	m_ReflectiveClassesHeaderFile << "/*" << std::endl;
 	m_ReflectiveClassesHeaderFile << " * WARNING: This file is automatically generated. DO NOT MODIFY unless you know what you're doing." << std::endl;
@@ -271,6 +273,24 @@ std::string NormalizeName(STypeID* p_Type)
 	return s_TypeName;
 }
 
+std::string GetEnumUnderlyingType(STypeID* p_Type)
+{
+	switch (p_Type->typeInfo()->m_nTypeSize) {
+		case 1:
+			return "int8_t";
+
+		case 2:
+			return "int16_t";
+
+		case 4:
+			return "int32_t";
+
+		default:
+			printf("Unsupported enum size %d for type %s. Defaulting to int32_t.\n", p_Type->typeInfo()->m_nTypeSize, p_Type->typeInfo()->m_pTypeName);
+			return "int32_t";
+	}
+}
+
 void CodeGen::GenerateEnum(STypeID* p_Type)
 {
 	auto s_Type = reinterpret_cast<IEnumType*>(p_Type->typeInfo());
@@ -284,12 +304,12 @@ void CodeGen::GenerateEnum(STypeID* p_Type)
 		std::ostringstream s_Stream;
 
 		s_Stream << "// 0x" << std::hex << std::uppercase << p_Type << " (Size: 0x" << std::hex << std::uppercase << s_Type->m_nTypeSize << ")" << std::dec << std::endl;
-		s_Stream << "enum class " << s_Type->m_pTypeName << std::endl;
+		s_Stream << "enum class " << s_Type->m_pTypeName << " : " << GetEnumUnderlyingType(p_Type) << std::endl;
 		s_Stream << "{" << std::endl;
 
 #if _M_X64
 		// TODO: Remove this. Temporary workaround until I figure out what's going on.
-		s_Type->m_entries.m_pAllocationEnd = nullptr;
+		s_Type->m_entries.m_pAllocationEnd = s_Type->m_entries.m_pEnd;
 		for (auto it = s_Type->m_entries.begin(); it != s_Type->m_entries.end(); ++it)
 		{
 			s_Enum[it->m_nValue] = it->m_pName;
@@ -322,12 +342,12 @@ void CodeGen::GenerateEnum(STypeID* p_Type)
 	{
 		std::ostringstream s_Stream;
 
-		s_Stream << "enum class " << NormalizeName(p_Type) << std::endl;
+		s_Stream << "enum class " << NormalizeName(p_Type) << " : " << GetEnumUnderlyingType(p_Type) << std::endl;
 		s_Stream << "{" << std::endl;
 
 #if _M_X64
 		// TODO: Remove this. Temporary workaround until I figure out what's going on.
-		s_Type->m_entries.m_pAllocationEnd = nullptr;
+		s_Type->m_entries.m_pAllocationEnd = s_Type->m_entries.m_pEnd;
 		for (auto it = s_Type->m_entries.begin(); it != s_Type->m_entries.end(); ++it)
 		{
 			s_Enum[it->m_nValue] = it->m_pName;
@@ -932,12 +952,12 @@ void CodeGen::GenerateReflectiveEnum(STypeID* p_Type)
 	std::ostringstream s_Stream;
 
 	s_Stream << "// Size: 0x" << std::hex << std::uppercase << s_Type->m_nTypeSize << std::dec << std::endl;
-	s_Stream << "enum class " << NormalizeName(p_Type) << std::endl;
+	s_Stream << "enum class " << NormalizeName(p_Type) << " : " << GetEnumUnderlyingType(p_Type) << std::endl;
 	s_Stream << "{" << std::endl;
 
 #if _M_X64
 	// TODO: Remove this. Temporary workaround until I figure out what's going on.
-	s_Type->m_entries.m_pAllocationEnd = nullptr;
+	s_Type->m_entries.m_pAllocationEnd = s_Type->m_entries.m_pEnd;
 	for (auto it = s_Type->m_entries.begin(); it != s_Type->m_entries.end(); ++it)
 		s_Stream << "\t" << it->m_pName << " = " << std::dec << it->m_nValue << "," << std::endl;
 #else