Refactoring

Author: yuripourre

Source/diablo.cpp

@@ -3224,9 +3224,6 @@ tl::expected<void, std::string> LoadGameLevelTown(bool firstflag, lvl_entry lvld
 	if (gbIsMultiplayer)
 		DeltaLoadLevel();
 
-	if (lvldir == ENTRY_TOWNSWITCH)
-		InitTownTriggers();
-
 	IncProgress();
 
 	for (int x = 0; x < DMAXX; x++)

Source/interfac.cpp

@@ -473,6 +473,11 @@ void DoLoad(interface_mode uMsg)
 		}
 		IncProgress();
 		FreeGameMem();
+		if (!GetTownRegistry().HasTown(DestinationTownID)) {
+			LogError("WM_DIABTOWNSWITCH: unknown town '{}'", DestinationTownID);
+			loadResult = tl::make_unexpected<std::string>("Unknown destination town");
+			break;
+		}
 		GetTownRegistry().SetCurrentTown(DestinationTownID);
 
 		if (MyPlayer != nullptr) {
@@ -595,6 +600,19 @@ void ProgressEventHandler(const SDL_Event &event, uint16_t modState)
 
 } // namespace
 
+void QueueTownSwitch()
+{
+	if (MyPlayer != nullptr) {
+		MyPlayer->_pInvincible = true;
+		SDL_Event event;
+		CustomEventToSdlEvent(event, WM_DIABTOWNSWITCH);
+		if (!SDLC_PushEvent(&event)) {
+			LogError("QueueTownSwitch: {}", SDL_GetError());
+			SDL_ClearError();
+		}
+	}
+}
+
 void RegisterCustomEvents()
 {
 #ifndef USE_SDL1

Source/interfac.h

@@ -71,6 +71,9 @@ enum Cutscenes : uint8_t {
 	CutGate,
 };
 
+/** @brief Queues WM_DIABTOWNSWITCH for the local player (invincible until load completes). */
+void QueueTownSwitch();
+
 void interface_msg_pump();
 void IncProgress(uint32_t steps = 1);
 void CompleteProgress();

Source/levels/gendung.cpp

@@ -813,6 +813,11 @@ bool IsNearThemeRoom(WorldTilePosition testPosition)
 
 void InitLevels()
 {
+	// Note: InitializeTristram overwrites any existing "tristram" registration.
+	// Lua mods that called towns.register("tristram", ...) before InitLevels will
+	// have their config replaced. There is intentionally no registry Reset() here;
+	// mod-registered towns persist across new games and are re-populated by the
+	// Lua runtime at mod load time.
 	InitializeTristram();
 	currlevel = 0;
 	leveltype = DTYPE_TOWN;

Source/levels/town.cpp

@@ -13,6 +13,7 @@
 #include "player.h"
 #include "quests.h"
 #include "utils/endian_swap.hpp"
+#include "utils/log.hpp"
 
 namespace devilution {
 
@@ -200,33 +201,35 @@ void DrlgTPass3()
 		}
 	}
 
-	const TownConfig &config = GetTownRegistry().GetTown(GetTownRegistry().GetCurrentTown());
+	const std::string &townId = GetTownRegistry().GetCurrentTown();
+	if (!GetTownRegistry().HasTown(townId)) {
+		LogError("DrlgTPass3: current town '{}' not registered", townId);
+		return;
+	}
+	const TownConfig &config = GetTownRegistry().GetTown(townId);
 	for (const auto &sector : config.sectors) {
 		FillSector(sector.filePath.c_str(), sector.x, sector.y);
 	}
 
-	if (GetTownRegistry().GetCurrentTown() == "tristram") {
+	for (const TownWarpPatch &patch : config.warpClosedPatches) {
+		if (IsWarpOpen(patch.requiredWarp))
+			continue;
+		for (const auto &[pos, cellVal] : patch.dungeonCells)
+			dungeon[pos.x][pos.y] = static_cast<uint8_t>(cellVal);
+		for (const TownWarpFillTile &ft : patch.fillTiles)
+			FillTile(ft.x, ft.y, ft.tile);
+		if (patch.randomGroundStrip.has_value()) {
+			const TownWarpClosedRandomGroundStrip &strip = *patch.randomGroundStrip;
+			for (int x = strip.xStart; x < strip.xEndExclusive; x++) {
+				FillTile(x, strip.y, PickRandomlyAmong({ 1, 2, 3, 4 }));
+			}
+		}
+	}
+
+	if (townId == TristramTownId) {
 		auto dunData = LoadFileInMem<uint16_t>("levels\\towndata\\automap.dun");
 		PlaceDunTiles(dunData.get(), { 0, 0 });
 
-		if (!IsWarpOpen(DTYPE_CATACOMBS)) {
-			dungeon[20][7] = 10;
-			dungeon[20][6] = 8;
-			FillTile(48, 20, 320);
-		}
-		if (!IsWarpOpen(DTYPE_CAVES)) {
-			dungeon[4][30] = 8;
-			FillTile(16, 68, 332);
-			FillTile(16, 70, 331);
-		}
-		if (!IsWarpOpen(DTYPE_HELL)) {
-			dungeon[15][35] = 7;
-			dungeon[16][35] = 7;
-			dungeon[17][35] = 7;
-			for (int x = 36; x < 46; x++) {
-				FillTile(x, 78, PickRandomlyAmong({ 1, 2, 3, 4 }));
-			}
-		}
 		if (gbIsHellfire) {
 			if (IsWarpOpen(DTYPE_NEST)) {
 				TownOpenHive();
@@ -361,7 +364,12 @@ void CleanTownFountain()
 
 void CreateTown(lvl_entry entry)
 {
-	const TownConfig &config = GetTownRegistry().GetTown(GetTownRegistry().GetCurrentTown());
+	const std::string &townId = GetTownRegistry().GetCurrentTown();
+	if (!GetTownRegistry().HasTown(townId)) {
+		LogError("CreateTown: current town '{}' not registered", townId);
+		return;
+	}
+	const TownConfig &config = GetTownRegistry().GetTown(townId);
 	dminPosition = config.dminPosition;
 	dmaxPosition = config.dmaxPosition;
 	ViewPosition = config.GetEntryPoint(entry, TWarpFrom);