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

Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs

Browse source
This commit is contained in:
Fire-Head 2021-01-13 02:55:47 +03:00
parent 39dd219fbc a7ad2a7e1a
commit ec17355056
4 changed files with 397 additions and 399 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/control/Script.h
View file

@ -443,6 +443,7 @@ public:
static int GetSaveVarIndex(int); static int GetSaveVarIndex(int);
static void Shutdown(void); static void Shutdown(void);
static void SwapNearestBuildingModel(float, float, float, float, int, int);
#ifdef GTA_SCRIPT_COLLECTIVE #ifdef GTA_SCRIPT_COLLECTIVE
static void AdvanceCollectiveIndex() static void AdvanceCollectiveIndex()

791
src/control/Script4.cpp
View file

File diff suppressed because it is too large Load diff

2
src/modelinfo/BaseModelInfo.h
View file

@ -44,8 +44,8 @@ public:
#endif #endif
virtual void Shutdown(void); virtual void Shutdown(void);
virtual void DeleteRwObject(void) = 0; virtual void DeleteRwObject(void) = 0;
virtual RwObject *CreateInstance(RwMatrix *) = 0;
virtual RwObject *CreateInstance(void) = 0; virtual RwObject *CreateInstance(void) = 0;
virtual RwObject *CreateInstance(RwMatrix *) = 0;
virtual RwObject *GetRwObject(void) = 0; virtual RwObject *GetRwObject(void) = 0;
virtual void SetAnimFile(const char *file) {} virtual void SetAnimFile(const char *file) {}
virtual void ConvertAnimFileIndex(void) {} virtual void ConvertAnimFileIndex(void) {}

2
src/render/Fluff.cpp
View file

@ -936,7 +936,7 @@ CEscalator::AddThisOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, b
m_lowerEnd = magnitudes[0] / length; m_lowerEnd = magnitudes[0] / length;
m_upperEnd = (magnitudes[0] + magnitudes[1]) / length; m_upperEnd = (magnitudes[0] + magnitudes[1]) / length;
m_stepsCount = Max(24.0f, length / 0.6f); m_stepsCount = Min(24.0f, length / 0.6f);
CVector direction(m_pos0.x - m_pos1.x, m_pos0.y - m_pos1.y, 0.0f); CVector direction(m_pos0.x - m_pos1.x, m_pos0.y - m_pos1.y, 0.0f);
direction.Normalise(); direction.Normalise();