From: Twinaphex <libretro@gmail.com>
Date: Thu, 24 Oct 2019 18:11:17 +0000 (+0200)
Subject: Merge pull request #358 from Sakitoshi/master
X-Git-Tag: r24l~692
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1990449de5befed3c0ee614ff4b6273cfe303a8e;hp=eb6943ee04b0f30a6f1cebfe399a94bacd1dfb45;p=pcsx_rearmed.git

Merge pull request #358 from Sakitoshi/master

sbi support for multidisc pbp
---

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index daed921e..8171674a 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -1140,13 +1140,18 @@ static int opensubfile(const char *isoname) {
 }
 
 static int opensbifile(const char *isoname) {
-	char		sbiname[MAXPATHLEN];
+	char		sbiname[MAXPATHLEN], disknum[MAXPATHLEN] = "0";
 	int		s;
 
 	strncpy(sbiname, isoname, sizeof(sbiname));
 	sbiname[MAXPATHLEN - 1] = '\0';
 	if (strlen(sbiname) >= 4) {
-		strcpy(sbiname + strlen(sbiname) - 4, ".sbi");
+		if (cdrIsoMultidiskCount > 1) {
+			sprintf(disknum, "_%i.sbi", cdrIsoMultidiskSelect + 1);
+			strcpy(sbiname + strlen(sbiname) - 4, disknum);
+		}
+		else
+			strcpy(sbiname + strlen(sbiname) - 4, ".sbi");
 	}
 	else {
 		return -1;