- fix conflicts caused by merges

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 <stdlib.h>		// getenv
-#include <PLATFORM.H>
 
 // [A]
 void ShowSavingWaitMessage(char *message, int height)

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)

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");
 

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

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()

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
+Pos=301,215
-Size=345,180
+Size=577,393
 Collapsed=0