diff options
author | aap <aap@papnet.eu> | 2020-12-19 17:27:01 +0100 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-12-19 17:27:01 +0100 |
commit | 2a51e1da0456e9b7397562102d3241e5c3ddbd6e (patch) | |
tree | 308cfd8f4e23e713fec89e041d92ecc96ba462c5 /src/modelinfo | |
parent | anim compression (diff) | |
parent | Merge pull request #891 from Nick007J/miami (diff) | |
download | re3-2a51e1da0456e9b7397562102d3241e5c3ddbd6e.tar re3-2a51e1da0456e9b7397562102d3241e5c3ddbd6e.tar.gz re3-2a51e1da0456e9b7397562102d3241e5c3ddbd6e.tar.bz2 re3-2a51e1da0456e9b7397562102d3241e5c3ddbd6e.tar.lz re3-2a51e1da0456e9b7397562102d3241e5c3ddbd6e.tar.xz re3-2a51e1da0456e9b7397562102d3241e5c3ddbd6e.tar.zst re3-2a51e1da0456e9b7397562102d3241e5c3ddbd6e.zip |
Diffstat (limited to 'src/modelinfo')
-rw-r--r-- | src/modelinfo/BaseModelInfo.h | 4 | ||||
-rw-r--r-- | src/modelinfo/ModelIndices.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h index 3aa0857a..23ba5e66 100644 --- a/src/modelinfo/BaseModelInfo.h +++ b/src/modelinfo/BaseModelInfo.h @@ -58,9 +58,9 @@ public: bool DoesOwnColModel(void) { return m_bOwnsColModel; } void DeleteCollisionModel(void); void ClearTexDictionary(void) { m_txdSlot = -1; } - short GetObjectID(void) { return m_objectId; } + int16 GetObjectID(void) { return m_objectId; } void SetObjectID(int16 id) { m_objectId = id; } - short GetTxdSlot(void) { return m_txdSlot; } + int16 GetTxdSlot(void) { return m_txdSlot; } void AddRef(void); void RemoveRef(void); void SetTexDictionary(const char *name); diff --git a/src/modelinfo/ModelIndices.cpp b/src/modelinfo/ModelIndices.cpp index 056c3733..98c7fb38 100644 --- a/src/modelinfo/ModelIndices.cpp +++ b/src/modelinfo/ModelIndices.cpp @@ -3,7 +3,7 @@ #include "General.h" #include "ModelIndices.h" -#define X(name, var) int16 var; +#define X(name, var) int16 var = -1; MODELINDICES #undef X |