From 1ffc37735ed247eef1f20997a0136ef8d866ebad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Sun, 19 Apr 2020 07:14:13 +0300
Subject: Struct cleanup, various fixes, enable PS2 rand

---
 src/objects/Object.cpp | 4 ++--
 src/objects/Object.h   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/objects')

diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index 8968c117..d03dd405 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -35,7 +35,7 @@ CObject::CObject(void)
 	m_colour1 = m_colour2;
 	m_nBonusValue = 0;
 	bIsPickup = false;
-	m_obj_flag2 = false;
+	bPickupObjWithMessage = false;
 	bOutOfStock = false;
 	bGlassCracked = false;
 	bGlassBroken = false;
@@ -315,7 +315,7 @@ CObject::Init(void)
 	ObjectCreatedBy = GAME_OBJECT;
 	bIsStatic = true;
 	bIsPickup = false;
-	m_obj_flag2 = false;
+	bPickupObjWithMessage = false;
 	bOutOfStock = false;
 	bGlassCracked = false;
 	bGlassBroken = false;
diff --git a/src/objects/Object.h b/src/objects/Object.h
index 081c285a..319ec4bc 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -47,13 +47,12 @@ public:
 	float m_fUprootLimit;
 	int8 ObjectCreatedBy;
 	int8 bIsPickup : 1;
-	int8 m_obj_flag2 : 1;
+	int8 bPickupObjWithMessage : 1;
 	int8 bOutOfStock : 1;
 	int8 bGlassCracked : 1;
 	int8 bGlassBroken : 1;
 	int8 bHasBeenDamaged : 1;
 	int8 bUseVehicleColours : 1;
-	int8 m_obj_flag80 : 1;
 	int8 m_nBonusValue; 
 	float m_fCollisionDamageMultiplier;
 	uint8 m_nCollisionDamageEffect;
-- 
cgit v1.2.3