From e1caeb7eaf4d4e699086c1ffc6ddfb60e3001230 Mon Sep 17 00:00:00 2001
From: Marvin D <41352111+IcePixelx@users.noreply.github.com>
Date: Sat, 3 Dec 2022 15:42:06 +0100
Subject: [PATCH] movetype and datamap_t fixes.
---
r5dev/public/const.h | 21 +++++++++++++++++++++
r5dev/public/datamap.h | 6 +++---
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/r5dev/public/const.h b/r5dev/public/const.h
index b797e11a..648bd798 100644
--- a/r5dev/public/const.h
+++ b/r5dev/public/const.h
@@ -30,4 +30,25 @@ enum RenderMode_t
kRenderModeCount, // must be last
};
+enum MoveType_t
+{
+ MOVETYPE_NONE = 0, // never moves
+ MOVETYPE_ISOMETRIC, // For players -- in TF2 commander view, etc.
+ MOVETYPE_WALK, // Player only - moving on the ground
+ MOVETYPE_STEP, // gravity, special edge handling -- monsters use this
+ MOVETYPE_FLY, // No gravity, but still collides with stuff
+ MOVETYPE_FLYGRAVITY, // flies through the air + is affected by gravity
+ MOVETYPE_FLY_NO_COLLIDE,// No gravity, no collision
+ MOVETYPE_VPHYSICS, // uses VPHYSICS for simulation
+ MOVETYPE_PUSH, // no clip to world, push and crush
+ MOVETYPE_NOCLIP, // No gravity, no collisions, still do velocity/avelocity
+ MOVETYPE_OBSERVER, // Observer movement, depends on player's observer mode
+ MOVETYPE_CUSTOM, // Allows the entity to describe its own physics
+ MOVETYPE_TRAVERSE, // ?
+ MOVETYPE_RODEO, // Currently rodeo'ing.
+ MOVETYPE_OPERATOR, // ?
+ MOVETYPE_MELEE_LUNGE, // Currently in melee lunge
+ MOVETYPE_ZEROG // ?
+};
+
#endif // CONST_H
\ No newline at end of file
diff --git a/r5dev/public/datamap.h b/r5dev/public/datamap.h
index b9f58be3..a7d0f9c4 100644
--- a/r5dev/public/datamap.h
+++ b/r5dev/public/datamap.h
@@ -10,11 +10,11 @@ struct typedescription_t;
struct datamap_t
{
typedescription_t* dataDesc;
- int dataNumFields;
- int unk1_;
+ int unk1;
+ int unk2;
const char* dataClassName;
uint64_t packed_size;
- int64_t unk2;
+ int64_t dataNumFields;
datamap_t* baseMap;
// Verify size.
};