summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/control/Replay.cpp3
-rw-r--r--src/core/Game.cpp6
-rw-r--r--src/core/General.h2
-rw-r--r--src/entities/Dummy.cpp2
-rw-r--r--src/entities/Entity.cpp2
-rw-r--r--src/objects/DummyObject.cpp2
-rw-r--r--src/objects/Object.cpp23
-rw-r--r--src/objects/Projectile.cpp2
-rw-r--r--src/peds/PedRoutes.cpp2
-rw-r--r--src/peds/PedStats.cpp2
-rw-r--r--src/render/Fluff.cpp2
-rw-r--r--src/render/WaterCreatures.cpp82
-rw-r--r--src/render/WaterCreatures.h12
-rw-r--r--src/render/WaterLevel.cpp10
-rw-r--r--src/rw/Lights.h1
-rw-r--r--src/vehicles/Heli.cpp16
16 files changed, 100 insertions, 69 deletions
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index 45f1a143..0aec58bb 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -51,6 +51,7 @@
#include "Camera.h"
#include "Radar.h"
#include "Fluff.h"
+#include "WaterCreatures.h"
uint8 CReplay::Mode;
CAddressInReplayBuffer CReplay::Record;
@@ -1300,7 +1301,7 @@ void CReplay::TriggerPlayback(uint8 cam_mode, float cam_x, float cam_y, float ca
DMAudio.SetEffectsFadeVol(0);
DMAudio.SetMusicFadeVol(0);
CEscalators::Shutdown();
- // TODO(MIAMI): CWaterCreatures::RemoveAll();
+ CWaterCreatures::RemoveAll();
int current;
for (current = 0; current < NUM_REPLAYBUFFERS; current++)
if (BufferStatus[current] == REPLAYBUFFER_RECORD)
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 6ba6b191..a8637980 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -90,6 +90,7 @@
#include "debugmenu.h"
#include "Ropes.h"
#include "WindModifiers.h"
+#include "WaterCreatures.h"
#include "postfx.h"
#include "custompipes.h"
@@ -478,8 +479,7 @@ bool CGame::ShutDown(void)
CPlane::Shutdown();
CTrain::Shutdown();
CScriptPaths::Shutdown();
- // TODO(Miami)
- // CWaterCreatures::RemoveAll();
+ CWaterCreatures::RemoveAll();
CSpecialFX::Shutdown();
#ifndef PS2
CGarages::Shutdown();
@@ -650,7 +650,7 @@ void CGame::ShutDownForRestart(void)
CRadar::RemoveRadarSections();
FrontEndMenuManager.UnloadTextures();
CParticleObject::RemoveAllExpireableParticleObjects();
- //CWaterCreatures::RemoveAll(); //TODO(Miami)
+ CWaterCreatures::RemoveAll();
CSetPieces::Init();
CPedType::Shutdown();
CSpecialFX::Shutdown();
diff --git a/src/core/General.h b/src/core/General.h
index 7ab444a4..7e06b96e 100644
--- a/src/core/General.h
+++ b/src/core/General.h
@@ -2,6 +2,8 @@
#include <ctype.h>
+// --MIAMI: file done
+
class CGeneral
{
public:
diff --git a/src/entities/Dummy.cpp b/src/entities/Dummy.cpp
index 92b69761..544e24a6 100644
--- a/src/entities/Dummy.cpp
+++ b/src/entities/Dummy.cpp
@@ -4,6 +4,8 @@
#include "World.h"
#include "Dummy.h"
+// --MIAMI: file done
+
void *CDummy::operator new(size_t sz) { return CPools::GetDummyPool()->New(); }
void CDummy::operator delete(void *p, size_t sz) { CPools::GetDummyPool()->Delete((CDummy*)p); }
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index d7159e8c..2285c93f 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -1230,7 +1230,7 @@ void CEntity::SetRwObjectAlpha(int32 alpha) {
if (m_rwObject != nil) {
switch (RwObjectGetType(m_rwObject)) {
case rpATOMIC: {
- RpGeometry *geometry = RpAtomicGetGeometry(GetFirstAtomic(GetClump()));
+ RpGeometry *geometry = RpAtomicGetGeometry((RpAtomic*)m_rwObject);
RpGeometrySetFlags(geometry, RpGeometryGetFlags(geometry) | rpGEOMETRYMODULATEMATERIALCOLOR);
RpGeometryForAllMaterials(geometry, SetAtomicAlphaCB, (void*)alpha);
break;
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/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/peds/PedRoutes.cpp b/src/peds/PedRoutes.cpp
index 3ff080e6..2de90eae 100644
--- a/src/peds/PedRoutes.cpp
+++ b/src/peds/PedRoutes.cpp
@@ -3,6 +3,8 @@
#include "main.h"
#include "PedRoutes.h"
+// --MIAMI: file done
+
CRouteNode gaRoutes[NUMPEDROUTES];
void
diff --git a/src/peds/PedStats.cpp b/src/peds/PedStats.cpp
index 1f7a95b4..fe594bdf 100644
--- a/src/peds/PedStats.cpp
+++ b/src/peds/PedStats.cpp
@@ -4,6 +4,8 @@
#include "FileMgr.h"
#include "PedStats.h"
+// --MIAMI: file done
+
CPedStats *CPedStats::ms_apPedStats[NUM_PEDSTATS];
void
diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp
index f175d872..773561f3 100644
--- a/src/render/Fluff.cpp
+++ b/src/render/Fluff.cpp
@@ -1713,4 +1713,4 @@ void CScriptPaths::Save_ForReplay(void) {
g_pScriptPathObjects[6 * i + j] = aArray[i].m_pObjects[j];
}
}
-} \ No newline at end of file
+}
diff --git a/src/render/WaterCreatures.cpp b/src/render/WaterCreatures.cpp
index 51228073..90f24183 100644
--- a/src/render/WaterCreatures.cpp
+++ b/src/render/WaterCreatures.cpp
@@ -86,17 +86,17 @@ CWaterCreature::~CWaterCreature() {
//looks like unused
}
-void CWaterCreature::Initialise(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, int eFishSlotState) {
+void CWaterCreature::Initialise(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state) {
this->m_pObj = pObj;
this->m_fRightMult = fRightMult;
- this->m_fZTurnSpeed = 0.0f;
+ this->m_fZTurnSpeed = fZTurnSpeed;
this->m_fWaterDepth = fWaterDepth;
this->m_alpha = alpha;
- this->m_state = eFishSlotState;
+ this->m_state = state;
}
-void CWaterCreature::Allocate(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, int eFishSlotState) {
- CWaterCreature::Initialise(pObj, fRightMult, fZTurnSpeed, fWaterDepth, alpha, eFishSlotState);
+void CWaterCreature::Allocate(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state) {
+ CWaterCreature::Initialise(pObj, fRightMult, fZTurnSpeed, fWaterDepth, alpha, state);
}
void CWaterCreature::Free() {
@@ -111,7 +111,7 @@ CWaterCreature *CWaterCreatures::GetFishStructSlot() {
return nil;
}
-CObject *CWaterCreatures::CreateSeaLifeForm(CVector pos, int16 modelID, float zRotAngle) {
+CObject *CWaterCreatures::CreateSeaLifeForm(CVector const& pos, int16 modelID, int32 zRotAngle) {
if (CObject::nNoTempObjects >= 40)
return nil;
@@ -151,23 +151,24 @@ float CWaterCreatures::CalculateFishHeading(CVector const& pos1, CVector const&
return Atan2(-delta.x, delta.y);
}
-void CWaterCreatures::CreateOne(CVector pos, int16 modelID) {
+void CWaterCreatures::CreateOne(CVector const& pos, int32 modelID) {
if (!IsSpaceForMoreWaterCreatures())
return;
+ CVector storedPos = pos;
float fDepth, fLevelNoWaves;
- if (TheCamera.IsSphereVisible(pos, 3.0f)
- && CWaterLevel::GetWaterDepth(pos, &fDepth, &fLevelNoWaves, nil) && fDepth > 4.5f) {
+ if (!TheCamera.IsSphereVisible(storedPos, 3.0f)
+ && CWaterLevel::GetWaterDepth(storedPos, &fDepth, &fLevelNoWaves, nil) && fDepth > 4.5f) {
- if (modelID == -1 || modelID > 64)
+ if (modelID == -1 || modelID < 0 || modelID > 64)
modelID = CGeneral::GetRandomNumberInRange(0, 64);
WaterCreatureProperties *creature = &aProperties[modelID];
- pos.z = fLevelNoWaves - creature->fLevel;
- float fRightMult = CGeneral::GetRandomNumberInRange(0.0f, 0.01f);
- float angle = CWaterCreatures::CalculateFishHeading(FindPlayerPed()->GetPosition(), pos);
+ storedPos.z = fLevelNoWaves - creature->fLevel;
+ float fRightMult = CGeneral::GetRandomNumberInRange(0.0f, creature->fRightMult) + 0.01f;
+ float angle = CWaterCreatures::CalculateFishHeading(FindPlayerPed()->GetPosition(), storedPos);
- CObject *fish = CreateSeaLifeForm(pos, modelID, angle);
+ CObject *fish = CreateSeaLifeForm(storedPos, *(int16*)creature->modelID, angle);
if (!fish) return;
fish->SetRwObjectAlpha(255);
@@ -188,32 +189,36 @@ void CWaterCreatures::UpdateAll() {
CVector playerPos = FindPlayerPed()->GetPosition();
for (int i = 0; i < NUM_WATER_CREATURES; i++) {
switch (aWaterCreatures[i].m_state) {
- case WATER_CREATURE_ALLOCATED:
- case WATER_CREATURE_ACTIVE: {
+ case WATER_CREATURE_ACTIVE:
aWaterCreatures[i].m_pObj->m_nEndOfLifeTime = CTimer::GetTimeInMilliseconds() + 40000;
- if (aWaterCreatures[i].m_pObj->GetIsOnScreen()) {
- if ((playerPos - aWaterCreatures[i].m_pObj->GetPosition()).Magnitude() < SQR(75.0f)) {
- if (aWaterCreatures[i].m_alpha < 255)
- aWaterCreatures[i].m_alpha = Min(aWaterCreatures[i].m_alpha + 4, 255);
- CVector newRight = aWaterCreatures[i].m_pObj->GetRight();
- newRight.Normalise();
- aWaterCreatures[i].m_pObj->m_vecMoveSpeed = newRight * aWaterCreatures[i].m_fRightMult;
- aWaterCreatures[i].m_pObj->m_vecTurnSpeed = CVector(0.0f, 0.0f, aWaterCreatures[i].m_fZTurnSpeed);
- aWaterCreatures[i].m_pObj->bIsStatic = false;
- float fDepth = 0.0;
- CWaterLevel::GetWaterDepth(aWaterCreatures[i].m_pObj->GetPosition(), &fDepth, nil, nil);
- if (fDepth < 0.0f) {
- if (aWaterCreatures[i].m_pObj->m_nEndOfLifeTime <= CTimer::GetTimeInMilliseconds() + 40000)
- aWaterCreatures[i].m_state = WATER_CREATURE_ACTIVE;
- }
- else {
- aWaterCreatures[i].m_state = WATER_CREATURE_UPDATE;
- }
-
+ if (!aWaterCreatures[i].m_pObj->GetIsOnScreen()) {
+ aWaterCreatures[i].m_pObj->SetRwObjectAlpha(0);
+ aWaterCreatures[i].m_state = WATER_CREATURE_TO_REMOVE;
+ break;
+ }
+ case WATER_CREATURE_ALLOCATED: {
+ if ((playerPos - aWaterCreatures[i].m_pObj->GetPosition()).Magnitude() < SQR(75.0f)) {
+ if (aWaterCreatures[i].m_alpha < 255)
+ aWaterCreatures[i].m_alpha = Min(aWaterCreatures[i].m_alpha + 4, 255);
+ aWaterCreatures[i].m_pObj->SetRwObjectAlpha(aWaterCreatures[i].m_alpha);
+ CVector newRight = aWaterCreatures[i].m_pObj->GetRight();
+ newRight.Normalise();
+ aWaterCreatures[i].m_pObj->m_vecMoveSpeed = newRight * aWaterCreatures[i].m_fRightMult;
+ aWaterCreatures[i].m_pObj->m_vecTurnSpeed = CVector(0.0f, 0.0f, aWaterCreatures[i].m_fZTurnSpeed);
+ aWaterCreatures[i].m_pObj->bIsStatic = false;
+ float fDepth = 0.0;
+ CWaterLevel::GetWaterDepth(aWaterCreatures[i].m_pObj->GetPosition(), &fDepth, nil, nil);
+ if (aWaterCreatures[i].m_fWaterDepth < fDepth) {
+ if (aWaterCreatures[i].m_pObj->m_nEndOfLifeTime - 40000 <= CTimer::GetTimeInMilliseconds())
+ aWaterCreatures[i].m_state = WATER_CREATURE_ACTIVE;
}
else {
- aWaterCreatures[i].m_state = WATER_CREATURE_TO_REMOVE;
+ aWaterCreatures[i].m_state = WATER_CREATURE_UPDATE;
}
+
+ }
+ else {
+ aWaterCreatures[i].m_state = WATER_CREATURE_TO_REMOVE;
}
break;
}
@@ -237,15 +242,14 @@ void CWaterCreatures::UpdateAll() {
}
break;
}
- case WATER_CREATURE_TO_REMOVE: {
+ case WATER_CREATURE_TO_REMOVE:
if (aWaterCreatures[i].m_pObj)
CWorld::Remove(aWaterCreatures[i].m_pObj);
FreeFishStructSlot(&aWaterCreatures[i]);
nNumActiveSeaLifeForms--;
aWaterCreatures[i].m_state = WATER_CREATURE_DISABLED;
break;
- }
- case WATER_CREATURE_DISABLED:
+ default:
break;
}
}
diff --git a/src/render/WaterCreatures.h b/src/render/WaterCreatures.h
index b935b11d..7dcaa288 100644
--- a/src/render/WaterCreatures.h
+++ b/src/render/WaterCreatures.h
@@ -1,7 +1,7 @@
#pragma once
#include "Object.h"
-enum {
+enum eFishSlotState {
WATER_CREATURE_ALLOCATED = 0,
WATER_CREATURE_ACTIVE,
WATER_CREATURE_UPDATE,
@@ -20,9 +20,9 @@ public:
CWaterCreature();
~CWaterCreature();
- void Allocate(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, int eFishSlotState);
+ void Allocate(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state);
void Free();
- void Initialise(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, int eFishSlotState);
+ void Initialise(CObject *pObj, float fRightMult, float fZTurnSpeed, float fWaterDepth, uint32 alpha, eFishSlotState state);
};
class CWaterCreatures {
@@ -30,8 +30,8 @@ class CWaterCreatures {
public:
static CWaterCreature aWaterCreatures[NUM_WATER_CREATURES];
static int32 nNumActiveSeaLifeForms;
- static CObject *CreateSeaLifeForm(CVector pos, int16 modelID, float zRotAngle);
- static void CreateOne(CVector pos, int16 modelID);
+ static CObject *CreateSeaLifeForm(CVector const& pos, int16 modelID, int32 zRotAngle);
+ static void CreateOne(CVector const& pos, int32 modelID);
static void UpdateAll();
static void FreeFishStructSlot(CWaterCreature *wc);
static bool IsSpaceForMoreWaterCreatures();
@@ -44,6 +44,6 @@ struct WaterCreatureProperties {
int16 *modelID;
float fRightMult;
float fLevel;
- float fUnk2;
+ float fUnknown; //unused
float fWaterDepth;
}; \ No newline at end of file
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 995dbec5..ec9485d2 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -27,6 +27,7 @@
#include "Replay.h"
#include "WaterLevel.h"
#include "SurfaceTable.h"
+#include "WaterCreatures.h"
#define RwIm3DVertexSet_RGBA(vert, rgba) RwIm3DVertexSetRGBA(vert, rgba.red, rgba.green, rgba.blue, rgba.alpha) // (RwRGBAAssign(&(_dst)->color, &_src))
@@ -2821,8 +2822,7 @@ CWaterLevel::HandleSeaLifeForms()
}
else if ( (CTimer::GetTimeInMilliseconds() - timecounter) > 5000 )
{
-//TODO(MIAMI)
-// if ( CWaterCreatures::IsSpaceForMoreWaterCreatures() )
+ if ( CWaterCreatures::IsSpaceForMoreWaterCreatures() )
{
for ( int32 i = 0; i < 3; i++ )
{
@@ -2838,14 +2838,12 @@ CWaterLevel::HandleSeaLifeForms()
vecPos.x += (fCos - fSin) * fAngle;
vecPos.y += (fSin + fCos) * fAngle;
- //TODO(MIAMI)
- //CWaterCreatures::CreateOne(vecPos, -1);
+ CWaterCreatures::CreateOne(vecPos, -1);
}
}
}
- //TODO(MIAMI)
- //CWaterCreatures::UpdateAll();
+ CWaterCreatures::UpdateAll();
}
void
diff --git a/src/rw/Lights.h b/src/rw/Lights.h
index b296816b..c3543d77 100644
--- a/src/rw/Lights.h
+++ b/src/rw/Lights.h
@@ -22,3 +22,4 @@ void SetAmbientColours(void);
void SetAmbientColoursForPedsCarsAndObjects(void);
void SetAmbientColoursToIndicateRoadGroup(int i);
void SetAmbientColours(RwRGBAReal *color);
+void SetFullAmbient(void);
diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp
index a770f83d..2c2fb33c 100644
--- a/src/vehicles/Heli.cpp
+++ b/src/vehicles/Heli.cpp
@@ -1011,14 +1011,16 @@ CHeli::TestSniperCollision(CVector *line0, CVector *line1)
bool hit = false;
for(i = 0; i < NUM_HELIS; i++){
- CVector pilotPos = pHelis[i]->GetMatrix() * CVector(-0.43f, 1.49f, 1.5f);
- if(pHelis[i] && !pHelis[i]->bBulletProof && CCollision::DistToLine(line0, line1, &pilotPos) < 0.8f){
- pHelis[i]->m_fAngularSpeed = CGeneral::GetRandomTrueFalse() ? 0.05f : -0.05f;
- pHelis[i]->m_heliStatus = HELI_STATUS_SHOT_DOWN;
- pHelis[i]->m_nExplosionTimer = CTimer::GetTimeInMilliseconds() + 9999999;
- pHelis[i]->m_numSwat = 0;
+ if(pHelis[i] && !pHelis[i]->bBulletProof) {
+ CVector pilotPos = pHelis[i]->GetMatrix() * CVector(-0.43f, 1.49f, 1.5f);
+ if(CCollision::DistToLine(line0, line1, &pilotPos) < 0.8f){
+ pHelis[i]->m_fAngularSpeed = CGeneral::GetRandomTrueFalse() ? 0.05f : -0.05f;
+ pHelis[i]->m_heliStatus = HELI_STATUS_SHOT_DOWN;
+ pHelis[i]->m_nExplosionTimer = CTimer::GetTimeInMilliseconds() + 9999999;
+ pHelis[i]->m_numSwat = 0;
- hit = true;
+ hit = true;
+ }
}
}
return hit;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 02:44:53 +0100