From ca1d899413d95c8c7ccf936d4e0ab8f02ec223f5 Mon Sep 17 00:00:00 2001
From: Roman Masanin <36927roma@gmail.com>
Date: Sun, 11 Oct 2020 22:29:49 +0300
Subject: [PATCH] final step

---
 src/render/SpecialFX.cpp | 20 +++++---------------
 src/render/SpecialFX.h   | 12 +++++++-----
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp
index b0506929..dcf795f5 100644
--- a/src/render/SpecialFX.cpp
+++ b/src/render/SpecialFX.cpp
@@ -824,7 +824,7 @@ C3dMarkers::PlaceMarker(uint32 identifier, uint16 type, CVector &pos, float size
 			} else {
 				pMarker->m_fStdSize = size;
 			}
-		} else if (type == MARKERTYPE_CYLINDER) {
+		} else {
 			if (dist < size + 12.0f) {
 				if (dist > size + 1.0f)
 					pMarker->m_Color.alpha = (1.0f - (size + 12.0f - dist) * 0.7f / 11.0f) * (float)a;
@@ -837,15 +837,9 @@ C3dMarkers::PlaceMarker(uint32 identifier, uint16 type, CVector &pos, float size
 		float someSin = Sin(TWOPI * (float)((pMarker->m_nPulsePeriod - 1) & (CTimer::GetTimeInMilliseconds() - pMarker->m_nStartTime)) / (float)pMarker->m_nPulsePeriod);
 		pMarker->m_fSize = pMarker->m_fStdSize - pulseFraction * pMarker->m_fStdSize * someSin;
 
-		if (type == MARKERTYPE_ARROW) {
+		if (type == MARKERTYPE_ARROW)
 			pos.z += 0.25f * pMarker->m_fStdSize * someSin;
-		} else if (type == MARKERTYPE_0) {
-			if (someSin > 0.0f)
-				pMarker->m_Color.alpha = (float)a * 0.7f * someSin + a;
-			else
-				pMarker->m_Color.alpha = (float)a * 0.4f * someSin + a;
-		}
-		if (pMarker->m_nRotateRate) {
+		if (pMarker->m_nRotateRate != 0) {
 			RwV3d pos = pMarker->m_Matrix.m_matrix.pos;
 			pMarker->m_Matrix.RotateZ(DEGTORAD(pMarker->m_nRotateRate * CTimer::GetTimeStep()));
 			pMarker->m_Matrix.GetPosition() = pos;
@@ -869,7 +863,7 @@ C3dMarkers::PlaceMarker(uint32 identifier, uint16 type, CVector &pos, float size
 		pMarker->DeleteMarkerObject();
 
 	pMarker->AddMarker(identifier, type, size, r, g, b, a, pulsePeriod, pulseFraction, rotateRate);
-	if (type == MARKERTYPE_CYLINDER || type == MARKERTYPE_0 || type == MARKERTYPE_2) {
+	if (type == MARKERTYPE_CYLINDER) {
 		if ((playerPos - pos).MagnitudeSqr() < sq(100.f) && CColStore::HasCollisionLoaded(CVector2D(pos))) {
 			float z = CWorld::FindGroundZFor3DCoord(pos.x, pos.y, pos.z + 1.0f, nil);
 			if (z != 0.0f)
@@ -880,10 +874,6 @@ C3dMarkers::PlaceMarker(uint32 identifier, uint16 type, CVector &pos, float size
 		}
 	}
 	pMarker->m_Matrix.SetTranslate(pos.x, pos.y, pos.z);
-	if (type == MARKERTYPE_2) {
-		pMarker->m_Matrix.RotateX(PI);
-		pMarker->m_Matrix.GetPosition() = pos;
-	}
 	pMarker->m_Matrix.UpdateRW();
 	if (type == MARKERTYPE_ARROW) {
 		if (dist < 25.0f) {
@@ -894,7 +884,7 @@ C3dMarkers::PlaceMarker(uint32 identifier, uint16 type, CVector &pos, float size
 		} else {
 			pMarker->m_fStdSize = size;
 		}
-	} else if (type == MARKERTYPE_CYLINDER) {
+	} else {
 		if (dist < size + 12.0f) {
 			if (dist > size + 1.0f)
 				pMarker->m_Color.alpha = (1.0f - (size + 12.0f - dist) * 0.7f / 11.0f) * (float)a;
diff --git a/src/render/SpecialFX.h b/src/render/SpecialFX.h
index 0284126c..897d8b92 100644
--- a/src/render/SpecialFX.h
+++ b/src/render/SpecialFX.h
@@ -109,12 +109,13 @@ public:
 	void Render(); //done
 };
 
+//done
 class C3dMarkers
 {
 public:
 	static void Init(); //done
 	static void Shutdown(); //done
-	static C3dMarker *PlaceMarker(uint32 id, uint16 type, CVector &pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate);
+	static C3dMarker *PlaceMarker(uint32 id, uint16 type, CVector &pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate); //done
 	static void PlaceMarkerSet(uint32 id, uint16 type, CVector &pos, float size, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate); //done
 	static void Render(); //done
 	static void Update(); //done
@@ -172,7 +173,7 @@ public:
 	static void Init(void); //done
 	static void RegisterOne(CVector pos, CVector up, CVector side, CVector front,
 		uint8 type, uint8 red = 0, uint8 green = 0, uint8 blue = 0); //done
-	static void Render(void); //looks similad but needs recheck
+	static void Render(void); //looks similad but needs recheck      !!!!!!!!!!!!!!!!!
 	static void RenderOutGeometryBuffer(void); //done
 };
 
@@ -235,11 +236,12 @@ public:
 	static void	RegisterOne(CVector vecPos, const char *pText, uint8 bRed, uint8 bGreen, uint8 bBlue, float fSize, float fOpacity); //done
 };
 
+//done
 class CSpecialParticleStuff
 {
 	static uint32 BoatFromStart;
 public:
-	static void CreateFoamAroundObject(CMatrix*, float, float, float, int32);
-	static void StartBoatFoamAnimation();
-	static void UpdateBoatFoamAnimation(CMatrix*);
+	static void CreateFoamAroundObject(CMatrix*, float, float, float, int32); //done, not used
+	static void StartBoatFoamAnimation(); //done, not used
+	static void UpdateBoatFoamAnimation(CMatrix*); //done, not used
 };