From b2e3d90734b46b36dce0a0fe3b4dd278168b6de2 Mon Sep 17 00:00:00 2001
From: Roman Masanin <36927roma@gmail.com>
Date: Tue, 22 Sep 2020 19:32:05 +0300
Subject: ProcessEscalators + some fixes

---
 src/render/Fluff.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/render')

diff --git a/src/render/Fluff.h b/src/render/Fluff.h
index 0fc57c73..5a4458a8 100644
--- a/src/render/Fluff.h
+++ b/src/render/Fluff.h
@@ -90,15 +90,15 @@ class CEscalator
 	CVector m_pos2;
 	CVector m_pos3;
 	CMatrix m_matrix;
-	bool m_bIsActive;
 	bool m_bIsMovingDown;
 	int32 m_stepsCount;
 	float m_lowerEnd; 
 	float m_upperEnd; 
-	CVector m_midPoint;
 	float m_radius;
 	CObject *m_pSteps[24];
 public:
+	bool m_bIsActive;//TODO also recheck!
+	CVector m_midPoint;
 	CEscalator();
 	void Update(void);
 	void SwitchOff(void);
@@ -107,8 +107,8 @@ public:
 
 class CEscalators
 {
-	static CEscalator aEscalators[NUM_ESCALATORS];
 public:
+	static CEscalator aEscalators[NUM_ESCALATORS];//TODO need recheck this!
 	static int32 NumEscalators;
 	static void Init(void);
 	static void Update(void);
-- 
cgit v1.2.3


From 4c220b1f9583e2db3cdbb99fcdecd82ae4fe9e0d Mon Sep 17 00:00:00 2001
From: Roman Masanin <36927roma@gmail.com>
Date: Sat, 26 Sep 2020 21:07:51 +0300
Subject: return bridge, crane and fix structures in fluff.h

---
 src/render/Fluff.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/render')

diff --git a/src/render/Fluff.h b/src/render/Fluff.h
index 5a4458a8..460c12a8 100644
--- a/src/render/Fluff.h
+++ b/src/render/Fluff.h
@@ -90,30 +90,33 @@ class CEscalator
 	CVector m_pos2;
 	CVector m_pos3;
 	CMatrix m_matrix;
+	bool m_bIsActive;
 	bool m_bIsMovingDown;
 	int32 m_stepsCount;
 	float m_lowerEnd; 
 	float m_upperEnd; 
+	CVector m_midPoint;
 	float m_radius;
 	CObject *m_pSteps[24];
 public:
-	bool m_bIsActive;//TODO also recheck!
-	CVector m_midPoint;
 	CEscalator();
 	void Update(void);
 	void SwitchOff(void);
 	void AddThisOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, bool b_isMovingDown);
+	bool IsActive() { return m_bIsActive; };
+	CVector GetPosition() { return m_midPoint; };
 };
 
 class CEscalators
 {
+	static CEscalator aEscalators[NUM_ESCALATORS];
 public:
-	static CEscalator aEscalators[NUM_ESCALATORS];//TODO need recheck this!
 	static int32 NumEscalators;
 	static void Init(void);
 	static void Update(void);
 	static void AddOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, bool b_isMovingDown);
 	static void Shutdown(void);
+	static CEscalator GetEscalator(int ind) { return aEscalators[ind]; };
 };
 
 class CMovingThing
-- 
cgit v1.2.3


From f67275be138d087106ad05c241a3cda9ca2d0373 Mon Sep 17 00:00:00 2001
From: Roman Masanin <36927roma@gmail.com>
Date: Sun, 27 Sep 2020 03:35:15 +0300
Subject: correction of defects and another two audio functions

---
 src/render/Fluff.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/render')

diff --git a/src/render/Fluff.h b/src/render/Fluff.h
index 460c12a8..d600def7 100644
--- a/src/render/Fluff.h
+++ b/src/render/Fluff.h
@@ -104,7 +104,7 @@ public:
 	void SwitchOff(void);
 	void AddThisOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, bool b_isMovingDown);
 	bool IsActive() { return m_bIsActive; };
-	CVector GetPosition() { return m_midPoint; };
+	const CVector& GetPosition() const { return m_midPoint; };
 };
 
 class CEscalators
@@ -116,7 +116,7 @@ public:
 	static void Update(void);
 	static void AddOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, bool b_isMovingDown);
 	static void Shutdown(void);
-	static CEscalator GetEscalator(int ind) { return aEscalators[ind]; };
+	static CEscalator& GetEscalator(int ind) { return aEscalators[ind]; };
 };
 
 class CMovingThing
-- 
cgit v1.2.3


From b956be0f44930fe1d764c07e680f7cee47c1587a Mon Sep 17 00:00:00 2001
From: Roman Masanin <36927roma@gmail.com>
Date: Sun, 27 Sep 2020 04:22:59 +0300
Subject: another clamp

---
 src/render/Fluff.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/render')

diff --git a/src/render/Fluff.h b/src/render/Fluff.h
index d600def7..a6a28cb7 100644
--- a/src/render/Fluff.h
+++ b/src/render/Fluff.h
@@ -103,7 +103,7 @@ public:
 	void Update(void);
 	void SwitchOff(void);
 	void AddThisOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, bool b_isMovingDown);
-	bool IsActive() { return m_bIsActive; };
+	bool IsActive() const { return m_bIsActive; };
 	const CVector& GetPosition() const { return m_midPoint; };
 };
 
@@ -116,7 +116,7 @@ public:
 	static void Update(void);
 	static void AddOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, bool b_isMovingDown);
 	static void Shutdown(void);
-	static CEscalator& GetEscalator(int ind) { return aEscalators[ind]; };
+	static const CEscalator& GetEscalator(int ind) { return aEscalators[ind]; };
 };
 
 class CMovingThing
-- 
cgit v1.2.3