From dee006586341f67b8ab257985c82106ec1a601c1 Mon Sep 17 00:00:00 2001 From: NovaRain Date: Wed, 3 Apr 2019 22:01:53 +0800 Subject: [PATCH] Removed PipBoyAutomaps from ddraw.ini. * By default nothing will change with the option enabled, because all data is copied from the vanilla map list, and modders still need to add the new 'automap' parameter to override the engine values to add/remove areas in the automap list. Basically the option itself is redundant. --- artifacts/ddraw.ini | 4 ---- sfall/Modules/Worldmap.cpp | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index 34d1fea7..2a839b4b 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -684,10 +684,6 @@ SpecialDeathGVAR=491 ;Note that enabling this option can break the map changes in Modoc and Vault 15 DisableSpecialMapIDs=0 -;Set to 1 to add support for the new 'automap=yes/no' parameter to maps.txt -;The parameter can override the hardcoded values for displaying the map in the pipboy automaps for the first 160 maps -PipBoyAutomaps=0 - ;Set to 1 to display sfall built-in credits at the bottom of credits.txt contents instead of at the top CreditsAtBottom=0 diff --git a/sfall/Modules/Worldmap.cpp b/sfall/Modules/Worldmap.cpp index 8ed950ca..ba824bc9 100644 --- a/sfall/Modules/Worldmap.cpp +++ b/sfall/Modules/Worldmap.cpp @@ -535,13 +535,13 @@ void WorldMapFontPatch() { } void PipBoyAutomapsPatch() { - if (GetConfigInt("Misc", "PipBoyAutomaps", 0)) { + //if (GetConfigInt("Misc", "PipBoyAutomaps", 0)) { dlog("Applying Pip-Boy automaps patch.", DL_INIT); MakeCall(0x4BF931, wmMapInit_hack, 2); SafeWrite32(0x41B8B7, (DWORD)AutomapPipboyList); memcpy(AutomapPipboyList, (void*)FO_VAR_displayMapList, sizeof(AutomapPipboyList)); // copy vanilla data dlogr(" Done", DL_INIT); - } + //} } void Worldmap::SaveData(HANDLE file) {