a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 18:10:00 +00:00
Code Issues Projects Releases Wiki Activity

merge + bug fix

Browse source
This commit is contained in:
Nikolay Korolev 2020-02-22 15:53:41 +03:00
parent a312e1ff81
commit a122d558a2
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/peds/Population.cpp
View file

@ -16,6 +16,7 @@
#include "IniFile.h" #include "IniFile.h"
#include "VisibilityPlugins.h" #include "VisibilityPlugins.h"
#include "PedPlacement.h" #include "PedPlacement.h"
#include "DummyObject.h"
#define CREATION_DIST_MULT_TO_DIST 40.0f #define CREATION_DIST_MULT_TO_DIST 40.0f
#define CREATION_RANGE 10.0f // Being added over the CREATION_DIST_MULT_TO_DIST. #define CREATION_RANGE 10.0f // Being added over the CREATION_DIST_MULT_TO_DIST.
@ -58,6 +59,7 @@ CVector &CPopulation::RegenerationForward = *(CVector*)0x8F1AD4;
WRAPPER CPed *CPopulation::AddPedInCar(CVehicle *vehicle) { EAXJMP(0x4F5800); } WRAPPER CPed *CPopulation::AddPedInCar(CVehicle *vehicle) { EAXJMP(0x4F5800); }
WRAPPER void CPopulation::ManagePopulation(void) { EAXJMP(0x4F3B90); } WRAPPER void CPopulation::ManagePopulation(void) { EAXJMP(0x4F3B90); }
WRAPPER void CPopulation::MoveCarsAndPedsOutOfAbandonedZones(void) { EAXJMP(0x4F5BE0); } WRAPPER void CPopulation::MoveCarsAndPedsOutOfAbandonedZones(void) { EAXJMP(0x4F5BE0); }
WRAPPER void CPopulation::ConvertToRealObject(CDummyObject* obj) { EAXJMP(0x4F45A0); }
void void
CPopulation::Initialise() CPopulation::Initialise()

2
src/peds/Population.h
View file

@ -6,6 +6,7 @@
class CPed; class CPed;
class CVehicle; class CVehicle;
class CDummyObject;
struct PedGroup struct PedGroup
{ {
@ -80,4 +81,5 @@ public:
static void AddToPopulation(float, float, float, float); static void AddToPopulation(float, float, float, float);
static void ManagePopulation(void); static void ManagePopulation(void);
static void MoveCarsAndPedsOutOfAbandonedZones(void); static void MoveCarsAndPedsOutOfAbandonedZones(void);
static void ConvertToRealObject(CDummyObject* obj);
}; };

13
src/render/SpecialFX.cpp
View file

@ -389,7 +389,8 @@ CMoneyMessages::RegisterOne(CVector vecPos, const char *pText, uint8 bRed, uint8
CRGBA FoamColour(255, 255, 255, 255); CRGBA FoamColour(255, 255, 255, 255);
unsigned int CSpecialParticleStuff::BoatFromStart; unsigned int CSpecialParticleStuff::BoatFromStart;
void CSpecialParticleStuff::CreateFoamAroundObject(CMatrix* pMatrix, float innerFw, float innerRg, float innerUp, int32 particles) void
CSpecialParticleStuff::CreateFoamAroundObject(CMatrix* pMatrix, float innerFw, float innerRg, float innerUp, int32 particles)
{ {
float outerFw = innerFw + 5.0f; float outerFw = innerFw + 5.0f;
float outerRg = innerRg + 5.0f; float outerRg = innerRg + 5.0f;
@ -397,8 +398,8 @@ void CSpecialParticleStuff::CreateFoamAroundObject(CMatrix* pMatrix, float inner
for (int attempts = 0; particles > 0 && attempts < 1000; attempts++) { for (int attempts = 0; particles > 0 && attempts < 1000; attempts++) {
CVector pos; CVector pos;
int rnd = CGeneral::GetRandomNumber(); int rnd = CGeneral::GetRandomNumber();
pos.x = (int8)(rnd - 128) / 110.0f; pos.x = (int8)(rnd - 128) * innerFw / 110.0f;
pos.y = (int8)((rnd >> 8) - 128) / 110.0f; pos.y = (int8)((rnd >> 8) - 128) * innerFw / 110.0f;
pos.z = 0.0f; pos.z = 0.0f;
if (DotProduct2D(pos, TheCamera.GetForward()) >= 0) if (DotProduct2D(pos, TheCamera.GetForward()) >= 0)
continue; continue;
@ -421,12 +422,14 @@ void CSpecialParticleStuff::CreateFoamAroundObject(CMatrix* pMatrix, float inner
} }
} }
void CSpecialParticleStuff::StartBoatFoamAnimation() void
CSpecialParticleStuff::StartBoatFoamAnimation()
{ {
BoatFromStart = CTimer::GetTimeInMilliseconds(); BoatFromStart = CTimer::GetTimeInMilliseconds();
} }
void CSpecialParticleStuff::UpdateBoatFoamAnimation(CMatrix* pMatrix) void
CSpecialParticleStuff::UpdateBoatFoamAnimation(CMatrix* pMatrix)
{ {
static int32 FrameInAnimation = 0; static int32 FrameInAnimation = 0;
static float X, Y, Z, dX, dY, dZ; static float X, Y, Z, dX, dY, dZ;