Removed ExtraSaveSlots from ddraw.ini (always enabled)

Changed the maximum number of save slots to 1000 (10k was overkill).

Author: NovaRain

artifacts/ddraw.ini

@@ -514,14 +514,15 @@ UseScrollingQuestsList=1
 ;ConsoleOutputPath=console.txt
 
 ;Set to 1 to add additional pages of save slots
-ExtraSaveSlots=0
+;This option is always enabled in 4.4.10/3.8.50 or later and cannot be disabled (kept for reference only)
+ExtraSaveSlots=1
 
-;To use more than one save slot for quick saving (F6 key) without picking a slot beforehand, set the next two lines
+;To use more than one save slot for quick saving (F6 key) without picking a slot beforehand, set the next two options
 ;Quick save will cyclically overwrite saves from the first slot on the specified page to the last slot on the n-th page
-;AutoQuickSave sets how many pages you want to use for quick saving (valid range: 1..10)
+;AutoQuickSave sets the number of pages used for quick saving (valid range: 1..10)
 ;Set to 0 to disable
 AutoQuickSave=0
-;AutoQuickSavePage is the page number to start at if ExtraSaveSlots is enabled (valid range: 0..999)
+;AutoQuickSavePage sets the starting page number for quick saving (valid range: 0..99)
 ;Set to -1 to use the current selected page (not recommended)
 AutoQuickSavePage=1
 

sfall/Modules/ExtraSaveSlots.cpp

@@ -37,7 +37,7 @@ long ExtraSaveSlots::GetSaveSlot() {
 }
 
 void ExtraSaveSlots::SetSaveSlot(long page, long slot) {
-	if (page >= 0 && page <= 9990) LSPageOffset = page - (page % 10);
+	if (page >= 0 && page <= 990) LSPageOffset = page - (page % 10);
 	if (slot >= 0 && slot < 10) fo::var::slot_cursor = slot;
 }
 
@@ -67,7 +67,7 @@ static void LoadPageOffsets() {
 		fo::var::slot_cursor = 0;
 	}
 	LSPageOffset = IniReader::GetInt("POSITION", "PageOffset", 0, LoadPath);
-	if (LSPageOffset > 9990) {
+	if (LSPageOffset > 990) {
 		LSPageOffset = 0;
 	}
 }
@@ -116,7 +116,7 @@ static void SetPageNum() {
 
 	DWORD NewTick = 0, OldTick = 0;
 	int button = 0, exitFlag = 0, numpos = 0;
-	char Number[4], blip = '_';
+	char Number[3], blip = '_';
 
 	DWORD tempPageOffset = -1;
 
@@ -161,7 +161,7 @@ static void SetPageNum() {
 
 		button = fo::func::get_input();
 		if (button >= '0' && button <= '9') {
-			if (numpos < 3) {
+			if (numpos < 2) {
 				Number[numpos] = button;
 				Number[numpos + 1] = '\0';
 				numpos++;
@@ -172,7 +172,7 @@ static void SetPageNum() {
 					tempPageOffset = (atoi(Number)) * 10;
 				}
 			}
-			//else exitFlag=-1;
+			//else exitFlag = -1;
 		} else if (button == 0x08 && numpos) {
 			numpos--;
 			Number[numpos] = '\0';
@@ -188,7 +188,7 @@ static void SetPageNum() {
 		}
 	}
 
-	if (tempPageOffset != -1 && tempPageOffset <= 9990) {
+	if (tempPageOffset != -1 && tempPageOffset <= 990) {
 		LSPageOffset = tempPageOffset;
 	}
 
@@ -199,22 +199,22 @@ static long __fastcall CheckPage(long button) {
 	switch (button) {
 	case 0x14B: // left button
 		LSPageOffset -= 10;
-		if (LSPageOffset < 0) LSPageOffset += 10000; // to the last page
+		if (LSPageOffset < 0) LSPageOffset += 1000; // to the last page
 		__asm call fo::funcoffs::gsound_red_butt_press_;
 		break;
 	case 0x149: // fast left PGUP button
 		LSPageOffset -= 100;
-		if (LSPageOffset < 0) LSPageOffset += 10000;
+		if (LSPageOffset < 0) LSPageOffset += 1000;
 		__asm call fo::funcoffs::gsound_red_butt_press_;
 		break;
 	case 0x14D: // right button
 		LSPageOffset += 10;
-		if (LSPageOffset >= 10000) LSPageOffset -= 10000; // to the first page
+		if (LSPageOffset >= 1000) LSPageOffset -= 1000; // to the first page
 		__asm call fo::funcoffs::gsound_red_butt_press_;
 		break;
 	case 0x151: // fast right PGDN button
 		LSPageOffset += 100;
-		if (LSPageOffset >= 10000) LSPageOffset -= 10000;
+		if (LSPageOffset >= 1000) LSPageOffset -= 1000;
 		__asm call fo::funcoffs::gsound_red_butt_press_;
 		break;
 	case 'p': // p/P button pressed - start SetPageNum func
@@ -468,7 +468,7 @@ static DWORD __stdcall QuickSaveGame(fo::DbFile* file, char* filename) {
 				if (++currentPageCount >= quickSavePageCount) {
 					currentPageCount = 0;
 					quickSavePage = quickSavePageInit;
-				} else if (quickSavePage <= 9980) {
+				} else if (quickSavePage <= 980) {
 					quickSavePage += 10;
 				}
 			}
@@ -524,29 +524,29 @@ long ExtraSaveSlots::GetQuickSaveSlot() {
 void ExtraSaveSlots::SetQuickSaveSlot(long page, long slot, long check) {
 	if (page < 0) {
 		quickSavePage = -1;
-	} else if (page <= 9990) {
+	} else if (page <= 990) {
 		quickSavePage = page - (page % 10);
 	}
 	if (slot >= 0 && slot < 10) quickSaveSlot = slot;
 	dontCheckSlot = check;
 }
 
 void ExtraSaveSlots::init() {
-	bool extraSaveSlots = (IniReader::GetConfigInt("Misc", "ExtraSaveSlots", 0) != 0);
-	if (extraSaveSlots) {
+	//bool extraSaveSlots = (IniReader::GetConfigInt("Misc", "ExtraSaveSlots", 1) != 0);
+	//if (extraSaveSlots) {
 		dlogr("Applying extra save slots patch.", DL_INIT);
 		EnableSuperSaving();
-	}
+	//}
 
 	quickSavePageCount = IniReader::GetConfigInt("Misc", "AutoQuickSave", 0);
 	if (quickSavePageCount > 0) {
 		dlogr("Applying auto quick save patch.", DL_INIT);
 		if (quickSavePageCount > 10) quickSavePageCount = 10;
 
 		quickSavePage = IniReader::GetConfigInt("Misc", "AutoQuickSavePage", 1);
-		if (quickSavePage > 999) quickSavePage = 999;
+		if (quickSavePage > 99) quickSavePage = 99;
 
-		if (extraSaveSlots && quickSavePage >= 0) {
+		if (/*extraSaveSlots &&*/ quickSavePage >= 0) {
 			quickSavePage *= 10;
 			quickSavePageInit = quickSavePage;
 		}