aboutsummaryrefslogtreecommitdiff
path: root/src/common/Collision/Maps/MapTree.h
diff options
context:
space:
mode:
authorModoX <moardox@gmail.com>2022-12-30 00:02:40 +0100
committerShauren <shauren.trinity@gmail.com>2024-11-18 22:39:04 +0100
commit225a1bbf7dabdc318bd340e15afa7378a7622612 (patch)
tree42edee4ba164b829e7585760af97347786f66ce7 /src/common/Collision/Maps/MapTree.h
parentcf27f1cf39c4ba3fb644f0a0e8659e90ff935fac (diff)
Core/Vmaps: Fix inconsistency of hitInstance and hitModel to cause wrong area ids (#28632)
Closes #19761 Closes #28326 Co-authored-by: Gosha <284210+Lordron@users.noreply.github.com> (cherry picked from commit 6ce66659929cbd680a91dd5caa1a5957f30b0716)
Diffstat (limited to 'src/common/Collision/Maps/MapTree.h')
-rw-r--r--src/common/Collision/Maps/MapTree.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h
index bcb24f58709..c70e94a6352 100644
--- a/src/common/Collision/Maps/MapTree.h
+++ b/src/common/Collision/Maps/MapTree.h
@@ -30,6 +30,12 @@ namespace VMAP
enum class LoadResult : uint8;
enum class ModelIgnoreFlags : uint32;
+ struct GroupLocationInfo
+ {
+ const GroupModel* hitModel = nullptr;
+ int32 rootId = -1;
+ };
+
struct TC_COMMON_API LocationInfo
{
LocationInfo(): rootId(-1), hitInstance(nullptr), hitModel(nullptr), ground_Z(-G3D::finf()) { }