Update DB (add typeds from hideout level)

Fixed bug in db loader
Small refactoring in decompose.py & CMakeLists.txt

Author: DronCode

Diff for: Tools/GMSInfo/CMakeLists.txt

@@ -7,7 +7,9 @@ if (NOT CMAKE_SIZEOF_VOID_P EQUAL 4) # TODO: Think about how to do it better
     message(FATAL_ERROR "Supported only x86 arch!")
 endif()
 
-add_executable(HBM_GMSTool ${CMAKE_CURRENT_SOURCE_DIR}/source/main.cpp)
+file(GLOB_RECURSE GMSTOOL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/source/*.cc ${CMAKE_CURRENT_SOURCE_DIR}/source/*.c)
+add_executable(HBM_GMSTool ${GMSTOOL_SOURCES})
+
 target_link_libraries(HBM_GMSTool PRIVATE fmt::fmt nlohmann_json zlibstatic)
 target_compile_definitions(HBM_GMSTool PRIVATE -D_CRT_SECURE_NO_WARNINGS=1)
 target_include_directories(HBM_GMSTool PRIVATE

Diff for: Tools/GMSInfo/data/typeids.json

@@ -83,5 +83,10 @@
   "0x100034":  ["ZSlider","ZCONTROL"],
   "0x8000049": ["ZWINOBJSPRITEHOLDER","ZLIST"],
   "0x20004C":  ["ZKerningFont","ZTTFONT"],
-  "0x80100032": ["ZCONTROL","ZWINGROUP"]
+  "0x80100032": ["ZCONTROL","ZWINGROUP"],
+  "0x100434":  ["ZHM3ItemAmmo","ZItemAmmo"],
+  "0x10042B":  ["ZHM3ItemWeapon","ZItemWeapon"],
+  "0x10042D":  ["ZHM3ItemWeaponCustom","ZHM3ItemWeapon"],
+  "0x4000022": ["ZSHAPE","ZGEOM"],
+  "0x1007D3":  ["ZItemTemplate","ZGROUP"]
 }

Diff for: Tools/GMSInfo/source/main.cpp

@@ -9,15 +9,15 @@
 
 #include <array>
 #include <string>
+#include <fstream>
 #include <unordered_map>
 
 extern "C" {
 #include "zlib.h"
 }
 
-#include "GlacierTypeDefs.h"
-
-#include "nlohmann/json.hpp"
+#include <GlacierTypeDefs.h>
+#include <nlohmann/json.hpp>
 #include <fmt/format.h>
 
 #define GLACIER_GMS_ZLIB_WBTS -15
@@ -43,34 +43,25 @@ std::unordered_map<std::string, std::array<std::string, 2>> g_typeInfoDB;
 
 void loadTypesDataBase()
 {
-    FILE* fp = fopen("typeids.json", "r");
-    if (!fp)
+    std::ifstream fileStream("typeids.json", std::ifstream::binary);
+    if (!fileStream)
     {
-        printf("Failed to load typeids.json! All types will not be undecorated!\n");
+        printf("Failed to open typeids.json! All types will be not resolved!\n");
         return;
     }
 
-    fseek(fp, 0L, SEEK_END);
-    size_t bufferSize = ftell(fp);
-    rewind(fp);
-    char* buffer = (char*)calloc(1, bufferSize);
-    fread(buffer, bufferSize, 1, fp);
-    fclose(fp);
-
-    std::string sv(buffer, bufferSize);
-
-    /// parse json
     try
     {
-        nlohmann::json j = nlohmann::json::parse(sv);
-        nlohmann::adl_serializer<decltype(g_typeInfoDB)>::from_json(j, g_typeInfoDB);
-        printf("Type Information Database loaded!\n");
-    }
-    catch (nlohmann::json::exception& ex)
+        auto db = nlohmann::json::parse(fileStream);
+        nlohmann::adl_serializer<decltype(g_typeInfoDB)>::from_json(db, g_typeInfoDB);
+        printf("Type information DB loaded!\n");
+    } catch (nlohmann::json::exception& ex)
     {
         printf("Bad typeids.json file! JSON Error: %s\n", ex.what());
         throw;
     }
+
+    fileStream.close();
 }
 
 std::string getEntityTypeAsStringIfItPossible(unsigned int typeIndex)

Diff for: Tools/GMSInfo/utils/decompose.py

@@ -11,25 +11,26 @@ def generate_definitions(input_definitions_file, output_cpp_header_file):
             class_list = []
             used_keys_set = set()
 
-            for typeId in type_info_file_json:
-                if not type_info_file_json[typeId][0] in used_keys_set:
-                    used_keys_set.add(type_info_file_json[typeId][0])
+            for type_id in type_info_file_json:
+                if not type_info_file_json[type_id][0] in used_keys_set:
+                    used_keys_set.add(type_info_file_json[type_id][0])
                     class_list.append("\t\t{}_{} = {}".format(
-                        type_info_file_json[typeId][0],
-                        type_info_file_json[typeId][1],
-                        typeId))
+                        type_info_file_json[type_id][0],
+                        type_info_file_json[type_id][1],
+                        type_id))
                 else:
                     for copy_index in range(1, 100):
-                        if not "{}_{}".format(type_info_file_json[typeId][0], copy_index) in used_keys_set:
+                        if not "{}_{}".format(type_info_file_json[type_id][0], copy_index) in used_keys_set:
                             class_list.append("\t\t{}_{}_{} = {}".format(
-                                type_info_file_json[typeId][0],
-                                type_info_file_json[typeId][1],
+                                type_info_file_json[type_id][0],
+                                type_info_file_json[type_id][1],
                                 copy_index,
-                                typeId))
+                                type_id))
                             break
 
-            cpp_header_output_file.write("// THIS IS AUTOGENERATED FILE! DO NOT EDIT!\n")
-            cpp_header_output_file.write("// Generated by decompose.py at {}\n".format(datetime.datetime.now()))
+            cpp_header_output_file.write("/*\n")
+            cpp_header_output_file.write("   THIS IS AUTOGENERATED FILE! DO NOT EDIT!\n")
+            cpp_header_output_file.write("   Generated by decompose.py at {}\n*/\n\n".format(datetime.datetime.now()))
             cpp_header_output_file.write("#ifndef __GLACIER_TYPE_IDS_H__\n")
             cpp_header_output_file.write("#define __GLACIER_TYPE_IDS_H__\n\n")
             cpp_header_output_file.write("namespace Glacier {\n")
@@ -47,7 +48,7 @@ def generate_definitions(input_definitions_file, output_cpp_header_file):
     if len(sys.argv) < 3:
         print("""
             Usage:
-                python decompose.py [typeids.json file path] [GlacierTypeInfo.h output location]
+                python decompose.py [glacier types database file path] [header output location]
         """)
     else:
         generate_definitions(sys.argv[1], sys.argv[2])