From a01b14f301afe9cea86f47b3ab27ce999097741a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Fri, 9 Oct 2020 12:02:21 +0300
Subject: Fix sniper and water creatures bug, mark some files

---
 src/objects/DummyObject.cpp |  2 ++
 src/objects/Object.cpp      | 23 ++++++++++++++++++-----
 src/objects/Object.h        |  2 +-
 src/objects/Projectile.cpp  |  2 ++
 src/objects/Stinger.cpp     |  2 +-
 5 files changed, 24 insertions(+), 7 deletions(-)

(limited to 'src/objects')

diff --git a/src/objects/DummyObject.cpp b/src/objects/DummyObject.cpp
index 8dd1643d..8656abbb 100644
--- a/src/objects/DummyObject.cpp
+++ b/src/objects/DummyObject.cpp
@@ -3,6 +3,8 @@
 #include "DummyObject.h"
 #include "Pools.h"
 
+// --MIAMI: file done
+
 CDummyObject::CDummyObject(CObject *obj)
 {
 	SetModelIndexNoCreate(obj->GetModelIndex());
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index daa48d98..9a9eaa73 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -36,6 +36,7 @@ CObject::CObject(void)
 	m_colour2 = 0;
 	m_colour1 = m_colour2;
 	m_nBonusValue = 0;
+	// m_nCostValue = 0; // TODO(Miami)
 	bIsPickup = false;
 	bPickupObjWithMessage = false;
 	bOutOfStock = false;
@@ -44,8 +45,12 @@ CObject::CObject(void)
 	bHasBeenDamaged = false;
 	m_nRefModelIndex = -1;
 	bUseVehicleColours = false;
+//	bIsStreetLight = false;		// duplicate
 	m_pCurSurface = nil;
 	m_pCollidingEntity = nil;
+	m_nBeachballBounces = 0;
+	bIsStreetLight = false;
+	m_area = AREA_EVERYWHERE;
 }
 
 CObject::CObject(int32 mi, bool createRW)
@@ -138,12 +143,16 @@ CObject::Render(void)
 bool
 CObject::SetupLighting(void)
 {
-	DeActivateDirectional();
-	SetAmbientColours();
-
 	if(bRenderScorched){
 		WorldReplaceNormalLightsWithScorched(Scene.world, 0.1f);
 		return true;
+	} else if (bIsPickup) {
+		SetFullAmbient();
+		return true;
+	} else if (bIsWeapon) {
+		ActivateDirectional();
+		SetAmbientColoursForPedsCarsAndObjects();
+		return true;
 	}
 	return false;
 }
@@ -151,8 +160,10 @@ CObject::SetupLighting(void)
 void
 CObject::RemoveLighting(bool reset)
 {
-	if(reset)
-		WorldReplaceScorchedLightsWithNormal(Scene.world);
+	if(reset) {
+		SetAmbientColours();
+		DeActivateDirectional();
+	}
 }
 
 void 
@@ -363,6 +374,8 @@ CObject::CanBeDeleted(void)
 			return true;
 		case CUTSCENE_OBJECT:
 			return false;
+		case CONTROLLED_SUB_OBJECT:
+			return false;
 		default:
 			return true;
 	}
diff --git a/src/objects/Object.h b/src/objects/Object.h
index 5f0ec0ab..b81e84b6 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -8,7 +8,7 @@ enum {
 	MISSION_OBJECT = 2,
 	TEMP_OBJECT = 3,
 	CUTSCENE_OBJECT = 4,
-	ESCALATOR_OBJECT = 5,
+	CONTROLLED_SUB_OBJECT = 5,
 };
 
 enum CollisionSpecialResponseCase
diff --git a/src/objects/Projectile.cpp b/src/objects/Projectile.cpp
index fe8b0c68..fc4b25cf 100644
--- a/src/objects/Projectile.cpp
+++ b/src/objects/Projectile.cpp
@@ -2,6 +2,8 @@
 
 #include "Projectile.h"
 
+// --MIAMI: file done
+
 CProjectile::CProjectile(int32 model) : CObject()
 {
 	m_fMass = 1.0f;
diff --git a/src/objects/Stinger.cpp b/src/objects/Stinger.cpp
index f33125ee..b3660881 100644
--- a/src/objects/Stinger.cpp
+++ b/src/objects/Stinger.cpp
@@ -23,7 +23,7 @@ CStingerSegment::CStingerSegment()
 	m_fBuoyancy = GRAVITY * m_fMass * 0.1f;
 	bExplosionProof = true;
 	SetModelIndex(MI_PLC_STINGER);
-	ObjectCreatedBy = ESCALATOR_OBJECT;
+	ObjectCreatedBy = CONTROLLED_SUB_OBJECT;
 	NumOfStingerSegments++;
 }
 
-- 
cgit v1.2.3