a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 00:00:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #215 from Sergeanur/FixCPickup

Browse source 
Fix CPickup
This commit is contained in:
erorcun 2019-10-01 20:15:02 +03:00 committed by GitHub
parent 1f7008ffd3 9149367f86
commit 10e42d7d66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/control/Pickups.h
View file

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