From e77647659aceabcd3c41e2532747ee11c93c9d83 Mon Sep 17 00:00:00 2001 From: Turanszki Janos Date: Sat, 2 May 2020 02:27:07 +0100 Subject: [PATCH] fix 64bit entity hashing in 32bit build --- WickedEngine/wiECS.h | 3 +-- WickedEngine/wiVersion.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/WickedEngine/wiECS.h b/WickedEngine/wiECS.h index 855aaf30d..185331f88 100644 --- a/WickedEngine/wiECS.h +++ b/WickedEngine/wiECS.h @@ -3,7 +3,6 @@ #include "wiArchive.h" #include "wiRandom.h" -#include "wiHelper.h" #include #include @@ -28,7 +27,7 @@ namespace wiECS archive >> entity; if (entity != INVALID_ENTITY && seed > 0) { - wiHelper::hash_combine(entity, seed); + entity = ((entity << 1) ^ seed) >> 1; } } else diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 89e11355e..94d8cd530 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates const int minor = 40; // minor bug fixes, alterations, refactors, updates - const int revision = 5; + const int revision = 6; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);