mirror of
https://github.com/halpz/re3.git
synced 2024-12-24 17:55:29 +00:00
Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs
This commit is contained in:
commit
ec17355056
|
@ -443,6 +443,7 @@ public:
|
|||
|
||||
static int GetSaveVarIndex(int);
|
||||
static void Shutdown(void);
|
||||
static void SwapNearestBuildingModel(float, float, float, float, int, int);
|
||||
|
||||
#ifdef GTA_SCRIPT_COLLECTIVE
|
||||
static void AdvanceCollectiveIndex()
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -44,8 +44,8 @@ public:
|
|||
#endif
|
||||
virtual void Shutdown(void);
|
||||
virtual void DeleteRwObject(void) = 0;
|
||||
virtual RwObject *CreateInstance(RwMatrix *) = 0;
|
||||
virtual RwObject *CreateInstance(void) = 0;
|
||||
virtual RwObject *CreateInstance(RwMatrix *) = 0;
|
||||
virtual RwObject *GetRwObject(void) = 0;
|
||||
virtual void SetAnimFile(const char *file) {}
|
||||
virtual void ConvertAnimFileIndex(void) {}
|
||||
|
|
|
@ -936,7 +936,7 @@ CEscalator::AddThisOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, b
|
|||
m_lowerEnd = magnitudes[0] / 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);
|
||||
direction.Normalise();
|
||||
|
|
Loading…
Reference in a new issue