Merge pull request #215 from Sergeanur/FixCPickup

Fix CPickup
This commit is contained in:
erorcun 2019-10-01 20:15:02 +03:00 committed by GitHub
commit 10e42d7d66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions

View File

@ -1,7 +1,7 @@
#pragma once
#include "Weapon.h"
enum ePickupType
enum ePickupType : uint8
{
PICKUP_NONE = 0,
PICKUP_IN_SHOP = 1,
@ -25,7 +25,8 @@ class CObject;
class CPickup
{
ePickupType m_eType;
ePickupType m_eType;
bool m_bRemoved;
uint16 m_wQuantity;
CObject *m_pObject;
uint32 m_nTimer;
@ -34,6 +35,8 @@ class CPickup
CVector m_vecPos;
};
static_assert(sizeof(CPickup) == 0x1C, "CPickup: error");
class CPickups
{
public: