# This is a combination of 19 commits.

# This is the 1st commit message:

fix merge

# This is the commit message #2:

Update support_paths.cpp

One last bit...
# This is the commit message #3:

Update support_paths.cpp
# This is the commit message #4:

quick fix for linux and a pass at overlays

# This is the commit message #5:

micro cleanup

# This is the commit message #6:

taitox superman, work-around for background breaks up with black vertical lines in the flying level.

# This is the commit message #7:

add Pacman Club / Club Lambada (Argentina) [barbudreadmon]

# This is the commit message #8:

d_pacman, remove left-overs

# This is the commit message #9:

d_pacman.cpp: add hiscores to clubpacm
# This is the commit message #10:

fixes

# This is the commit message #11:

more messing around

# This is the commit message #12:

more messing around

# This is the commit message #13:

mcr3: finish emulating power drive and maxrpm

# This is the commit message #14:

d_cps2: added Super Puzzle Fighter II Turbo (Boss Hack)(USA 960620)
# This is the commit message #15:

d_mcr3, left in some debug code.. oops

# This is the commit message #16:

d_cps2: add Super Puzzle Fighter 2 Turbo Color Blind hack

# This is the commit message #17:

Added an oldsplus hack which fixes many bugs.

For detail of corrections, please visit https://www.ppxclub.com/forum.php?mod=viewthread&tid=695504&fromuid=150233. You may need a translation tool since that page is in Chinese.
# This is the commit message #18:

maxrpm, fix p2 wheel inversion

# This is the commit message #19:

d_pgm: tag oldsplusnr as hack

makefile.sdl2

@@ -194,7 +194,7 @@ ASFLAGS	=  -O1 -f coff -w-orphan-labels
 
 ifdef WINDOWS
 	DEF	:= $(DEF) -DSDL_WINDOWS
-endif 
+endif
 
 ifdef UNICODE
 	DEF	:= $(DEF) -D_UNICODE
@@ -326,11 +326,22 @@ $(objdir)drivers.o:		$(autdrv)
 	@echo Linking drivers...
 	@$(LD) -r -nostdlib -o $@ $^
 
+ifdef WINDOWS
+
 $(NAME):	$(allobj) $(objdir)drivers.o
 	@echo
 	@echo Linking executable... $(NAME)
 	@$(LD)  -mconsole $(CFLAGS) $(LDFLAGS) -o $@ $^ $(lib)
 
+else
+
+$(NAME):	$(allobj) $(objdir)drivers.o
+	@echo
+	@echo Linking executable... $(NAME)
+	@$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(lib)
+endif
+
+
 ifdef	DEBUG
 
 #	Don't compress when making a debug build

src/burn/burn.h

@@ -72,16 +72,19 @@ extern TCHAR szAppEEPROMPath[MAX_PATH];
  #define WRITE_UNICODE_BOM(file)
 #endif
 
-#include <stdint.h>
-
-typedef uint8_t						UINT8;
-typedef int8_t 						INT8;
-typedef uint16_t					UINT16;
-typedef int16_t						INT16;
-typedef uint32_t					UINT32;
-typedef int32_t						INT32;
-typedef uint64_t					UINT64;
-typedef int64_t						INT64;
+typedef unsigned char						UINT8;
+typedef signed char 						INT8;
+typedef unsigned short						UINT16;
+typedef signed short						INT16;
+typedef unsigned int						UINT32;
+typedef signed int							INT32;
+#ifdef _MSC_VER
+typedef signed __int64						INT64;
+typedef unsigned __int64					UINT64;
+#else
+__extension__ typedef unsigned long long	UINT64;
+__extension__ typedef long long				INT64;
+#endif
 
 #include "state.h"
 #include "cheat.h"

src/burn/driver.h

@@ -7,7 +7,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
 #include <math.h>
 

src/burn/drv/capcom/d_cps2.cpp

@@ -6536,6 +6536,48 @@ static struct BurnRomInfo Spf2thRomDesc[] = {
 STD_ROM_PICK(Spf2th)
 STD_ROM_FN(Spf2th)
 
+static struct BurnRomInfo Spf2tbRomDesc[] = {
+	{ "pzfu_boss.03a", 0x080000, 0xca1f3e42, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
+	{ "pzf.04",        0x080000, 0xb80649e2, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
+
+	{ "pzf.14m",       0x100000, 0x2d4881cb, CPS2_GFX | BRF_GRA },
+	{ "pzf.16m",       0x100000, 0x4b0fd1be, CPS2_GFX | BRF_GRA },
+	{ "pzf.18m",       0x100000, 0xe43aac33, CPS2_GFX | BRF_GRA },
+	{ "pzf.20m",       0x100000, 0x7f536ff1, CPS2_GFX | BRF_GRA },
+
+	{ "pzf.01",        0x020000, 0x600fb2a3, CPS2_PRG_Z80 | BRF_ESS | BRF_PRG },
+	{ "pzf.02",        0x020000, 0x496076e0, CPS2_PRG_Z80 | BRF_ESS | BRF_PRG },
+
+	{ "pzf.11m",       0x200000, 0x78442743, CPS2_QSND | BRF_SND },
+	{ "pzf.12m",       0x200000, 0x399d2c7b, CPS2_QSND | BRF_SND },
+
+	{ "spf2tb.key",    0x000014, 0x5d7b15e8, CPS2_ENCRYPTION_KEY },
+};
+
+STD_ROM_PICK(Spf2tb)
+STD_ROM_FN(Spf2tb)
+
+static struct BurnRomInfo Spf2tcbRomDesc[] = {
+	{ "pzfe.03",       0x080000, 0x2af51954, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
+	{ "pzf.04",        0x080000, 0x01bf5ff5, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
+
+	{ "pzf.14m",       0x100000, 0x2d4881cb, CPS2_GFX | BRF_GRA },
+	{ "pzf.16m",       0x100000, 0x4b0fd1be, CPS2_GFX | BRF_GRA },
+	{ "pzf.18m",       0x100000, 0xe43aac33, CPS2_GFX | BRF_GRA },
+	{ "pzf.20m",       0x100000, 0x7f536ff1, CPS2_GFX | BRF_GRA },
+
+	{ "pzf.01",        0x020000, 0x600fb2a3, CPS2_PRG_Z80 | BRF_ESS | BRF_PRG },
+	{ "pzf.02",        0x020000, 0x496076e0, CPS2_PRG_Z80 | BRF_ESS | BRF_PRG },
+
+	{ "pzf.11m",       0x200000, 0x78442743, CPS2_QSND | BRF_SND },
+	{ "pzf.12m",       0x200000, 0x399d2c7b, CPS2_QSND | BRF_SND },
+
+	{ "spf2t.key",     0x000014, 0x4c4dc7e3, CPS2_ENCRYPTION_KEY },
+};
+
+STD_ROM_PICK(Spf2tcb)
+STD_ROM_FN(Spf2tcb)
+
 static struct BurnRomInfo Spf2xjRomDesc[] = {
 	{ "pzfj.03a",      0x080000, 0x2070554a, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
 	{ "pzf.04",        0x080000, 0xb80649e2, CPS2_PRG_68K | BRF_ESS | BRF_PRG },
@@ -10632,6 +10674,27 @@ struct BurnDriver BurnDrvCpsSpf2th = {
 	&CpsRecalcPal, 0x1000, 384, 224, 4, 3
 };
 
+struct BurnDriver BurnDrvCpsSpf2tb = {
+	"spf2tb", "spf2t", NULL, NULL, "200?",
+	"Super Puzzle Fighter II Turbo (Boss Hack)(USA 960620)\0", NULL, "Hack", "CPS2",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_HACK | BDF_HISCORE_SUPPORTED, 2, HARDWARE_CAPCOM_CPS2, GBF_PUZZLE, FBF_SF,
+	NULL, Spf2tbRomInfo, Spf2tbRomName, NULL, NULL, NULL, NULL, Spf2tInputInfo, NULL,
+	Cps2Init, DrvExit, Cps2Frame, CpsRedraw, CpsAreaScan,
+	&CpsRecalcPal, 0x1000, 384, 224, 4, 3
+};
+
+struct BurnDriver BurnDrvCpsSpf2tcb = {
+	"spf2tcb", "spf2t", NULL, NULL, "1996",
+	"Super Puzzle Fighter II Turbo (Color Blind Hack)\0", NULL, "Capcom", "CPS2",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_HACK | BDF_HISCORE_SUPPORTED, 2, HARDWARE_CAPCOM_CPS2, GBF_PUZZLE, FBF_SF,
+	NULL, Spf2tcbRomInfo, Spf2tcbRomName, NULL, NULL, NULL, NULL, Spf2tInputInfo, NULL,
+	Cps2Init, DrvExit, Cps2Frame, CpsRedraw, CpsAreaScan,
+	&CpsRecalcPal, 0x1000, 384, 224, 4, 3
+};
+
+
 struct BurnDriver BurnDrvCpsSsf2 = {
 	"ssf2", NULL, NULL, NULL, "1993",
 	"Super Street Fighter II - the new challengers (super street fighter 2 931005 etc)\0", NULL, "Capcom", "CPS2",

src/burn/drv/pgm/d_pgm.cpp

@@ -6047,3 +6047,37 @@ struct BurnDriver BurnDrvEspgalbl = {
 	ddp2Init, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900,
 	224, 448, 3, 4
 };
+
+// 西游释厄传-群魔乱舞(新版208版) Xi You Shi E Zhuan Super Plus (Qun Mo Luan Wu New 208 Revision)
+// More info at: https://www.ppxclub.com/forum.php?mod=viewthread&tid=695504&fromuid=150233
+
+static struct BurnRomInfo oldsplusnrRomDesc[] = {
+	{ "p05301n_v208.rom",	0x400000, 0x97A7CF98, 1 | BRF_PRG | BRF_ESS },	//  0 68K Code
+
+	{ "t05301.rom",			0x800000, 0x8257bbb0, 2 | BRF_GRA },		//  1 Tile data
+
+	{ "a05301n.rom",		0x800000, 0x3D3125FF, 3 | BRF_GRA },	 	//  2 Sprite Color Data
+	{ "a05302n.rom",		0x800000, 0x4ED9028C, 3 | BRF_GRA },		//  3
+	{ "a05303.rom",			0x800000, 0x13475d85, 3 | BRF_GRA },		//  4
+	{ "a05304.rom",			0x800000, 0xf03ef7a6, 3 | BRF_GRA },		//  5
+
+	{ "b05301n.rom",		0x800000, 0x13702BBF, 4 | BRF_GRA },		//  6 Sprite Masks & Color Indexes
+	{ "b05302n.rom",		0x800000, 0xB9F75120, 4 | BRF_GRA },		//  7
+
+	{ "m05301.rom",			0x400000, 0x86ec83bc, 5 | BRF_SND },		//  8 Samples
+
+	{ "oldsplus_igs027a.bin",	0x004000, 0x00000000, 7 | BRF_PRG | BRF_ESS | BRF_NODUMP },	//  9 Internal ARM7 Rom
+};
+
+STDROMPICKEXT(oldsplusnr, oldsplusnr, pgm)
+STD_ROM_FN(oldsplusnr)
+
+struct BurnDriver BurnDrvoldsplusnr = {
+	"oldsplusnr", "oldsplus", "pgm", NULL, "2020",
+	"Xi You Shi E Zhuan Super Plus (Qun Mo Luan Wu New 208 Revision)\0", "Incomplete Dump", "Hack", "PolyGameMaster",
+	NULL, NULL, NULL, NULL,
+	BDF_GAME_WORKING | BDF_CLONE | BDF_HACK, 4, HARDWARE_IGS_PGM/* | HARDWARE_IGS_USE_ARM_CPU*/, GBF_SCRFIGHT, 0,
+	NULL, oldsplusnrRomInfo, oldsplusnrRomName, NULL, NULL, NULL, NULL, pgmInputInfo, puzzli2DIPInfo,
+	oldsplusInit, pgmExit, pgmFrame, pgmDraw, pgmScan, &nPgmPalRecalc, 0x900,
+	448, 224, 4, 3
+};