Refactoring

Author: yuripourre

Source/diablo.cpp

@@ -1404,7 +1404,17 @@ tl::expected<void, std::string> LoadLvlGFX()
 			pMegaTiles = std::move(*til);
 		}
 
-		ASSIGN_OR_RETURN(pSpecialCels, LoadCelWithStatus(active.specialCelsPath.c_str(), SpecialCelWidth));
+		// Special CELs: try active path, fall back to Tristram's if different.
+		auto specialCels = LoadCelWithStatus(active.specialCelsPath.c_str(), SpecialCelWidth);
+		if (!specialCels.has_value()) {
+			if (active.specialCelsPath != tristramAssets.specialCelsPath) {
+				ASSIGN_OR_RETURN(pSpecialCels, LoadCelWithStatus(tristramAssets.specialCelsPath.c_str(), SpecialCelWidth));
+			} else {
+				return tl::make_unexpected(std::move(specialCels.error()));
+			}
+		} else {
+			pSpecialCels = std::move(*specialCels);
+		}
 		return {};
 	}
 	case DTYPE_CATHEDRAL:

Source/loadsave.cpp

@@ -2474,6 +2474,11 @@ tl::expected<void, std::string> LoadGame(bool firstflag)
 {
 	FreeGameMem();
 
+	// Ensure Tristram is always registered before any level asset loading.
+	// For new games this is done by InitLevels() before RunGameLoop, but the
+	// load-game path skips that block, so we must initialize here.
+	InitializeTristram();
+
 	LoadHelper file(OpenSaveArchive(gSaveNumber), "game");
 	if (!file.IsValid()) {
 		return tl::make_unexpected(std::string(_("Unable to open save file archive")));

Source/stores.cpp

@@ -77,30 +77,20 @@ std::vector<std::pair<std::string, std::vector<TownerDialogOption>>> ExtraTowner
 
 const char *TownerNameForTalkID(TalkID s)
 {
-	const auto lookup = [](const _talker_id id) -> const char * {
-		auto it = TownerShortNames.find(id);
-		return it != TownerShortNames.end() ? it->second : nullptr;
-	};
+	_talker_id townerId;
 	switch (s) {
-	case TalkID::Smith:
-		return lookup(TOWN_SMITH);
-	case TalkID::Witch:
-		return lookup(TOWN_WITCH);
-	case TalkID::Boy:
-		return lookup(TOWN_PEGBOY);
-	case TalkID::Healer:
-		return lookup(TOWN_HEALER);
-	case TalkID::Storyteller:
-		return lookup(TOWN_STORY);
-	case TalkID::Tavern:
-		return lookup(TOWN_TAVERN);
-	case TalkID::Drunk:
-		return lookup(TOWN_DRUNK);
-	case TalkID::Barmaid:
-		return lookup(TOWN_BMAID);
-	default:
-		return nullptr;
-	}
+	case TalkID::Smith:       townerId = TOWN_SMITH;  break;
+	case TalkID::Witch:       townerId = TOWN_WITCH;  break;
+	case TalkID::Boy:         townerId = TOWN_PEGBOY; break;
+	case TalkID::Healer:      townerId = TOWN_HEALER; break;
+	case TalkID::Storyteller: townerId = TOWN_STORY;  break;
+	case TalkID::Tavern:      townerId = TOWN_TAVERN; break;
+	case TalkID::Drunk:       townerId = TOWN_DRUNK;  break;
+	case TalkID::Barmaid:     townerId = TOWN_BMAID;  break;
+	default:                  return nullptr;
+	}
+	const auto it = TownerShortNames.find(townerId);
+	return it != TownerShortNames.end() ? it->second : nullptr;
 }
 
 /** Finds the entry for a towner in ExtraTownerOptions, or nullptr if none. */