From af5bd951aeb43c341d5126bc4141992169e46d57 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Wed, 31 Jul 2019 17:54:18 +0200
Subject: More audio ped

---
 src/core/re3.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'src/core/re3.cpp')

diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index ad3838bd..0ce5ee3c 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -374,6 +374,32 @@ delayedPatches10(int a, int b)
 }
 */
 
+<<<<<<< HEAD
+=======
+void __declspec(naked) HeadlightsFix()
+{
+	static const float		fMinusOne = -1.0f;
+	_asm
+	{
+		fld		[esp+708h-690h]
+		fcomp	fMinusOne
+		fnstsw	ax
+		and		ah, 5
+		cmp		ah, 1
+		jnz		HeadlightsFix_DontLimit
+		fld		fMinusOne
+		fstp	[esp+708h-690h]
+
+HeadlightsFix_DontLimit:
+		fld		[esp+708h-690h]
+		fabs
+		fld		st
+		push		0x5382F2
+		retn
+	}
+}
+
+>>>>>>> More audio ped
 const int   re3_buffsize = 1024;
 static char re3_buff[re3_buffsize];
 
-- 
cgit v1.2.3


From 458fc63f0196dc92362b44d5cf7ebf67bbc903e1 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Fri, 2 Aug 2019 17:43:40 +0200
Subject: Cleanup

---
 src/core/re3.cpp | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'src/core/re3.cpp')

diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 0ce5ee3c..ad3838bd 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -374,32 +374,6 @@ delayedPatches10(int a, int b)
 }
 */
 
-<<<<<<< HEAD
-=======
-void __declspec(naked) HeadlightsFix()
-{
-	static const float		fMinusOne = -1.0f;
-	_asm
-	{
-		fld		[esp+708h-690h]
-		fcomp	fMinusOne
-		fnstsw	ax
-		and		ah, 5
-		cmp		ah, 1
-		jnz		HeadlightsFix_DontLimit
-		fld		fMinusOne
-		fstp	[esp+708h-690h]
-
-HeadlightsFix_DontLimit:
-		fld		[esp+708h-690h]
-		fabs
-		fld		st
-		push		0x5382F2
-		retn
-	}
-}
-
->>>>>>> More audio ped
 const int   re3_buffsize = 1024;
 static char re3_buff[re3_buffsize];
 
-- 
cgit v1.2.3


From 2fabbc3b4cab40220986f402569af64673cb4cd9 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Fri, 16 Aug 2019 20:17:15 +0200
Subject: More more more audio

---
 src/core/re3.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/core/re3.cpp')

diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index ad3838bd..9737fddb 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -425,7 +425,7 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con
 	abort();
 }
 
-void re3_debug(char *format, ...)
+void re3_debug(const char *format, ...)
 {
 	va_list va;
 	va_start(va, format);
@@ -435,7 +435,7 @@ void re3_debug(char *format, ...)
 	printf("%s", re3_buff);
 }
 
-void re3_trace(const char *filename, unsigned int lineno, const char *func, char *format, ...)
+void re3_trace(const char *filename, unsigned int lineno, const char *func, const char *format, ...)
 {
 	char buff[re3_buffsize *2];
 	va_list va;
-- 
cgit v1.2.3