From 311e240bfd9cec9b1cbce660b7ae4ba82133d57e Mon Sep 17 00:00:00 2001
From: korenkonder <admin@mysterious-home.net>
Date: Tue, 5 Mar 2024 13:22:34 +0300
Subject: [PATCH] Removed unused fields in aet_db and spr_db

---
 src/KKdLib/database/aet.cpp    |  7 -------
 src/KKdLib/database/aet.hpp    |  3 ---
 src/KKdLib/database/sprite.cpp | 11 ++++-------
 src/KKdLib/database/sprite.hpp |  3 ---
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/KKdLib/database/aet.cpp b/src/KKdLib/database/aet.cpp
index f4ffdc17..48bdcdbb 100644
--- a/src/KKdLib/database/aet.cpp
+++ b/src/KKdLib/database/aet.cpp
@@ -34,7 +34,6 @@ aet_db_aet_file::~aet_db_aet_file() {
 
 aet_db_aet::aet_db_aet() : load_count() {
     id = -1;
-    name_hash = hash_murmurhash_empty;
 }
 
 aet_db_aet::~aet_db_aet() {
@@ -53,8 +52,6 @@ aet_db_aet_set_file::~aet_db_aet_set_file() {
 
 aet_db_aet_set::aet_db_aet_set() {
     id = -1;
-    name_hash = hash_murmurhash_empty;
-    file_name_hash = hash_murmurhash_empty;
     index = -1;
     sprite_set_id = -1;
 }
@@ -262,9 +259,7 @@ void aet_database::add(aet_database_file* aet_db_file) {
         aet_db_aet_set& aet_set = aet_sets.back();
         aet_set.id = i.id;
         aet_set.name.assign(i.name);
-        aet_set.name_hash = hash_string_murmurhash(aet_set.name);
         aet_set.file_name.assign(i.file_name);
-        aet_set.file_name_hash = hash_string_murmurhash(aet_set.file_name);
         aet_set.index = (uint32_t)(aet_sets_count + i.index);
         aet_set.sprite_set_id = i.sprite_set_id;
 
@@ -281,7 +276,6 @@ void aet_database::add(aet_database_file* aet_db_file) {
             aet_db_aet& aet = aets.back();
             aet.id = j.id;
             aet.name.assign(j.name);
-            aet.name_hash = hash_string_murmurhash(aet.name);
             aet.info = { j.index, (uint16_t)aet_set.index };
             aet.load_count = 1;
 
@@ -361,7 +355,6 @@ void aet_database::parse(const aet_db_aet_set_file* set_file,
 
         aet->id = id;
         aet->name.assign(i.name);
-        aet->name_hash = hash_string_murmurhash(aet->name);
         aet->info = { i.index, set_index };
         aet->load_count++;
 
diff --git a/src/KKdLib/database/aet.hpp b/src/KKdLib/database/aet.hpp
index ef1e91da..ee82c7a0 100644
--- a/src/KKdLib/database/aet.hpp
+++ b/src/KKdLib/database/aet.hpp
@@ -70,7 +70,6 @@ struct aet_db_aet_file {
 struct aet_db_aet {
     uint32_t id;
     std::string name;
-    uint32_t name_hash;
     aet_info info;
     int32_t load_count;
 
@@ -93,9 +92,7 @@ struct aet_db_aet_set_file {
 struct aet_db_aet_set {
     uint32_t id;
     std::string name;
-    uint32_t name_hash;
     std::string file_name;
-    uint32_t file_name_hash;
     uint32_t index;
     uint32_t sprite_set_id;
 
diff --git a/src/KKdLib/database/sprite.cpp b/src/KKdLib/database/sprite.cpp
index c2390107..9b796988 100644
--- a/src/KKdLib/database/sprite.cpp
+++ b/src/KKdLib/database/sprite.cpp
@@ -33,7 +33,6 @@ spr_db_spr_file::~spr_db_spr_file() {
 
 spr_db_spr::spr_db_spr() : load_count() {
     id = -1;
-    name_hash = hash_murmurhash_empty;
 }
 
 spr_db_spr::~spr_db_spr() {
@@ -51,8 +50,6 @@ spr_db_spr_set_file::~spr_db_spr_set_file() {
 
 spr_db_spr_set::spr_db_spr_set() {
     id = -1;
-    name_hash = hash_murmurhash_empty;
-    file_name_hash = hash_murmurhash_empty;
     index = -1;
 }
 
@@ -259,9 +256,7 @@ void sprite_database::add(sprite_database_file* spr_db_file) {
         spr_db_spr_set& spr_set = spr_sets.back();
         spr_set.id = i.id;
         spr_set.name.assign(i.name);
-        spr_set.name_hash = hash_string_murmurhash(spr_set.name);
         spr_set.file_name.assign(i.file_name);
-        spr_set.file_name_hash = hash_string_murmurhash(spr_set.file_name);
         spr_set.index = (uint32_t)(sprite_sets_count + i.index);
 
         spr_set_ids.push_back(spr_set.id, &spr_set);
@@ -277,7 +272,6 @@ void sprite_database::add(sprite_database_file* spr_db_file) {
             spr_db_spr& spr = sprs.back();
             spr.id = j.id;
             spr.name.assign(j.name);
-            spr.name_hash = hash_string_murmurhash(spr.name);
             //spr.info = { j.index, (uint16_t)((j.texture ? 0x1000 : 0x0000) | spr_set.index) };
             spr.info = { j.index, (uint16_t)((j.texture ? 0x4000 : 0x0000) | spr_set.index) };
             spr.load_count = 1;
@@ -334,6 +328,10 @@ void sprite_database::parse(const spr_db_spr_set_file* set_file,
 
     uint16_t set_index = (uint16_t)elem->second->index;
 
+    spr_db_spr_set* spr_set = elem->second;
+    spr_set->name.assign(set_file->name);
+    spr_set->file_name.assign(set_file->file_name);
+
     spr_set_names.push_back(set_file->name, elem->second);
 
     sprite_ids.reserve(set_file->sprite.size());
@@ -360,7 +358,6 @@ void sprite_database::parse(const spr_db_spr_set_file* set_file,
 
         spr->id = id;
         spr->name.assign(i.name);
-        spr->name_hash = hash_string_murmurhash(spr->name);
         //spr->info = { i.index, (uint16_t)((i.texture ? 0x1000 : 0x0000) | set_index) };
         spr->info = { i.index, (uint16_t)((i.texture ? 0x4000 : 0x0000) | set_index) };
         spr->load_count++;
diff --git a/src/KKdLib/database/sprite.hpp b/src/KKdLib/database/sprite.hpp
index b3978f2f..c0d5413e 100644
--- a/src/KKdLib/database/sprite.hpp
+++ b/src/KKdLib/database/sprite.hpp
@@ -71,7 +71,6 @@ struct spr_db_spr_file {
 struct spr_db_spr {
     uint32_t id;
     std::string name;
-    uint32_t name_hash;
     spr_info info;
     int32_t load_count;
 
@@ -93,9 +92,7 @@ struct spr_db_spr_set_file {
 struct spr_db_spr_set {
     uint32_t id;
     std::string name;
-    uint32_t name_hash;
     std::string file_name;
-    uint32_t file_name_hash;
     uint32_t index;
 
     spr_db_spr_set();