little cleanup

8 files changed, 27 insertions, 35 deletions

diff --git a/src/BulletTrace.h b/src/BulletTrace.h
deleted file mode 100644
index d6831ef1..00000000
--- a/src/BulletTrace.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "common.h"
-
-struct CBulletTrace
-{
-	CVector m_vecInf;
-	CVector m_vecSup;
-	bool m_bInUse;
-	uint8 m_bFramesInUse;
-	uint8 m_bLifeTime;
-};
diff --git a/src/BulletTraces.cpp b/src/BulletTraces.cpp
deleted file mode 100644
index e7348a7b..00000000
--- a/src/BulletTraces.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "common.h"
-#include "patcher.h"
-#include "BulletTraces.h"
-
-CBulletTrace (&CBulletTraces::aTraces)[16] = *(CBulletTrace(*)[16])*(uintptr*)0x72B1B8;
-
-WRAPPER void CBulletTraces::Init(void) { EAXJMP(0x518DE0); }
diff --git a/src/BulletTraces.h b/src/BulletTraces.h
deleted file mode 100644
index 5a37c53c..00000000
--- a/src/BulletTraces.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "BulletTrace.h"
-
-class CBulletTraces
-{
-public:
-	static CBulletTrace(&aTraces)[16];
-
-	static void Init(void);
-};
diff --git a/src/Skidmarks.cpp b/src/Skidmarks.cpp
deleted file mode 100644
index e69de29b..00000000
--- a/src/Skidmarks.cpp
+++ /dev/null
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index b6a7b8c2..1d041d2e 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -2,7 +2,7 @@
 #include "patcher.h"
 #include "AnimBlendAssociation.h"
 #include "Boat.h"
-#include "BulletTraces.h"
+#include "SpecialFX.h"
 #include "CarCtrl.h"
 #include "CivilianPed.h"
 #include "Clock.h"
@@ -268,8 +268,8 @@ void CReplay::RecordThisFrame(void)
 		tBulletTracePacket* bt = (tBulletTracePacket*)&Record.m_pBase[Record.m_nOffset];
 		bt->type = REPLAYPACKET_BULLET_TRACES;
 		bt->index = i;
-		bt->frames = CBulletTraces::aTraces[i].m_bFramesInUse;
-		bt->lifetime = CBulletTraces::aTraces[i].m_bLifeTime;
+		bt->frames = CBulletTraces::aTraces[i].m_framesInUse;
+		bt->lifetime = CBulletTraces::aTraces[i].m_lifeTime;
 		bt->inf = CBulletTraces::aTraces[i].m_vecInf;
 		bt->sup = CBulletTraces::aTraces[i].m_vecSup;
 		Record.m_nOffset += sizeof(*bt);
@@ -857,8 +857,8 @@ bool CReplay::PlayBackThisFrameInterpolation(CAddressInReplayBuffer *buffer, flo
 		{
 			tBulletTracePacket* pb = (tBulletTracePacket*)&ptr[offset];
 			CBulletTraces::aTraces[pb->index].m_bInUse = true;
-			CBulletTraces::aTraces[pb->index].m_bFramesInUse = pb->frames;
-			CBulletTraces::aTraces[pb->index].m_bLifeTime = pb->lifetime;
+			CBulletTraces::aTraces[pb->index].m_framesInUse = pb->frames;
+			CBulletTraces::aTraces[pb->index].m_lifeTime = pb->lifetime;
 			CBulletTraces::aTraces[pb->index].m_vecInf = pb->inf;
 			CBulletTraces::aTraces[pb->index].m_vecSup = pb->sup;
 			buffer->m_nOffset += sizeof(tBulletTracePacket);
diff --git a/src/EmergencyPed.cpp b/src/entities/EmergencyPed.cpp
index 7b847896..7b847896 100644
--- a/src/EmergencyPed.cpp
+++ b/src/entities/EmergencyPed.cpp
diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp
index 32923b12..a0731b1c 100644
--- a/src/render/SpecialFX.cpp
+++ b/src/render/SpecialFX.cpp
@@ -5,3 +5,8 @@
 WRAPPER void CSpecialFX::Render(void) { EAXJMP(0x518DC0); }
 
 WRAPPER void CMotionBlurStreaks::RegisterStreak(int32 id, uint8 r, uint8 g, uint8 b, CVector p1, CVector p2) { EAXJMP(0x519460); }
+
+
+CBulletTrace (&CBulletTraces::aTraces)[16] = *(CBulletTrace(*)[16])*(uintptr*)0x72B1B8;
+
+WRAPPER void CBulletTraces::Init(void) { EAXJMP(0x518DE0); }
diff --git a/src/render/SpecialFX.h b/src/render/SpecialFX.h
index 1a1a4c1e..1035b315 100644
--- a/src/render/SpecialFX.h
+++ b/src/render/SpecialFX.h
@@ -11,3 +11,20 @@ class CMotionBlurStreaks
 public:
 	static void RegisterStreak(int32 id, uint8 r, uint8 g, uint8 b, CVector p1, CVector p2);
 };
+
+struct CBulletTrace
+{
+	CVector m_vecInf;
+	CVector m_vecSup;
+	bool m_bInUse;
+	uint8 m_framesInUse;
+	uint8 m_lifeTime;
+};
+
+class CBulletTraces
+{
+public:
+	static CBulletTrace (&aTraces)[16];
+
+	static void Init(void);
+};