From 949d73a1902c501d0c5f79690b09ea9b5a9d5a23 Mon Sep 17 00:00:00 2001
From: Ilya Shurumov <ishurumov@gmail.com>
Date: Fri, 20 Nov 2020 21:45:23 +0600
Subject: [PATCH] - fix conflicts caused by merges

---
 src_rebuild/GAME/C/LOADSAVE.C                  | 4 ++--
 src_rebuild/GAME/C/SYSTEM.C                    | 1 +
 src_rebuild/GAME/C/XAPLAY.C                    | 4 ++--
 src_rebuild/redriver2_psxpc.cpp                | 2 ++
 src_rebuild/utils/video_source/VideoPlayer.cpp | 1 +
 tools/cosmetic_edit/imgui.ini                  | 6 +++---
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src_rebuild/GAME/C/LOADSAVE.C b/src_rebuild/GAME/C/LOADSAVE.C
index 4baf2315..0520eef2 100644
--- a/src_rebuild/GAME/C/LOADSAVE.C
+++ b/src_rebuild/GAME/C/LOADSAVE.C
@@ -14,10 +14,10 @@
 #include "E3STUFF.H"
 #include "PRES.H"
 #include "PAUSE.H"
+#include "PLATFORM.H"
 
 #ifndef PSX
-#include <stdlib.h>
-#include <PLATFORM.H>
+#include <stdlib.h>		// getenv
 
 // [A]
 void ShowSavingWaitMessage(char *message, int height)
diff --git a/src_rebuild/GAME/C/SYSTEM.C b/src_rebuild/GAME/C/SYSTEM.C
index b3ab49d8..79d3502e 100644
--- a/src_rebuild/GAME/C/SYSTEM.C
+++ b/src_rebuild/GAME/C/SYSTEM.C
@@ -792,6 +792,7 @@ void loadsectorsPC(char* filename, char* addr, int sector, int nsectors)
 	strcpy(namebuffer, filename);
 	FixPathSlashes(namebuffer);
 
+
 	FILE* fp = fopen(namebuffer, "rb");
 
 	if (!fp)
diff --git a/src_rebuild/GAME/C/XAPLAY.C b/src_rebuild/GAME/C/XAPLAY.C
index c6499e60..239d2111 100644
--- a/src_rebuild/GAME/C/XAPLAY.C
+++ b/src_rebuild/GAME/C/XAPLAY.C
@@ -354,7 +354,7 @@ void PlayXA(int num, int index)
 	{
 		char fileName[250];
 		sprintf(fileName, XANameFormat, gDataFolder, num+1, index);
-		fixslashes(fileName);
+		FixPathSlashes(fileName);
 
 		g_wavData = new CSoundSource_WaveCache();
 
@@ -392,7 +392,7 @@ void PlayXA(int num, int index)
 #else
 			// Load subtitles for XA
 			sprintf(fileName, "%sXA\\XABNK0%d.XA[%d].SBN", gDataFolder, num + 1, index);
-			fixslashes(fileName);
+			FixPathSlashes(fileName);
 
 			FILE* fp = fopen(fileName, "rb");
 
diff --git a/src_rebuild/redriver2_psxpc.cpp b/src_rebuild/redriver2_psxpc.cpp
index 7faa12b5..ea2e8ed4 100644
--- a/src_rebuild/redriver2_psxpc.cpp
+++ b/src_rebuild/redriver2_psxpc.cpp
@@ -13,7 +13,9 @@
 #include <SDL_scancode.h>
 
 #include "C/CUTSCENE.H"
+#include "C/GLAUNCH.H"
 #include "C/OVERLAY.H"
+#include "C/PLAYERS.H"
 
 
 // eq engine console output
diff --git a/src_rebuild/utils/video_source/VideoPlayer.cpp b/src_rebuild/utils/video_source/VideoPlayer.cpp
index ab812396..0d6d7bf3 100644
--- a/src_rebuild/utils/video_source/VideoPlayer.cpp
+++ b/src_rebuild/utils/video_source/VideoPlayer.cpp
@@ -13,6 +13,7 @@
 #include <SDL_timer.h>
 #include <AL/al.h>
 #include <jpeglib.h>
+#include "PLATFORM.H"
 
 // Partially decompiled function from FMV EXE
 void InitFMVFont()
diff --git a/tools/cosmetic_edit/imgui.ini b/tools/cosmetic_edit/imgui.ini
index 2abc50b0..54ea2561 100644
--- a/tools/cosmetic_edit/imgui.ini
+++ b/tools/cosmetic_edit/imgui.ini
@@ -1,10 +1,10 @@
 [Window][Debug##Default]
-Pos=60,60
+Pos=150,104
 Size=400,400
 Collapsed=0
 
 [Window][Hello, world!]
-Pos=83,98
-Size=345,180
+Pos=301,215
+Size=577,393
 Collapsed=0