summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
author_AG <gennariarmando@outlook.com>2019-07-07 15:26:55 +0200
committer_AG <gennariarmando@outlook.com>2019-07-07 15:26:59 +0200
commit0c34fb1bb2239b1433719bb410b71e0c28840c85 (patch)
tree3c4cbbba0e633777e47bb6dfd55e8e33cae30706 /src
parentMerge branch 'master' of https://github.com/gtamodding/re3 (diff)
downloadre3-0c34fb1bb2239b1433719bb410b71e0c28840c85.tar
re3-0c34fb1bb2239b1433719bb410b71e0c28840c85.tar.gz
re3-0c34fb1bb2239b1433719bb410b71e0c28840c85.tar.bz2
re3-0c34fb1bb2239b1433719bb410b71e0c28840c85.tar.lz
re3-0c34fb1bb2239b1433719bb410b71e0c28840c85.tar.xz
re3-0c34fb1bb2239b1433719bb410b71e0c28840c85.tar.zst
re3-0c34fb1bb2239b1433719bb410b71e0c28840c85.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/Stats.h2
-rw-r--r--src/peds/Ped.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/Stats.h b/src/core/Stats.h
index a5670020..30058a59 100644
--- a/src/core/Stats.h
+++ b/src/core/Stats.h
@@ -5,7 +5,7 @@ class CStats
public:
static int32 &DaysPassed;
static int32 &HeadShots;
- static bool& CommercialPassed;
+ static bool& CommercialPassed;
static int32 &NumberKillFrenziesPassed;
static int32 &PeopleKilledByOthers;
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index e4cc848e..016fea2f 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -2702,9 +2702,9 @@ CPed::QuitEnteringCar(void)
bUsesCollision = true;
if (IsPlayer() && GetWeapon()->m_eWeaponType == WEAPONTYPE_UZI) {
- if (IsPlayer() && m_storedWeapon != NO_STORED_WEAPON) {
+ if (IsPlayer() && m_storedWeapon != WEAPONTYPE_UNIDENTIFIED) {
SetCurrentWeapon(m_storedWeapon);
- m_storedWeapon = NO_STORED_WEAPON;
+ m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
}
} else {
CWeaponInfo *curWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);