summaryrefslogtreecommitdiffstats
path: root/src/modelinfo
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-10-17 07:23:01 +0200
committerSergeanur <s.anureev@yandex.ua>2020-10-17 07:23:01 +0200
commitef47dad566db734b1efda862c414cf89af53d07e (patch)
tree6e00e4f9cff641a19b8d4cd5edfb4276651e927f /src/modelinfo
parentupdate librw (diff)
downloadre3-ef47dad566db734b1efda862c414cf89af53d07e.tar
re3-ef47dad566db734b1efda862c414cf89af53d07e.tar.gz
re3-ef47dad566db734b1efda862c414cf89af53d07e.tar.bz2
re3-ef47dad566db734b1efda862c414cf89af53d07e.tar.lz
re3-ef47dad566db734b1efda862c414cf89af53d07e.tar.xz
re3-ef47dad566db734b1efda862c414cf89af53d07e.tar.zst
re3-ef47dad566db734b1efda862c414cf89af53d07e.zip
Diffstat (limited to 'src/modelinfo')
-rw-r--r--src/modelinfo/WeaponModelInfo.cpp4
-rw-r--r--src/modelinfo/WeaponModelInfo.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/modelinfo/WeaponModelInfo.cpp b/src/modelinfo/WeaponModelInfo.cpp
index 2a79fada..bd8f5cb8 100644
--- a/src/modelinfo/WeaponModelInfo.cpp
+++ b/src/modelinfo/WeaponModelInfo.cpp
@@ -40,10 +40,10 @@ CWeaponModelInfo::SetWeaponInfo(int32 weaponId)
m_atomics[2] = (RpAtomic*)weaponId;
}
-int32
+eWeaponType
CWeaponModelInfo::GetWeaponInfo(void)
{
- return (int32)(uintptr)m_atomics[2];
+ return (eWeaponType)(uintptr)m_atomics[2];
}
void
diff --git a/src/modelinfo/WeaponModelInfo.h b/src/modelinfo/WeaponModelInfo.h
index 5c690c29..548bf8a6 100644
--- a/src/modelinfo/WeaponModelInfo.h
+++ b/src/modelinfo/WeaponModelInfo.h
@@ -1,6 +1,7 @@
#pragma once
#include "SimpleModelInfo.h"
+#include "WeaponType.h"
class CWeaponModelInfo : public CSimpleModelInfo
{
@@ -18,5 +19,5 @@ public:
void Init(void);
void SetWeaponInfo(int32 weaponId);
- int32 GetWeaponInfo(void);
+ eWeaponType GetWeaponInfo(void);
};