summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/control/CarCtrl.cpp13
-rw-r--r--src/control/Garages.cpp12
-rw-r--r--src/control/PathFind.cpp6
-rw-r--r--src/control/Replay.cpp2
-rw-r--r--src/control/RoadBlocks.cpp11
-rw-r--r--src/control/Script.cpp6
-rw-r--r--src/core/Cam.cpp2
-rw-r--r--src/core/Camera.cpp45
-rw-r--r--src/core/Camera.h6
-rw-r--r--src/core/Frontend.cpp16
-rw-r--r--src/core/Game.cpp13
-rw-r--r--src/core/Pad.cpp2
-rw-r--r--src/core/Pools.cpp2
-rw-r--r--src/core/Radar.cpp6
-rw-r--r--src/core/templates.h71
-rw-r--r--src/entities/Entity.cpp6
-rw-r--r--src/extras/custompipes.h2
-rw-r--r--src/math/Matrix.cpp450
-rw-r--r--src/math/Matrix.h102
-rw-r--r--src/math/Vector.cpp18
-rw-r--r--src/render/Font.cpp2
-rw-r--r--src/render/SpecialFX.cpp2
-rw-r--r--src/render/Sprite2d.cpp6
-rw-r--r--src/render/Weather.cpp19
-rw-r--r--src/render/Weather.h1
-rw-r--r--src/save/GenericGameStorage.cpp5
-rw-r--r--src/weapons/Weapon.cpp15
27 files changed, 510 insertions, 331 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 15cfee11..6abeae64 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -36,6 +36,7 @@
#include "WaterLevel.h"
#include "World.h"
#include "Zones.h"
+#include "Pickups.h"
#define DISTANCE_TO_SPAWN_ROADBLOCK_PEDS (51.0f)
#define DISTANCE_TO_SCAN_FOR_DANGER (14.0f)
@@ -3219,8 +3220,9 @@ void CCarCtrl::GenerateEmergencyServicesCar(void)
CStreaming::RequestModel(MI_AMBULAN, STREAMFLAGS_DEPENDENCY);
CStreaming::RequestModel(MI_MEDIC, STREAMFLAGS_DONT_REMOVE);
if (CStreaming::HasModelLoaded(MI_AMBULAN) && CStreaming::HasModelLoaded(MI_MEDIC)){
- if (GenerateOneEmergencyServicesCar(MI_AMBULAN, pNearestAccident->m_pVictim->GetPosition()))
+ if (GenerateOneEmergencyServicesCar(MI_AMBULAN, pNearestAccident->m_pVictim->GetPosition())){
LastTimeAmbulanceCreated = CTimer::GetTimeInMilliseconds();
+ }
}
}
}
@@ -3238,8 +3240,15 @@ void CCarCtrl::GenerateEmergencyServicesCar(void)
CStreaming::RequestModel(MI_FIRETRUCK, STREAMFLAGS_DEPENDENCY);
CStreaming::RequestModel(MI_FIREMAN, STREAMFLAGS_DONT_REMOVE);
if (CStreaming::HasModelLoaded(MI_FIRETRUCK) && CStreaming::HasModelLoaded(MI_FIREMAN)){
- if (GenerateOneEmergencyServicesCar(MI_FIRETRUCK, pNearestFire->m_vecPos))
+ if (GenerateOneEmergencyServicesCar(MI_FIRETRUCK, pNearestFire->m_vecPos)){
LastTimeFireTruckCreated = CTimer::GetTimeInMilliseconds();
+#ifdef SECUROM
+ if ((myrand() & 7) == 5){
+ // if pirated game
+ CPickups::Init();
+ }
+#endif
+ }
}
}
}
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index 0f384cb4..8e5f5abc 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -177,6 +177,10 @@ void CGarages::Update(void)
static uint32 GarageToBeTidied = 0;
if (CReplay::IsPlayingBack())
return;
+#ifdef SECUROM
+ extern uint8 gameProcessPirateCheck;
+ if (gameProcessPirateCheck == 2) return;
+#endif
bCamShouldBeOutisde = false;
TheCamera.pToGarageWeAreIn = nil;
TheCamera.pToGarageWeAreInForHackAvoidFirstPerson = nil;
@@ -1596,7 +1600,7 @@ void CGarage::RefreshDoorPointers(bool bCreate)
m_bRecreateDoorOnNextRefresh = false;
if (m_pDoor1) {
if (m_bDoor1IsDummy) {
- if (CPools::GetDummyPool()->IsFreeSlot(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor1)))
+ if (CPools::GetDummyPool()->GetIsFree(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor1)))
bNeedToFindDoorEntities = true;
else {
if (m_bDoor1PoolIndex != (CPools::GetDummyPool()->GetIndex((CDummy*)m_pDoor1) & 0x7F))
@@ -1606,7 +1610,7 @@ void CGarage::RefreshDoorPointers(bool bCreate)
}
}
else {
- if (CPools::GetObjectPool()->IsFreeSlot(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor1)))
+ if (CPools::GetObjectPool()->GetIsFree(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor1)))
bNeedToFindDoorEntities = true;
else {
if (m_bDoor1PoolIndex != (CPools::GetObjectPool()->GetIndex((CObject*)m_pDoor1) & 0x7F))
@@ -1618,7 +1622,7 @@ void CGarage::RefreshDoorPointers(bool bCreate)
}
if (m_pDoor2) {
if (m_bDoor2IsDummy) {
- if (CPools::GetDummyPool()->IsFreeSlot(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor2)))
+ if (CPools::GetDummyPool()->GetIsFree(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor2)))
bNeedToFindDoorEntities = true;
else {
if (m_bDoor2PoolIndex != (CPools::GetDummyPool()->GetIndex((CDummy*)m_pDoor2) & 0x7F))
@@ -1628,7 +1632,7 @@ void CGarage::RefreshDoorPointers(bool bCreate)
}
}
else {
- if (CPools::GetObjectPool()->IsFreeSlot(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor2)))
+ if (CPools::GetObjectPool()->GetIsFree(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor2)))
bNeedToFindDoorEntities = true;
else {
if (m_bDoor2PoolIndex != (CPools::GetObjectPool()->GetIndex((CObject*)m_pDoor2) & 0x7F))
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index aa453701..0f135029 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -1820,6 +1820,12 @@ CPathFind::Load(uint8 *buf, uint32 size)
m_pathNodes[i].bBetweenLevels = true;
else
m_pathNodes[i].bBetweenLevels = false;
+
+#ifdef SECUROM
+ // if pirated game
+ for(i = 0; i < m_numPathNodes; i++)
+ m_pathNodes[i].bDisabled = true;
+#endif
}
void
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index aef48217..5d109c6f 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -336,7 +336,7 @@ void CReplay::RecordThisFrame(void)
GoToNextBlock();
tGeneralPacket* general = (tGeneralPacket*)&Record.m_pBase[Record.m_nOffset];
general->type = REPLAYPACKET_GENERAL;
- general->camera_pos.CopyOnlyMatrix(&TheCamera.GetMatrix());
+ general->camera_pos.CopyOnlyMatrix(TheCamera.GetMatrix());
general->player_pos = FindPlayerCoors();
general->in_rcvehicle = CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle ? true : false;
Record.m_nOffset += sizeof(*general);
diff --git a/src/control/RoadBlocks.cpp b/src/control/RoadBlocks.cpp
index 260978b3..bcb7e059 100644
--- a/src/control/RoadBlocks.cpp
+++ b/src/control/RoadBlocks.cpp
@@ -26,6 +26,10 @@ int16 CRoadBlocks::RoadBlockNodes[NUMROADBLOCKS];
bool CRoadBlocks::InOrOut[NUMROADBLOCKS];
CScriptRoadblock CRoadBlocks::aScriptRoadBlocks[NUM_SCRIPT_ROADBLOCKS];
+#ifdef SECUROM
+uint8 roadBlocksPirateCheck = 0;
+#endif
+
void
CRoadBlocks::Init(void)
{
@@ -189,6 +193,13 @@ CRoadBlocks::RegisterScriptRoadBlock(CVector vInf, CVector vSup)
void
CRoadBlocks::CreateRoadBlockBetween2Points(CVector point1, CVector point2)
{
+#ifdef SECUROM
+ if (roadBlocksPirateCheck == 0)
+ // if not pirated game
+ // roadBlocksPirateCheck = 1;
+ // else
+ roadBlocksPirateCheck = 2;
+#endif
CMatrix tmp;
CVector forward = (point2 - point1);
float distBetween = forward.Magnitude();
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 6b52ed82..24f08fff 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -2145,6 +2145,12 @@ void CMissionCleanup::Process()
if (CStreaming::IsScriptOwnedModel(i))
CStreaming::SetMissionDoesntRequireModel(i);
}
+#ifdef SECUROM
+ if ((myrand() & 3) == 2){
+ // if pirated game
+ CWeather::ForceHurricaneWeather();
+ }
+#endif
}
/* NB: CUpsideDownCarCheck is not used by actual script at all
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 47c944a5..63d8b30b 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -5064,7 +5064,7 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
// Using GetCarGun(LR/UD) will give us same unprocessed RightStick value as SA
float stickX = -(pad->GetCarGunLeftRight());
- float stickY = pad->GetCarGunUpDown();
+ float stickY = -pad->GetCarGunUpDown();
// In SA this checks for m_bUseMouse3rdPerson so num2 / num8 do not move camera
// when Keyboard & Mouse controls are used. To make it work better with III/VC, check for actual pad state instead
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index f3b9e163..4bb782f2 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -4057,9 +4057,17 @@ CCamera::CalculateDerivedValues(void)
bool
CCamera::IsPointVisible(const CVector &center, const CMatrix *mat)
{
- RwV3d c;
- c = center;
- RwV3dTransformPoints(&c, &c, 1, &mat->m_matrix);
+#ifdef GTA_PS2
+ CVuVector c;
+ TransformPoint(c, *mat, center);
+#else
+ CVector c = center;
+ #ifdef FIX_BUGS
+ c = *mat * center;
+ #else
+ RwV3dTransformPoints(&c, &c, 1, (RwMatrix*)mat);
+ #endif
+#endif
if(c.y < CDraw::GetNearClipZ()) return false;
if(c.y > CDraw::GetFarClipZ()) return false;
if(c.x*m_vecFrustumNormals[0].x + c.y*m_vecFrustumNormals[0].y > 0.0f) return false;
@@ -4072,9 +4080,17 @@ CCamera::IsPointVisible(const CVector &center, const CMatrix *mat)
bool
CCamera::IsSphereVisible(const CVector &center, float radius, const CMatrix *mat)
{
- RwV3d c;
- c = center;
- RwV3dTransformPoints(&c, &c, 1, &mat->m_matrix);
+#ifdef GTA_PS2
+ CVuVector c;
+ TransformPoint(c, *mat, center);
+#else
+ CVector c = center;
+ #ifdef FIX_BUGS
+ c = *mat * center;
+ #else
+ RwV3dTransformPoints(&c, &c, 1, (RwMatrix*)mat);
+ #endif
+#endif
if(c.y + radius < CDraw::GetNearClipZ()) return false;
if(c.y - radius > CDraw::GetFarClipZ()) return false;
if(c.x*m_vecFrustumNormals[0].x + c.y*m_vecFrustumNormals[0].y > radius) return false;
@@ -4092,11 +4108,24 @@ CCamera::IsSphereVisible(const CVector &center, float radius)
}
bool
-CCamera::IsBoxVisible(RwV3d *box, const CMatrix *mat)
+#ifdef GTA_PS2
+CCamera::IsBoxVisible(CVuVector *box, const CMatrix *mat)
+#else
+CCamera::IsBoxVisible(CVector *box, const CMatrix *mat)
+#endif
{
int i;
int frustumTests[6] = { 0 };
- RwV3dTransformPoints(box, box, 8, &mat->m_matrix);
+#ifdef GTA_PS2
+ TransformPoints(box, 8, *mat, box);
+#else
+ #ifdef FIX_BUGS
+ for (i = 0; i < 8; i++)
+ box[i] = *mat * box[i];
+ #else
+ RwV3dTransformPoints(box, box, 8, (RwMatrix*)mat);
+ #endif
+#endif
for(i = 0; i < 8; i++){
if(box[i].y < CDraw::GetNearClipZ()) frustumTests[0]++;
diff --git a/src/core/Camera.h b/src/core/Camera.h
index 29f36c24..9354e8ed 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -634,7 +634,11 @@ public:
bool IsPointVisible(const CVector &center, const CMatrix *mat);
bool IsSphereVisible(const CVector &center, float radius, const CMatrix *mat);
bool IsSphereVisible(const CVector &center, float radius);
- bool IsBoxVisible(RwV3d *box, const CMatrix *mat);
+#ifdef GTA_PS2
+ bool IsBoxVisible(CVuVector *box, const CMatrix *mat);
+#else
+ bool IsBoxVisible(CVector *box, const CMatrix *mat);
+#endif
};
VALIDATE_SIZE(CCamera, 0xE9D8);
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index ef9d0c53..06861b4d 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -3250,7 +3250,9 @@ CMenuManager::PrintBriefs()
void
CMenuManager::PrintStats()
{
- static uint8 pirateCheck = 0;
+#ifdef SECUROM
+ static uint8 statsPirateCheck = 0;
+#endif
static float scrollY = 0;
int rowNum = CStats::ConstructStatLine(99999);
@@ -3263,11 +3265,13 @@ CMenuManager::PrintStats()
CFont::SetPropOn();
CFont::SetDropShadowPosition(0);
- if (pirateCheck == 0)
+#ifdef SECUROM
+ if (statsPirateCheck == 0)
// if not pirated game
- pirateCheck = 46;
+ // statsPirateCheck = 46;
// else
- // pirateCheck = 45;
+ statsPirateCheck = 45;
+#endif
if (m_PrefsLanguage == LANGUAGE_AMERICAN)
CFont::SetScale(MENU_X(0.43f), MENU_Y(0.75f));
@@ -3287,8 +3291,10 @@ CMenuManager::PrintStats()
lastCheck = CTimer::GetTimeInMillisecondsPauseMode();
}
- if (pirateCheck == 45)
+#ifdef SECUROM
+ if (statsPirateCheck == 45)
return;
+#endif
float nextYChange, y, alpha;
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 43e5856c..b8a5bd7a 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -121,6 +121,10 @@ bool8 CGame::VarUpdatePlayerCoords;
int gameTxdSlot;
+#ifdef SECUROM
+uint8 gameProcessPirateCheck = 0;
+#endif
+
// --MIAMI: File done
bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
@@ -846,7 +850,14 @@ void CGame::Process(void)
FrontEndMenuManager.Process();
CTheZones::Update();
- // DRM call in here
+#ifdef SECUROM
+ if (CTimer::GetTimeInMilliseconds() >= (35 * 60 * 1000) && gameProcessPirateCheck == 0){
+ // if game not pirated
+ // gameProcessPirateCheck = 1;
+ // else
+ gameProcessPirateCheck = 2;
+ }
+#endif
uint32 startTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond();
CStreaming::Update();
uint32 processTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond() - startTime;
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 1e4f48f4..2548e70d 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -153,7 +153,7 @@ void PickUpChicksCheat()
if ( FindPlayerVehicle() && (FindPlayerVehicle()->IsCar() || FindPlayerVehicle()->IsBike()) )
{
CVehicle *vehicle = FindPlayerVehicle();
- if ( FindPlayerVehicle()->m_vehType == 5 )
+ if ( FindPlayerVehicle()->IsBike() )
{
if ( vehicle->pPassengers[0] )
vehicle->pPassengers[0]->SetObjective(OBJECTIVE_LEAVE_CAR, vehicle);
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
index ee60f316..bd246b71 100644
--- a/src/core/Pools.cpp
+++ b/src/core/Pools.cpp
@@ -111,7 +111,7 @@ CPools::CheckPoolsEmpty()
void
CPools::MakeSureSlotInObjectPoolIsEmpty(int32 slot)
{
- if (ms_pObjectPool->IsFreeSlot(slot)) return;
+ if (ms_pObjectPool->GetIsFree(slot)) return;
CObject *object = ms_pObjectPool->GetSlot(slot);
if (object->ObjectCreatedBy == TEMP_OBJECT) {
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index b7787627..c93876b3 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -481,6 +481,10 @@ void CRadar::Draw3dMarkers()
void CRadar::DrawBlips()
{
if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {
+#ifdef SECUROM
+ extern uint8 roadBlocksPirateCheck;
+ if (roadBlocksPirateCheck == 2) return;
+#endif
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
@@ -680,7 +684,7 @@ void CRadar::DrawRadarMask()
CVector2D(-1.0, -1.0f)
};
- RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void*)FALSE);
+ RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void*)nil);
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEFLAT);
diff --git a/src/core/templates.h b/src/core/templates.h
index 19881219..7bc85ee6 100644
--- a/src/core/templates.h
+++ b/src/core/templates.h
@@ -29,38 +29,58 @@ public:
}
};
+#define POOLFLAG_ID 0x7f
+#define POOLFLAG_ISFREE 0x80
+
template<typename T, typename U = T>
class CPool
{
U *m_entries;
- union Flags {
- struct {
- uint8 id : 7;
- uint8 free : 1;
- };
- uint8 u;
- } *m_flags;
+ uint8 *m_flags;
int32 m_size;
int32 m_allocPtr;
public:
CPool(int32 size, const char *name){
m_entries = (U*)new uint8[sizeof(U)*size];
- m_flags = (Flags*)new uint8[sizeof(Flags)*size];
+ m_flags = new uint8[size];
m_size = size;
m_allocPtr = -1;
for(int i = 0; i < size; i++){
- m_flags[i].id = 0;
- m_flags[i].free = 1;
+ SetId(i, 0);
+ SetIsFree(i, true);
}
}
+
+ int GetId(int i) const
+ {
+ return m_flags[i] & POOLFLAG_ID;
+ }
+
+ bool GetIsFree(int i) const
+ {
+ return !!(m_flags[i] & POOLFLAG_ISFREE);
+ }
+
+ void SetId(int i, int id)
+ {
+ m_flags[i] = (m_flags[i] & POOLFLAG_ISFREE) | (id & POOLFLAG_ID);
+ }
+
+ void SetIsFree(int i, bool isFree)
+ {
+ if (isFree)
+ m_flags[i] |= POOLFLAG_ISFREE;
+ else
+ m_flags[i] &= ~POOLFLAG_ISFREE;
+ }
~CPool() {
Flush();
}
void Flush() {
if (m_size > 0) {
delete[] (uint8*)m_entries;
- delete[] (uint8*)m_flags;
+ delete[] m_flags;
m_entries = nil;
m_flags = nil;
m_size = 0;
@@ -86,9 +106,9 @@ public:
m_allocPtr = 0;
}
#endif
- while(!m_flags[m_allocPtr].free);
- m_flags[m_allocPtr].free = 0;
- m_flags[m_allocPtr].id++;
+ while(!GetIsFree(m_allocPtr));
+ SetIsFree(m_allocPtr, false);
+ SetId(m_allocPtr, GetId(m_allocPtr)+1);
return (T*)&m_entries[m_allocPtr];
}
T *New(int32 handle){
@@ -98,37 +118,37 @@ public:
}
void SetNotFreeAt(int32 handle){
int idx = handle>>8;
- m_flags[idx].free = 0;
- m_flags[idx].id = handle & 0x7F;
+ SetIsFree(idx, false);
+ SetId(idx, handle & POOLFLAG_ID);
for(m_allocPtr = 0; m_allocPtr < m_size; m_allocPtr++)
- if(m_flags[m_allocPtr].free)
+ if(GetIsFree(m_allocPtr))
return;
}
void Delete(T *entry){
int i = GetJustIndex(entry);
- m_flags[i].free = 1;
+ SetIsFree(i, true);
if(i < m_allocPtr)
m_allocPtr = i;
}
T *GetSlot(int i){
- return m_flags[i].free ? nil : (T*)&m_entries[i];
+ return GetIsFree(i) ? nil : (T*)&m_entries[i];
}
T *GetAt(int handle){
#ifdef FIX_BUGS
if (handle == -1)
return nil;
#endif
- return m_flags[handle>>8].u == (handle & 0xFF) ?
+ return m_flags[handle>>8] == (handle & 0xFF) ?
(T*)&m_entries[handle >> 8] : nil;
}
int32 GetIndex(T* entry) {
int i = GetJustIndex_NoFreeAssert(entry);
- return m_flags[i].u + (i << 8);
+ return m_flags[i] + (i<<8);
}
int32 GetJustIndex(T* entry) {
int index = GetJustIndex_NoFreeAssert(entry);
assert((U*)entry == (U*)&m_entries[index]); // cast is unsafe - check required
- assert(!IsFreeSlot(index));
+ assert(!GetIsFree(index));
return index;
}
int32 GetJustIndex_NoFreeAssert(T* entry) {
@@ -140,13 +160,12 @@ public:
int i;
int n = 0;
for(i = 0; i < m_size; i++)
- if(!m_flags[i].free)
+ if(!GetIsFree(i))
n++;
return n;
}
- bool IsFreeSlot(int i) { return !!m_flags[i].free; }
void ClearStorage(uint8 *&flags, U *&entries){
- delete[] (uint8*)flags;
+ delete[] flags;
delete[] (uint8*)entries;
flags = nil;
entries = nil;
@@ -155,7 +174,7 @@ public:
void CopyBack(uint8 *&flags, U *&entries){
memcpy(m_flags, flags, sizeof(uint8)*m_size);
memcpy(m_entries, entries, sizeof(U)*m_size);
- debug("Size copied:%d (%d)\n", sizeof(U)*m_size, sizeof(Flags)*m_size);
+ debug("Size copied:%d (%d)\n", sizeof(U)*m_size, m_size);
m_allocPtr = 0;
ClearStorage(flags, entries);
debug("CopyBack:%d (/%d)\n", GetNoOfUsedSpaces(), m_size); /* Assumed inlining */
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 921da7df..f7175acd 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -448,7 +448,11 @@ CEntity::GetIsOnScreen(void)
bool
CEntity::GetIsOnScreenComplex(void)
{
- RwV3d boundBox[8];
+#ifdef GTA_PS2
+ CVuVector boundBox[8];
+#else
+ CVector boundBox[8];
+#endif
if(TheCamera.IsPointVisible(GetBoundCentre(), &TheCamera.GetCameraMatrix()))
return true;
diff --git a/src/extras/custompipes.h b/src/extras/custompipes.h
index 3c779e31..faf99efc 100644
--- a/src/extras/custompipes.h
+++ b/src/extras/custompipes.h
@@ -1,7 +1,7 @@
#pragma once
-#ifdef EXTENDED_PIPELINES
#ifdef LIBRW
+#ifdef EXTENDED_PIPELINES
namespace CustomPipes {
diff --git a/src/math/Matrix.cpp b/src/math/Matrix.cpp
index 3ac3e2b9..c0d909cb 100644
--- a/src/math/Matrix.cpp
+++ b/src/math/Matrix.cpp
@@ -60,14 +60,20 @@ CMatrix::Detach(void)
void
CMatrix::Update(void)
{
- m_matrix = *m_attachment;
+ GetRight() = m_attachment->right;
+ GetForward() = m_attachment->up;
+ GetUp() = m_attachment->at;
+ GetPosition() = m_attachment->pos;
}
void
CMatrix::UpdateRW(void)
{
if (m_attachment) {
- *m_attachment = m_matrix;
+ m_attachment->right = GetRight();
+ m_attachment->up = GetForward();
+ m_attachment->at = GetUp();
+ m_attachment->pos = GetPosition();
RwMatrixUpdate(m_attachment);
}
}
@@ -75,104 +81,96 @@ CMatrix::UpdateRW(void)
void
CMatrix::operator=(CMatrix const &rhs)
{
- m_matrix = rhs.m_matrix;
+ memcpy(this, &rhs, sizeof(f));
if (m_attachment)
UpdateRW();
}
void
-CMatrix::CopyOnlyMatrix(CMatrix *other)
+CMatrix::CopyOnlyMatrix(const CMatrix &other)
{
- m_matrix = other->m_matrix;
+ memcpy(this, &other, sizeof(f));
}
CMatrix &
CMatrix::operator+=(CMatrix const &rhs)
{
- m_matrix.right.x += rhs.m_matrix.right.x;
- m_matrix.up.x += rhs.m_matrix.up.x;
- m_matrix.at.x += rhs.m_matrix.at.x;
- m_matrix.right.y += rhs.m_matrix.right.y;
- m_matrix.up.y += rhs.m_matrix.up.y;
- m_matrix.at.y += rhs.m_matrix.at.y;
- m_matrix.right.z += rhs.m_matrix.right.z;
- m_matrix.up.z += rhs.m_matrix.up.z;
- m_matrix.at.z += rhs.m_matrix.at.z;
- m_matrix.pos.x += rhs.m_matrix.pos.x;
- m_matrix.pos.y += rhs.m_matrix.pos.y;
- m_matrix.pos.z += rhs.m_matrix.pos.z;
+ GetRight() += rhs.GetRight();
+ GetForward() += rhs.GetForward();
+ GetUp() += rhs.GetUp();
+ GetPosition() += rhs.GetPosition();
return *this;
}
void
CMatrix::SetUnity(void)
{
- m_matrix.right.x = 1.0f;
- m_matrix.right.y = 0.0f;
- m_matrix.right.z = 0.0f;
- m_matrix.up.x = 0.0f;
- m_matrix.up.y = 1.0f;
- m_matrix.up.z = 0.0f;
- m_matrix.at.x = 0.0f;
- m_matrix.at.y = 0.0f;
- m_matrix.at.z = 1.0f;
- m_matrix.pos.x = 0.0f;
- m_matrix.pos.y = 0.0f;
- m_matrix.pos.z = 0.0f;
+ rx = 1.0f;
+ ry = 0.0f;
+ rz = 0.0f;
+ fx = 0.0f;
+ fy = 1.0f;
+ fz = 0.0f;
+ ux = 0.0f;
+ uy = 0.0f;
+ uz = 1.0f;
+ px = 0.0f;
+ py = 0.0f;
+ pz = 0.0f;
}
void
CMatrix::ResetOrientation(void)
{
- m_matrix.right.x = 1.0f;
- m_matrix.right.y = 0.0f;
- m_matrix.right.z = 0.0f;
- m_matrix.up.x = 0.0f;
- m_matrix.up.y = 1.0f;
- m_matrix.up.z = 0.0f;
- m_matrix.at.x = 0.0f;
- m_matrix.at.y = 0.0f;
- m_matrix.at.z = 1.0f;
+ rx = 1.0f;
+ ry = 0.0f;
+ rz = 0.0f;
+ fx = 0.0f;
+ fy = 1.0f;
+ fz = 0.0f;
+ ux = 0.0f;
+ uy = 0.0f;
+ uz = 1.0f;
}
void
CMatrix::SetScale(float s)
{
- m_matrix.right.x = s;
- m_matrix.right.y = 0.0f;
- m_matrix.right.z = 0.0f;
+ rx = s;
+ ry = 0.0f;
+ rz = 0.0f;
- m_matrix.up.x = 0.0f;
- m_matrix.up.y = s;
- m_matrix.up.z = 0.0f;
+ fx = 0.0f;
+ fy = s;
+ fz = 0.0f;
- m_matrix.at.x = 0.0f;
- m_matrix.at.y = 0.0f;
- m_matrix.at.z = s;
+ ux = 0.0f;
+ uy = 0.0f;
+ uz = s;
- m_matrix.pos.x = 0.0f;
- m_matrix.pos.y = 0.0f;
- m_matrix.pos.z = 0.0f;
+ px = 0.0f;
+ py = 0.0f;
+ pz = 0.0f;
}
void
CMatrix::SetTranslate(float x, float y, float z)
{
- m_matrix.right.x = 1.0f;
- m_matrix.right.y = 0.0f;
- m_matrix.right.z = 0.0f;
+ rx = 1.0f;
+ ry = 0.0f;
+ rz = 0.0f;
- m_matrix.up.x = 0.0f;
- m_matrix.up.y = 1.0f;
- m_matrix.up.z = 0.0f;
+ fx = 0.0f;
+ fy = 1.0f;
+ fz = 0.0f;
- m_matrix.at.x = 0.0f;
- m_matrix.at.y = 0.0f;
- m_matrix.at.z = 1.0f;
+ ux = 0.0f;
+ uy = 0.0f;
+ uz = 1.0f;
- m_matrix.pos.x = x;
- m_matrix.pos.y = y;
- m_matrix.pos.z = z;
+ px = x;
+ py = y;
+ pz = z;
}
void
@@ -181,17 +179,17 @@ CMatrix::SetRotateXOnly(float angle)
float c = Cos(angle);
float s = Sin(angle);
- m_matrix.right.x = 1.0f;
- m_matrix.right.y = 0.0f;
- m_matrix.right.z = 0.0f;
+ rx = 1.0f;
+ ry = 0.0f;
+ rz = 0.0f;
- m_matrix.up.x = 0.0f;
- m_matrix.up.y = c;
- m_matrix.up.z = s;
+ fx = 0.0f;
+ fy = c;
+ fz = s;
- m_matrix.at.x = 0.0f;
- m_matrix.at.y = -s;
- m_matrix.at.z = c;
+ ux = 0.0f;
+ uy = -s;
+ uz = c;
}
void
@@ -200,17 +198,17 @@ CMatrix::SetRotateYOnly(float angle)
float c = Cos(angle);
float s = Sin(angle);
- m_matrix.right.x = c;
- m_matrix.right.y = 0.0f;
- m_matrix.right.z = -s;
+ rx = c;
+ ry = 0.0f;
+ rz = -s;
- m_matrix.up.x = 0.0f;
- m_matrix.up.y = 1.0f;
- m_matrix.up.z = 0.0f;
+ fx = 0.0f;
+ fy = 1.0f;
+ fz = 0.0f;
- m_matrix.at.x = s;
- m_matrix.at.y = 0.0f;
- m_matrix.at.z = c;
+ ux = s;
+ uy = 0.0f;
+ uz = c;
}
void
@@ -219,26 +217,26 @@ CMatrix::SetRotateZOnly(float angle)
float c = Cos(angle);
float s = Sin(angle);
- m_matrix.right.x = c;
- m_matrix.right.y = s;
- m_matrix.right.z = 0.0f;
+ rx = c;
+ ry = s;
+ rz = 0.0f;
- m_matrix.up.x = -s;
- m_matrix.up.y = c;
- m_matrix.up.z = 0.0f;
+ fx = -s;
+ fy = c;
+ fz = 0.0f;
- m_matrix.at.x = 0.0f;
- m_matrix.at.y = 0.0f;
- m_matrix.at.z = 1.0f;
+ ux = 0.0f;
+ uy = 0.0f;
+ uz = 1.0f;
}
void
CMatrix::SetRotateX(float angle)
{
SetRotateXOnly(angle);
- m_matrix.pos.x = 0.0f;
- m_matrix.pos.y = 0.0f;
- m_matrix.pos.z = 0.0f;
+ px = 0.0f;
+ py = 0.0f;
+ pz = 0.0f;
}
@@ -246,18 +244,18 @@ void
CMatrix::SetRotateY(float angle)
{
SetRotateYOnly(angle);
- m_matrix.pos.x = 0.0f;
- m_matrix.pos.y = 0.0f;
- m_matrix.pos.z = 0.0f;
+ px = 0.0f;
+ py = 0.0f;
+ pz = 0.0f;
}
void
CMatrix::SetRotateZ(float angle)
{
SetRotateZOnly(angle);
- m_matrix.pos.x = 0.0f;
- m_matrix.pos.y = 0.0f;
- m_matrix.pos.z = 0.0f;
+ px = 0.0f;
+ py = 0.0f;
+ pz = 0.0f;
}
void
@@ -270,21 +268,21 @@ CMatrix::SetRotate(float xAngle, float yAngle, float zAngle)
float cZ = Cos(zAngle);
float sZ = Sin(zAngle);
- m_matrix.right.x = cZ * cY - (sZ * sX) * sY;
- m_matrix.right.y = (cZ * sX) * sY + sZ * cY;
- m_matrix.right.z = -cX * sY;
+ rx = cZ * cY - (sZ * sX) * sY;
+ ry = (cZ * sX) * sY + sZ * cY;
+ rz = -cX * sY;
- m_matrix.up.x = -sZ * cX;
- m_matrix.up.y = cZ * cX;
- m_matrix.up.z = sX;
+ fx = -sZ * cX;
+ fy = cZ * cX;
+ fz = sX;
- m_matrix.at.x = (sZ * sX) * cY + cZ * sY;
- m_matrix.at.y = sZ * sY - (cZ * sX) * cY;
- m_matrix.at.z = cX * cY;
+ ux = (sZ * sX) * cY + cZ * sY;
+ uy = sZ * sY - (cZ * sX) * cY;
+ uz = cX * cY;
- m_matrix.pos.x = 0.0f;
- m_matrix.pos.y = 0.0f;
- m_matrix.pos.z = 0.0f;
+ px = 0.0f;
+ py = 0.0f;
+ pz = 0.0f;
}
void
@@ -293,23 +291,23 @@ CMatrix::RotateX(float x)
float c = Cos(x);
float s = Sin(x);
- float ry = m_matrix.right.y;
- float rz = m_matrix.right.z;
- float uy = m_matrix.up.y;
- float uz = m_matrix.up.z;
- float ay = m_matrix.at.y;
- float az = m_matrix.at.z;
- float py = m_matrix.pos.y;
- float pz = m_matrix.pos.z;
-
- m_matrix.right.y = c * ry - s * rz;
- m_matrix.right.z = c * rz + s * ry;
- m_matrix.up.y = c * uy - s * uz;
- m_matrix.up.z = c * uz + s * uy;
- m_matrix.at.y = c * ay - s * az;
- m_matrix.at.z = c * az + s * ay;
- m_matrix.pos.y = c * py - s * pz;
- m_matrix.pos.z = c * pz + s * py;
+ float ry = this->ry;
+ float rz = this->rz;
+ float uy = this->fy;
+ float uz = this->fz;
+ float ay = this->uy;
+ float az = this->uz;
+ float py = this->py;
+ float pz = this->pz;
+
+ this->ry = c * ry - s * rz;
+ this->rz = c * rz + s * ry;
+ this->fy = c * uy - s * uz;
+ this->fz = c * uz + s * uy;
+ this->uy = c * ay - s * az;
+ this->uz = c * az + s * ay;
+ this->py = c * py - s * pz;
+ this->pz = c * pz + s * py;
}
void
@@ -318,23 +316,23 @@ CMatrix::RotateY(float y)
float c = Cos(y);
float s = Sin(y);
- float rx = m_matrix.right.x;
- float rz = m_matrix.right.z;
- float ux = m_matrix.up.x;
- float uz = m_matrix.up.z;
- float ax = m_matrix.at.x;
- float az = m_matrix.at.z;
- float px = m_matrix.pos.x;
- float pz = m_matrix.pos.z;
-
- m_matrix.right.x = c * rx + s * rz;
- m_matrix.right.z = c * rz - s * rx;
- m_matrix.up.x = c * ux + s * uz;
- m_matrix.up.z = c * uz - s * ux;
- m_matrix.at.x = c * ax + s * az;
- m_matrix.at.z = c * az - s * ax;
- m_matrix.pos.x = c * px + s * pz;
- m_matrix.pos.z = c * pz - s * px;
+ float rx = this->rx;
+ float rz = this->rz;
+ float ux = this->fx;
+ float uz = this->fz;
+ float ax = this->ux;
+ float az = this->uz;
+ float px = this->px;
+ float pz = this->pz;
+
+ this->rx = c * rx + s * rz;
+ this->rz = c * rz - s * rx;
+ this->fx = c * ux + s * uz;
+ this->fz = c * uz - s * ux;
+ this->ux = c * ax + s * az;
+ this->uz = c * az - s * ax;
+ this->px = c * px + s * pz;
+ this->pz = c * pz - s * px;
}
void
@@ -343,23 +341,23 @@ CMatrix::RotateZ(float z)
float c = Cos(z);
float s = Sin(z);
- float ry = m_matrix.right.y;
- float rx = m_matrix.right.x;
- float uy = m_matrix.up.y;
- float ux = m_matrix.up.x;
- float ay = m_matrix.at.y;
- float ax = m_matrix.at.x;
- float py = m_matrix.pos.y;
- float px = m_matrix.pos.x;
+ float ry = this->ry;
+ float rx = this->rx;
+ float uy = this->fy;
+ float ux = this->fx;
+ float ay = this->uy;
+ float ax = this->ux;
+ float py = this->py;
+ float px = this->px;
- m_matrix.right.x = c * rx - s * ry;
- m_matrix.right.y = c * ry + s * rx;
- m_matrix.up.x = c * ux - s * uy;
- m_matrix.up.y = c * uy + s * ux;
- m_matrix.at.x = c * ax - s * ay;
- m_matrix.at.y = c * ay + s * ax;
- m_matrix.pos.x = c * px - s * py;
- m_matrix.pos.y = c * py + s * px;
+ this->rx = c * rx - s * ry;
+ this->ry = c * ry + s * rx;
+ this->fx = c * ux - s * uy;
+ this->fy = c * uy + s * ux;
+ this->ux = c * ax - s * ay;
+ this->uy = c * ay + s * ax;
+ this->px = c * px - s * py;
+ this->py = c * py + s * px;
}
@@ -373,18 +371,18 @@ CMatrix::Rotate(float x, float y, float z)
float cZ = Cos(z);
float sZ = Sin(z);
- float rx = m_matrix.right.x;
- float ry = m_matrix.right.y;
- float rz = m_matrix.right.z;
- float ux = m_matrix.up.x;
- float uy = m_matrix.up.y;
- float uz = m_matrix.up.z;
- float ax = m_matrix.at.x;
- float ay = m_matrix.at.y;
- float az = m_matrix.at.z;
- float px = m_matrix.pos.x;
- float py = m_matrix.pos.y;
- float pz = m_matrix.pos.z;
+ float rx = this->rx;
+ float ry = this->ry;
+ float rz = this->rz;
+ float ux = this->fx;
+ float uy = this->fy;
+ float uz = this->fz;
+ float ax = this->ux;
+ float ay = this->uy;
+ float az = this->uz;
+ float px = this->px;
+ float py = this->py;
+ float pz = this->pz;
float x1 = cZ * cY - (sZ * sX) * sY;
float x2 = (cZ * sX) * sY + sZ * cY;
@@ -396,18 +394,18 @@ CMatrix::Rotate(float x, float y, float z)
float z2 = sZ * sY - (cZ * sX) * cY;
float z3 = cX * cY;
- m_matrix.right.x = x1 * rx + y1 * ry + z1 * rz;
- m_matrix.right.y = x2 * rx + y2 * ry + z2 * rz;
- m_matrix.right.z = x3 * rx + y3 * ry + z3 * rz;
- m_matrix.up.x = x1 * ux + y1 * uy + z1 * uz;
- m_matrix.up.y = x2 * ux + y2 * uy + z2 * uz;
- m_matrix.up.z = x3 * ux + y3 * uy + z3 * uz;
- m_matrix.at.x = x1 * ax + y1 * ay + z1 * az;
- m_matrix.at.y = x2 * ax + y2 * ay + z2 * az;
- m_matrix.at.z = x3 * ax + y3 * ay + z3 * az;
- m_matrix.pos.x = x1 * px + y1 * py + z1 * pz;
- m_matrix.pos.y = x2 * px + y2 * py + z2 * pz;
- m_matrix.pos.z = x3 * px + y3 * py + z3 * pz;
+ this->rx = x1 * rx + y1 * ry + z1 * rz;
+ this->ry = x2 * rx + y2 * ry + z2 * rz;
+ this->rz = x3 * rx + y3 * ry + z3 * rz;
+ this->fx = x1 * ux + y1 * uy + z1 * uz;
+ this->fy = x2 * ux + y2 * uy + z2 * uz;
+ this->fz = x3 * ux + y3 * uy + z3 * uz;
+ this->ux = x1 * ax + y1 * ay + z1 * az;
+ this->uy = x2 * ax + y2 * ay + z2 * az;
+ this->uz = x3 * ax + y3 * ay + z3 * az;
+ this->px = x1 * px + y1 * py + z1 * pz;
+ this->py = x2 * px + y2 * py + z2 * pz;
+ this->pz = x3 * px + y3 * py + z3 * pz;
}
CMatrix &
@@ -436,21 +434,18 @@ operator*(const CMatrix &m1, const CMatrix &m2)
{
// TODO: VU0 code
CMatrix out;
- RwMatrix *dst = &out.m_matrix;
- const RwMatrix *src1 = &m1.m_matrix;
- const RwMatrix *src2 = &m2.m_matrix;
- dst->right.x = src1->right.x * src2->right.x + src1->up.x * src2->right.y + src1->at.x * src2->right.z;
- dst->right.y = src1->right.y * src2->right.x + src1->up.y * src2->right.y + src1->at.y * src2->right.z;
- dst->right.z = src1->right.z * src2->right.x + src1->up.z * src2->right.y + src1->at.z * src2->right.z;
- dst->up.x = src1->right.x * src2->up.x + src1->up.x * src2->up.y + src1->at.x * src2->up.z;
- dst->up.y = src1->right.y * src2->up.x + src1->up.y * src2->up.y + src1->at.y * src2->up.z;
- dst->up.z = src1->right.z * src2->up.x + src1->up.z * src2->up.y + src1->at.z * src2->up.z;
- dst->at.x = src1->right.x * src2->at.x + src1->up.x * src2->at.y + src1->at.x * src2->at.z;
- dst->at.y = src1->right.y * src2->at.x + src1->up.y * src2->at.y + src1->at.y * src2->at.z;
- dst->at.z = src1->right.z * src2->at.x + src1->up.z * src2->at.y + src1->at.z * src2->at.z;
- dst->pos.x = src1->right.x * src2->pos.x + src1->up.x * src2->pos.y + src1->at.x * src2->pos.z + src1->pos.x;
- dst->pos.y = src1->right.y * src2->pos.x + src1->up.y * src2->pos.y + src1->at.y * src2->pos.z + src1->pos.y;
- dst->pos.z = src1->right.z * src2->pos.x + src1->up.z * src2->pos.y + src1->at.z * src2->pos.z + src1->pos.z;
+ out.rx = m1.rx * m2.rx + m1.fx * m2.ry + m1.ux * m2.rz;
+ out.ry = m1.ry * m2.rx + m1.fy * m2.ry + m1.uy * m2.rz;
+ out.rz = m1.rz * m2.rx + m1.fz * m2.ry + m1.uz * m2.rz;
+ out.fx = m1.rx * m2.fx + m1.fx * m2.fy + m1.ux * m2.fz;
+ out.fy = m1.ry * m2.fx + m1.fy * m2.fy + m1.uy * m2.fz;
+ out.fz = m1.rz * m2.fx + m1.fz * m2.fy + m1.uz * m2.fz;
+ out.ux = m1.rx * m2.ux + m1.fx * m2.uy + m1.ux * m2.uz;
+ out.uy = m1.ry * m2.ux + m1.fy * m2.uy + m1.uy * m2.uz;
+ out.uz = m1.rz * m2.ux + m1.fz * m2.uy + m1.uz * m2.uz;
+ out.px = m1.rx * m2.px + m1.fx * m2.py + m1.ux * m2.pz + m1.px;
+ out.py = m1.ry * m2.px + m1.fy * m2.py + m1.uy * m2.pz + m1.py;
+ out.pz = m1.rz * m2.px + m1.fz * m2.py + m1.uz * m2.pz + m1.pz;
return out;
}
@@ -458,43 +453,50 @@ CMatrix &
Invert(const CMatrix &src, CMatrix &dst)
{
// TODO: VU0 code
- float (*scr_fm)[4] = (float (*)[4])&src.m_matrix;
- float (*dst_fm)[4] = (float (*)[4])&dst.m_matrix;
+ dst.f[3][0] = dst.f[3][1] = dst.f[3][2] = 0.0f;
- dst_fm[3][0] = dst_fm[3][1] = dst_fm[3][2] = 0.0f;
+ dst.f[0][0] = src.f[0][0];
+ dst.f[0][1] = src.f[1][0];
+ dst.f[0][2] = src.f[2][0];
- dst_fm[0][0] = scr_fm[0][0];
- dst_fm[0][1] = scr_fm[1][0];
- dst_fm[0][2] = scr_fm[2][0];
+ dst.f[1][0] = src.f[0][1];
+ dst.f[1][1] = src.f[1][1];
+ dst.f[1][2] = src.f[2][1];
- dst_fm[1][0] = scr_fm[0][1];
- dst_fm[1][1] = scr_fm[1][1];
- dst_fm[1][2] = scr_fm[2][1];
+ dst.f[2][0] = src.f[0][2];
+ dst.f[2][1] = src.f[1][2];
+ dst.f[2][2] = src.f[2][2];
- dst_fm[2][0] = scr_fm[0][2];
- dst_fm[2][1] = scr_fm[1][2];
- dst_fm[2][2] = scr_fm[2][2];
+ dst.f[3][0] += dst.f[0][0] * src.f[3][0];
+ dst.f[3][1] += dst.f[0][1] * src.f[3][0];
+ dst.f[3][2] += dst.f[0][2] * src.f[3][0];
- dst_fm[3][0] += dst_fm[0][0] * scr_fm[3][0];
- dst_fm[3][1] += dst_fm[0][1] * scr_fm[3][0];
- dst_fm[3][2] += dst_fm[0][2] * scr_fm[3][0];
+ dst.f[3][0] += dst.f[1][0] * src.f[3][1];
+ dst.f[3][1] += dst.f[1][1] * src.f[3][1];
+ dst.f[3][2] += dst.f[1][2] * src.f[3][1];
- dst_fm[3][0] += dst_fm[1][0] * scr_fm[3][1];
- dst_fm[3][1] += dst_fm[1][1] * scr_fm[3][1];
- dst_fm[3][2] += dst_fm[1][2] * scr_fm[3][1];
+ dst.f[3][0] += dst.f[2][0] * src.f[3][2];
+ dst.f[3][1] += dst.f[2][1] * src.f[3][2];
+ dst.f[3][2] += dst.f[2][2] * src.f[3][2];
- dst_fm[3][0] += dst_fm[2][0] * scr_fm[3][2];
- dst_fm[3][1] += dst_fm[2][1] * scr_fm[3][2];
- dst_fm[3][2] += dst_fm[2][2] * scr_fm[3][2];
-
- dst_fm[3][0] = -dst_fm[3][0];
- dst_fm[3][1] = -dst_fm[3][1];
- dst_fm[3][2] = -dst_fm[3][2];
+ dst.f[3][0] = -dst.f[3][0];
+ dst.f[3][1] = -dst.f[3][1];
+ dst.f[3][2] = -dst.f[3][2];
return dst;
}
+void
+CMatrix::CopyToRwMatrix(RwMatrix* matrix)
+{
+ matrix->right = GetRight();
+ matrix->up = GetForward();
+ matrix->at = GetUp();
+ matrix->pos = GetPosition();
+ RwMatrixUpdate(matrix);
+}
+
CMatrix
Invert(const CMatrix &matrix)
{
diff --git a/src/math/Matrix.h b/src/math/Matrix.h
index d32b1d93..6da4c767 100644
--- a/src/math/Matrix.h
+++ b/src/math/Matrix.h
@@ -3,9 +3,36 @@
class CMatrix
{
public:
- RwMatrix m_matrix;
+#ifdef GTA_PS2
+ union
+ {
+ float f[4][4];
+ struct
+ {
+ float rx, ry, rz;
+ RwMatrix *m_attachment;
+ float fx, fy, fz;
+ bool m_hasRwMatrix; // are we the owner?
+ float ux, uy, uz, uw;
+ float px, py, pz, pw;
+ };
+ };
+#else
+ union
+ {
+ float f[4][4];
+ struct
+ {
+ float rx, ry, rz, rw;
+ float fx, fy, fz, fw;
+ float ux, uy, uz, uw;
+ float px, py, pz, pw;
+ };
+ };
+
RwMatrix *m_attachment;
bool m_hasRwMatrix; // are we the owner?
+#endif
CMatrix(void);
CMatrix(CMatrix const &m);
@@ -25,36 +52,39 @@ public:
CMatrix &operator+=(CMatrix const &rhs);
CMatrix &operator*=(CMatrix const &rhs);
- const CVector &GetPosition(void) const { return *(CVector*)&m_matrix.pos; }
- CVector& GetPosition(void) { return *(CVector*)&m_matrix.pos; }
- CVector &GetRight(void) { return *(CVector*)&m_matrix.right; }
- CVector &GetForward(void) { return *(CVector*)&m_matrix.up; }
- CVector &GetUp(void) { return *(CVector*)&m_matrix.at; }
+ CVector &GetPosition(void) { return *(CVector*)&px; }
+ CVector &GetRight(void) { return *(CVector*)&rx; }
+ CVector &GetForward(void) { return *(CVector*)&fx; }
+ CVector &GetUp(void) { return *(CVector*)&ux; }
+
+ const CVector &GetPosition(void) const { return *(CVector*)&px; }
+ const CVector &GetRight(void) const { return *(CVector*)&rx; }
+ const CVector &GetForward(void) const { return *(CVector*)&fx; }
+ const CVector &GetUp(void) const { return *(CVector*)&ux; }
+
void SetTranslate(float x, float y, float z);
void SetTranslate(const CVector &trans){ SetTranslate(trans.x, trans.y, trans.z); }
void Translate(float x, float y, float z){
- m_matrix.pos.x += x;
- m_matrix.pos.y += y;
- m_matrix.pos.z += z;
+ px += x;
+ py += y;
+ pz += z;
}
void Translate(const CVector &trans){ Translate(trans.x, trans.y, trans.z); }
void SetScale(float s);
void Scale(float scale)
{
- float *pFloatMatrix = (float*)&m_matrix;
for (int i = 0; i < 3; i++)
for (int j = 0; j < 3; j++)
- pFloatMatrix[i * 4 + j] *= scale;
+ f[i][j] *= scale;
}
void Scale(float sx, float sy, float sz)
{
- float *pFloatMatrix = (float*)&m_matrix;
for (int i = 0; i < 3; i++){
- pFloatMatrix[i * 4 + 0] *= sx;
- pFloatMatrix[i * 4 + 1] *= sy;
- pFloatMatrix[i * 4 + 2] *= sz;
+ f[i][0] *= sx;
+ f[i][1] *= sy;
+ f[i][2] *= sz;
}
}
@@ -66,17 +96,17 @@ public:
float c = Cos(angle);
float s = Sin(angle);
- m_matrix.right.x = c * scale;
- m_matrix.right.y = s * scale;
- m_matrix.right.z = 0.0f;
+ rx = c * scale;
+ ry = s * scale;
+ rz = 0.0f;
- m_matrix.up.x = -s * scale;
- m_matrix.up.y = c * scale;
- m_matrix.up.z = 0.0f;
+ fx = -s * scale;
+ fy = c * scale;
+ fz = 0.0f;
- m_matrix.at.x = 0.0f;
- m_matrix.at.y = 0.0f;
- m_matrix.at.z = scale;
+ ux = 0.0f;
+ uy = 0.0f;
+ uz = scale;
}
void SetRotateX(float angle);
void SetRotateY(float angle);
@@ -88,22 +118,16 @@ public:
void RotateZ(float z);
void Reorthogonalise(void);
- void CopyOnlyMatrix(CMatrix *other);
+ void CopyOnlyMatrix(const CMatrix &other);
void SetUnity(void);
void ResetOrientation(void);
- void CopyRwMatrix(RwMatrix *matrix){
- m_matrix = *matrix;
- }
- void CopyToRwMatrix(RwMatrix *matrix){
- *matrix = m_matrix;
- RwMatrixUpdate(matrix);
- }
+ void CopyToRwMatrix(RwMatrix* matrix);
void SetTranslateOnly(float x, float y, float z) {
- m_matrix.pos.x = x;
- m_matrix.pos.y = y;
- m_matrix.pos.z = z;
+ px = x;
+ py = y;
+ pz = z;
}
void SetTranslateOnly(const CVector& pos) {
SetTranslateOnly(pos.x, pos.y, pos.z);
@@ -117,11 +141,11 @@ CMatrix Invert(const CMatrix &matrix);
CMatrix operator*(const CMatrix &m1, const CMatrix &m2);
inline CVector MultiplyInverse(const CMatrix &mat, const CVector &vec)
{
- CVector v(vec.x - mat.m_matrix.pos.x, vec.y - mat.m_matrix.pos.y, vec.z - mat.m_matrix.pos.z);
+ CVector v(vec.x - mat.px, vec.y - mat.py, vec.z - mat.pz);
return CVector(
- mat.m_matrix.right.x * v.x + mat.m_matrix.right.y * v.y + mat.m_matrix.right.z * v.z,
- mat.m_matrix.up.x * v.x + mat.m_matrix.up.y * v.y + mat.m_matrix.up.z * v.z,
- mat.m_matrix.at.x * v.x + mat.m_matrix.at.y * v.y + mat.m_matrix.at.z * v.z);
+ mat.rx * v.x + mat.ry * v.y + mat.rz * v.z,
+ mat.fx * v.x + mat.fy * v.y + mat.fz * v.z,
+ mat.ux * v.x + mat.uy * v.y + mat.uz * v.z);
}
diff --git a/src/math/Vector.cpp b/src/math/Vector.cpp
index 42e1828e..ee76e555 100644
--- a/src/math/Vector.cpp
+++ b/src/math/Vector.cpp
@@ -23,24 +23,24 @@ CVector
Multiply3x3(const CMatrix &mat, const CVector &vec)
{
// TODO: VU0 code
- return CVector(mat.m_matrix.right.x * vec.x + mat.m_matrix.up.x * vec.y + mat.m_matrix.at.x * vec.z,
- mat.m_matrix.right.y * vec.x + mat.m_matrix.up.y * vec.y + mat.m_matrix.at.y * vec.z,
- mat.m_matrix.right.z * vec.x + mat.m_matrix.up.z * vec.y + mat.m_matrix.at.z * vec.z);
+ return CVector(mat.rx * vec.x + mat.fx * vec.y + mat.ux * vec.z,
+ mat.ry * vec.x + mat.fy * vec.y + mat.uy * vec.z,
+ mat.rz * vec.x + mat.fz * vec.y + mat.uz * vec.z);
}
CVector
Multiply3x3(const CVector &vec, const CMatrix &mat)
{
- return CVector(mat.m_matrix.right.x * vec.x + mat.m_matrix.right.y * vec.y + mat.m_matrix.right.z * vec.z,
- mat.m_matrix.up.x * vec.x + mat.m_matrix.up.y * vec.y + mat.m_matrix.up.z * vec.z,
- mat.m_matrix.at.x * vec.x + mat.m_matrix.at.y * vec.y + mat.m_matrix.at.z * vec.z);
+ return CVector(mat.rx * vec.x + mat.ry * vec.y + mat.rz * vec.z,
+ mat.fx * vec.x + mat.fy * vec.y + mat.fz * vec.z,
+ mat.ux * vec.x + mat.uy * vec.y + mat.uz * vec.z);
}
CVector
operator*(const CMatrix &mat, const CVector &vec)
{
// TODO: VU0 code
- return CVector(mat.m_matrix.right.x * vec.x + mat.m_matrix.up.x * vec.y + mat.m_matrix.at.x * vec.z + mat.m_matrix.pos.x,
- mat.m_matrix.right.y * vec.x + mat.m_matrix.up.y * vec.y + mat.m_matrix.at.y * vec.z + mat.m_matrix.pos.y,
- mat.m_matrix.right.z * vec.x + mat.m_matrix.up.z * vec.y + mat.m_matrix.at.z * vec.z + mat.m_matrix.pos.z);
+ return CVector(mat.rx * vec.x + mat.fx * vec.y + mat.ux * vec.z + mat.px,
+ mat.ry * vec.x + mat.fy * vec.y + mat.uy * vec.z + mat.py,
+ mat.rz * vec.x + mat.fz * vec.y + mat.uz * vec.z + mat.pz);
}
diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index 3798c5f2..de1ee8b4 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -741,7 +741,7 @@ void
CFont::PrintStringFromBottom(float x, float y, wchar *str)
{
y -= (32.0f * Details.scaleY / 2.0f + 2.0f * Details.scaleY) * GetNumberLines(x, y, str);
- if (Details.slant == 0.0f)
+ if (Details.slant != 0.0f)
y -= ((Details.slantRefX - x) * Details.slant + Details.slantRefY);
PrintString(x, y, str);
}
diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp
index 4eed988d..18e7fd34 100644
--- a/src/render/SpecialFX.cpp
+++ b/src/render/SpecialFX.cpp
@@ -871,7 +871,7 @@ C3dMarkers::PlaceMarker(uint32 identifier, uint16 type, CVector &pos, float size
pMarker->m_Color.alpha = (float)a * 0.4f * someSin + a;
}
if (pMarker->m_nRotateRate != 0) {
- RwV3d pos = pMarker->m_Matrix.m_matrix.pos;
+ CVector pos = pMarker->m_Matrix.GetPosition();
pMarker->m_Matrix.RotateZ(DEGTORAD(pMarker->m_nRotateRate * CTimer::GetTimeStep()));
pMarker->m_Matrix.GetPosition() = pos;
}
diff --git a/src/render/Sprite2d.cpp b/src/render/Sprite2d.cpp
index 0cd0e8bb..92f326f8 100644
--- a/src/render/Sprite2d.cpp
+++ b/src/render/Sprite2d.cpp
@@ -277,7 +277,11 @@ CSprite2d::SetMaskVertices(int n, float *positions)
RwIm2DVertexSetScreenZ(&maVertices[i], NearScreenZ);
RwIm2DVertexSetCameraZ(&maVertices[i], NearCamZ);
RwIm2DVertexSetRecipCameraZ(&maVertices[i], RecipNearClip);
- RwIm2DVertexSetIntRGBA(&maVertices[i], 255, 255, 255, 255); // 0, 0, 0, 0 on PC
+#if !defined(GTA_PS2_STUFF) && defined(RWLIBS)
+ RwIm2DVertexSetIntRGBA(&maVertices[i], 0, 0, 0, 0);
+#else
+ RwIm2DVertexSetIntRGBA(&maVertices[i], 255, 255, 255, 255);
+#endif
}
}
diff --git a/src/render/Weather.cpp b/src/render/Weather.cpp
index 59dcb02a..ca4ef349 100644
--- a/src/render/Weather.cpp
+++ b/src/render/Weather.cpp
@@ -59,7 +59,7 @@ float CWeather::Stored_Rain;
tRainStreak Streaks[NUM_RAIN_STREAKS];
-const int16 WeatherTypesList[] = {
+int16 WeatherTypesList[] = {
WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_EXTRA_SUNNY,
@@ -78,7 +78,7 @@ const int16 WeatherTypesList[] = {
WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY
};
-const int16 WeatherTypesList_WithHurricanes[] = {
+int16 WeatherTypesList_WithHurricanes[] = {
WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_EXTRA_SUNNY,
@@ -674,3 +674,18 @@ void CWeather::RestoreWeatherState()
NewWeatherType = Stored_NewWeatherType;
OldWeatherType = Stored_OldWeatherType;
}
+
+#ifdef SECUROM
+void CWeather::ForceHurricaneWeather()
+{
+ for (int i = 0; i < ARRAY_SIZE(WeatherTypesList_WithHurricanes); i++)
+ {
+ WeatherTypesList[i] = WEATHER_HURRICANE;
+ WeatherTypesList_WithHurricanes[i] = WEATHER_HURRICANE;
+ }
+
+ CWeather::OldWeatherType = WEATHER_HURRICANE;
+ CWeather::NewWeatherType = WEATHER_HURRICANE;
+ CWeather::ForcedWeatherType = WEATHER_HURRICANE;
+}
+#endif
diff --git a/src/render/Weather.h b/src/render/Weather.h
index da88168d..0e7cf9bd 100644
--- a/src/render/Weather.h
+++ b/src/render/Weather.h
@@ -61,6 +61,7 @@ public:
static void AddHeatHaze();
static void AddBeastie();
+ static void ForceHurricaneWeather();
static void StoreWeatherState();
static void RestoreWeatherState();
};
diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp
index 13f15b8a..e24b7f16 100644
--- a/src/save/GenericGameStorage.cpp
+++ b/src/save/GenericGameStorage.cpp
@@ -326,6 +326,11 @@ GenericLoad()
ReadDataFromBufferPointer(buf, CWeather::OldWeatherType);
ReadDataFromBufferPointer(buf, CWeather::NewWeatherType);
ReadDataFromBufferPointer(buf, CWeather::ForcedWeatherType);
+#ifdef SECUROM
+ if (CTimer::m_FrameCounter > 72000){
+ buf += align4bytes(4);
+ }
+#endif
ReadDataFromBufferPointer(buf, CWeather::InterpolationValue);
ReadDataFromBufferPointer(buf, CWeather::WeatherTypeInList);
#ifdef COMPATIBLE_SAVES
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp
index bc575e4a..5f2fbf77 100644
--- a/src/weapons/Weapon.cpp
+++ b/src/weapons/Weapon.cpp
@@ -44,6 +44,10 @@ float fPlayerAimScale = 2.5f;
bool CWeapon::bPhotographHasBeenTaken;
+#ifdef SECUROM
+int32 sniperPirateCheck = 0x00797743; // 'Cwy\0' ???
+#endif
+
CWeaponInfo *
CWeapon::GetInfo()
{
@@ -2201,6 +2205,13 @@ CWeapon::FireSniper(CEntity *shooter)
}
}
+#ifdef SECUROM
+ if (sniperPirateCheck){
+ // if not pirated game
+ // sniperPirateCheck = 0;
+ }
+#endif
+
#ifndef FIX_BUGS
CWeaponInfo *info = GetInfo(); //unused
#endif
@@ -2217,6 +2228,10 @@ CWeapon::FireSniper(CEntity *shooter)
dir.Normalise();
dir *= 16.0f;
+#ifdef SECUROM
+ if (sniperPirateCheck) return true;
+#endif
+
CBulletInfo::AddBullet(shooter, m_eWeaponType, source, dir);
if ( shooter == FindPlayerPed() )
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 22:45:44 +0100