calref · NQNStudios · Aug 1, 2025 · Aug 1, 2025 · Aug 2, 2025 · Aug 2, 2025
diff --git a/doc/editor/Contents.html b/doc/editor/Contents.html
@@ -6,7 +6,6 @@
 </head>
 <body>
 <h1><img src="../img/boe.gif"> <u><b>Blades Scenario Editor Instructions</b></u></h1>
-<p><i>Copyright 1998, Spiderweb Software, Inc.</i></p>
 <p>This document contains all the information you need to play use the Blades of Exile Scenario Editor and make new scenarios for Blades of Exile!</p>
 <p>This menu can also take you to the different sections of this document. To find the thing you're looking for, try the table of contents...</p>
 <h2>Table of Contents</h2>
@@ -98,15 +97,5 @@ <h2>Technical support</h2>
 <li><a href="http://spiderwebforums.ipbhost.com/index.php?/forum/12-blades-of-exile/">Blades of Exile Forum at Spiderweb Software</a></li>
 <li><a href='irc://irc.freenode.net/openboe'>Blades of Exile IRC channel</a></li>
 </ul>
-<h3>Spiderweb Software</h3>
-<ul>
-<li>PO Box 85659</li>
-<li>Seattle, WA 98145-1659</li>
-<li>(206) 789-4438</li>
-<li>E-mail: <a href="mailto:spidweb@spidweb.com">SpidWeb@spidweb.com</a></li>
-<li>America Online: SpidWeb</li>
-<li>CompuServe: 76463,1521</li>
-<li>Internet: <a href="http://www.spiderwebsoftware.com">http://www.spiderwebsoftware.com</a></li>
-</ul>
 </body>
 </html>
diff --git a/pkg/credits/Funding.txt b/pkg/credits/Funding.txt
@@ -10,6 +10,7 @@ Confirmed:
 - Bret Rodabaugh
 - Dylan Nugent
 - Evan Mulrooney
+- Glen Chudley
 - Jake Harrelson
 - Jared Forcinito
 - Jeff Potter
@@ -25,6 +26,7 @@ Confirmed:
 - K L
 - Laura Nelson
 - Mariann Krizsan
+- Maryanne Wachter
 - Mike Lapinsky
 - Nathan Rickey
 - Nick Chaimov

diff --git a/proj/xc12/BoE.xcodeproj/project.pbxproj b/proj/xc12/BoE.xcodeproj/project.pbxproj
@@ -2516,7 +2516,7 @@
 					"-Wno-quoted-include-in-framework-header",
 					"-Wno-shorten-64-to-32",
 					"-Wno-comma",
-					"-Werror=implicit-fallthrough",
+					"-Wimplicit-fallthrough",
 				);
 			};
 			name = Debug;
@@ -2631,7 +2631,7 @@
 					"-Wno-quoted-include-in-framework-header",
 					"-Wno-shorten-64-to-32",
 					"-Wno-comma",
-					"-Werror=implicit-fallthrough",
+					"-Wimplicit-fallthrough",
 				);
 			};
 			name = Release;

diff --git a/rsrc/dialogs/about-boe.xml b/rsrc/dialogs/about-boe.xml
@@ -18,11 +18,11 @@
 		<!-- The height of this text needs to be 10 times the number of lines. -->
 		<text top='52' left='50' width='400' height='240'>
 			ORIGINAL GAME: <br/><br/><br/><br/><br/><br/>
-			OPEN SOURCE CREDITS: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
+			OPEN SOURCE CREDITS: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
 			SCENARIO FIXES AND UPDATES: <br/><br/>
 		</text>
 		<!-- This text is right-aligned and fills out the above text with sub-headings -->
-		<text top='52' left='40' width='190' height='840' align='right'>
+		<text top='52' left='40' width='190' height='860' align='right'>
 			<br/>
 			Concept, Design, Programming: <br/>
 			Graphics: <br/>
@@ -34,11 +34,11 @@
 			Graphics: <br/><br/><br/><br/><br/><br/><br/>
 			Consulting: <br/><br/><br/><br/>
 			Testing and Troubleshooting: <br/><br/>
-			Funding: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
+			Funding: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
 			<br/><br/>
 			Bandit Busywork: <br/>
 		</text>
-		<text top='52' left='250' width='230' height='840'>
+		<text top='52' left='250' width='230' height='860'>
 			<!-- ORIGINAL GAME --><br/>
 			<!-- Concept, Design, Programming -->Jeff Vogel <br/>
 			<!-- Graphics -->Andrew Hunter <br/>
@@ -84,6 +84,7 @@
 							Bret Rodabaugh <br/>
 							Dylan Nugent <br/>
 							Evan Mulrooney <br/>
+							Glen Chudley <br/>
 							Jake Harrelson <br/>
 							Jared Forcinito <br/>
 							Jeff Potter <br/>
@@ -99,6 +100,7 @@
 							K L <br/>
 							Laura Nelson <br/>
 							Mariann Krizsan <br/>
+							Maryanne Wachter <br/>
 							Mike Lapinsky <br/>
 							Nathan Rickey <br/>
 							Nick Chaimov <br/>

diff --git a/rsrc/dialogs/get-items.xml b/rsrc/dialogs/get-items.xml
@@ -4,6 +4,8 @@
 <dialog defbtn='done' escbtn='done'>
 	<button name='done' type='done' top='408' left='337'/>
 	<pict type='dlog' num='2' top='10' left='10'/>
+	<button name='gold' type='small' def-key='shift 4' relative='pos-in pos' rel-anchor='prev' top='4' left='0'><key/></button>
+	<text name='gold-label' relative='pos pos-in' rel-anchor='prev' top='0' left='2' width='38'>Get all gold</text>
 	<button name='pc1' type='small' def-key='1' top='354' left='89'><key/></button>
 	<button name='pc2' type='small' def-key='2' top='354' left='174'><key/></button>
 	<button name='pc3' type='small' def-key='3' top='354' left='259'><key/></button>

diff --git a/rsrc/dialogs/pick-scenario.xml b/rsrc/dialogs/pick-scenario.xml
@@ -75,6 +75,7 @@
 	<button name='x' def-key='x' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>X</button>
 	<button name='y' def-key='y' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Y</button>
 	<button name='z' def-key='z' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Z</button>
+	<button name='#' def-key='shift 3' type='tiny' relative='neg pos-in' anchor='j' top='0' left='32'>#</button>
 
 	<button name='cancel' type='regular' top='330' left='5'>Cancel</button>
 	<button name='prev' type='left' def-key='left' relative='pos pos-in' rel-anchor='prev' top='0' left='14'/>

diff --git a/rsrc/dialogs/shift-town-entrance.xml b/rsrc/dialogs/shift-town-entrance.xml
@@ -5,8 +5,7 @@
 	<button name='no' type='regular' def-key='n' top='39' left='178'>No</button>
 	<button name='yes' type='regular' def-key='y' top='39' left='244'>Yes</button>
 	<pict type='dlog' num='11' top='9' left='9'/>
-	<text top='4' left='51' width='251' height='32'>
-		Shift to this town's entrance in this outdoor section?
+	<text name='prompt' top='4' left='51' width='251' height='32'>
+		Shift to this town's entrance in outdoor section {sec} at {loc} ({loc_str})?
 	</text>
-    <text name='out-sec' relative='pos-in pos' rel-anchor='prev' top='4' left='0'></text>
 </dialog>
diff --git a/rsrc/graphics/startanim.png b/rsrc/graphics/startanim.png
diff --git a/rsrc/strings/specials-text-town.txt b/rsrc/strings/specials-text-town.txt
@@ -353,7 +353,7 @@ Number of town to place party in
 Skip dialog and always change level?
 Trigger Limitations
 Special to Call in New Town
-A dialog comes up text you supply (saying, perhaps, they've found a stairway). The dialog buttons are Climb and Leave. If the Leave button is pressed, the Jump To special is used, and the party is not allowed to enter the space. If the Climb button is pushed, the party is moved to another town.
+A dialog comes up with text you supply (saying, perhaps, they've found a stairway). The dialog buttons are Climb and Leave. If the Leave button is pressed, the Jump To special is used, and the party is not allowed to enter the space. If the Climb button is pushed, the party is moved to another town.
 --------------------
 Relocate Outdoors
 Unused

diff --git a/src/dialogxml/dialogs/dialog.cpp b/src/dialogxml/dialogs/dialog.cpp
@@ -795,14 +795,16 @@ void cDialog::handle_one_event(const sf::Event& currentEvent, cFramerateLimiter&
 			}
 			BOOST_FALLTHROUGH;
 		case sf::Event::MouseMoved:{
+			int x = currentEvent.mouseMove.x / get_ui_scale();
+			int y = currentEvent.mouseMove.y / get_ui_scale();
 			// Did the window move, potentially dirtying the canvas below it?
 			if(check_window_moved(win, winLastX, winLastY))
 				if (redraw_everything != NULL)
 					redraw_everything();
 
 			bool inField = false;
 			for(auto& ctrl : controls) {
-				if(ctrl.second->getType() == CTRL_FIELD && ctrl.second->getBounds().contains(currentEvent.mouseMove.x, currentEvent.mouseMove.y)) {
+				if(ctrl.second->getType() == CTRL_FIELD && ctrl.second->getBounds().contains(x, y)) {
 					set_cursor(text_curs);
 					inField = true;
 					break;

diff --git a/src/dialogxml/dialogs/strchoice.cpp b/src/dialogxml/dialogs/strchoice.cpp
@@ -143,6 +143,8 @@ bool cStringChoice::onLeft(){
 	if(page == 0) page = lastPage();
 	else page--;
 	fillPage();
+	clearHighlights();
+	highlightSearch();
 	return true;
 }
 
@@ -154,6 +156,8 @@ bool cStringChoice::onRight(){
 	if(page == lastPage()) page = 0;
 	else page++;
 	fillPage();
+	clearHighlights();
+	highlightSearch();
 	return true;
 }
 
@@ -244,6 +248,7 @@ void cStringChoice::clearHighlights() {
 
 bool cStringChoice::highlightSearch() {
 	bool match_on_page = false;
+	if(search_str.empty()) return false;
 
 	for(int offset = 0; offset < per_page; ++offset){
 		std::string led_id = "led" + std::to_string(offset + 1);

diff --git a/src/dialogxml/widgets/field.cpp b/src/dialogxml/widgets/field.cpp
@@ -560,6 +560,7 @@ void cTextField::handleInput(cKey key, bool record) {
 			if(current_action) history.add(current_action), current_action.reset();
 			if(haveSelection && !select)
 				selectionPoint = insertionPoint = std::min(selectionPoint,insertionPoint);
+			if(snippets.empty()) break;
 			if(snippets[ip_row].at.y == snippets[0].at.y) {
 				key.k = key_top;
 				if(select) key.mod += mod_shift;
@@ -574,6 +575,7 @@ void cTextField::handleInput(cKey key, bool record) {
 			if(current_action) history.add(current_action), current_action.reset();
 			if(haveSelection && !select)
 				selectionPoint = insertionPoint = std::max(selectionPoint,insertionPoint);
+			if(snippets.empty()) break;
 			if(snippets[ip_row].at.y == snippets.back().at.y) {
 				key.k = key_bottom;
 				if(select) key.mod += mod_shift;

diff --git a/src/fileio/fileio_party.cpp b/src/fileio/fileio_party.cpp
@@ -284,6 +284,7 @@ bool load_party_v1(fs::path file_to_load, cUniverse& real_univ, bool town_restor
 		univ.file = path;
 	}else{
 		univ.party.scen_name = "";
+		store_party.scen_name[0] = '\0';
 	}
 
 	univ.party.import_legacy(store_party, univ);

diff --git a/src/fileio/fileio_scen.cpp b/src/fileio/fileio_scen.cpp
@@ -266,8 +266,11 @@ bool load_scenario_v1(fs::path file_to_load, cScenario& scenario, eLoadScenario
 		return false;
 	}
 	port_item_list(&item_data);
-	scenario.import_legacy(temp_scenario);
-	scenario.import_legacy(item_data);
+	scenario.import_legacy(temp_scenario, load_type == eLoadScenario::ONLY_HEADER);
+	if(load_type == eLoadScenario::FULL){
+		scenario.ter_types[23].fly_over = false;
+		scenario.import_legacy(item_data);
+	}
 
 	// TODO: Consider skipping the fread and assignment when len is 0
 	scenario.special_items.resize(50);
@@ -295,8 +298,6 @@ bool load_scenario_v1(fs::path file_to_load, cScenario& scenario, eLoadScenario
 
 	fclose(file_id);
 
-	scenario.ter_types[23].fly_over = false;
-
 	scenario.scen_file = file_to_load;
 	if(load_type == eLoadScenario::ONLY_HEADER) return true;
 	load_spec_graphics_v1(scenario.scen_file);

diff --git a/src/game/boe.actions.cpp b/src/game/boe.actions.cpp
@@ -1409,6 +1409,11 @@ void handle_victory(bool force, bool record) {
 	univ.exportGraphics();
 	univ.exportSummons();
 	univ.clear_stored_pcs();
+	// Saved monsters are not valid now
+	for(auto& pop : univ.party.creature_save){
+		pop.which_town = 200;
+		pop.clear();
+	}
 	reload_startup();
 	overall_mode = MODE_STARTUP;
 	draw_startup(0);

diff --git a/src/game/boe.dlgutil.cpp b/src/game/boe.dlgutil.cpp
@@ -662,15 +662,16 @@ std::vector<std::string> preset_words = {
 	"Ask About...",
 };
 
+std::vector<location> preset_word_locs = {
+	{4, 366}, {70, 366}, {136, 366},
+	{4, 389}, {70, 389}, {121, 389},
+	{210, 389}, {190, 366},
+	{4, 343}
+};
+
 static void reset_talk_words() {
 	// first initialise talk_words here
 	talk_words.clear();
-	static const std::vector<location> preset_word_locs = {
-		{4, 366}, {70, 366}, {136, 366},
-		{4, 389}, {70, 389}, {121, 389},
-		{210, 389}, {190, 366},
-		{4, 343}
-	};
 	TextStyle style;
 	style.font = FONT_DUNGEON;
 	style.pointSize = TALK_WORD_SIZE;
@@ -1798,8 +1799,16 @@ class cChooseScenario {
 		for(auto& hdr : scen_headers){
 			// I just checked, and the scenario editor will let you name your scenario "" or " "!
 			std::string name = name_alphabetical(hdr.name);
-			if(!name.empty())
-				me[name.substr(0, 1)].show();
+			if(!name.empty()){
+				// Starts with a letter:
+				if(me.hasControl(name.substr(0, 1))){
+					me[name.substr(0, 1)].show();
+				}
+				// Starts with a digit:
+				else if(name[0] >= '0' && name[0] <= '9'){
+					me["#"].show();
+				}
+			}
 		}
 	}
 
@@ -1882,6 +1891,7 @@ class cChooseScenario {
 			stk.setPage(0);
 			return true;
 		});
+		// Letter buttons scroll to an alphabetical position:
 		for(int i = 0; i < 26; ++i){
 			std::string letter(1, (char)('a' + i));
 			me[letter].attachClickHandler([this](cDialog& me, std::string letter, eKeyMod) -> bool {
@@ -1895,6 +1905,12 @@ class cChooseScenario {
 				return true;
 			});
 		}
+		// Number button scrolls to scenarios that start with symbols or digits:
+		me["#"].attachClickHandler([this](cDialog& me, std::string letter, eKeyMod) -> bool {
+			auto& stk = dynamic_cast<cStack&>(me["list"]);
+			stk.setPage(1);
+			return true;
+		});
 
 		put_scen_info();
 

diff --git a/src/game/boe.fileio.cpp b/src/game/boe.fileio.cpp
@@ -341,6 +341,8 @@ std::string name_alphabetical(std::string a) {
 	// The scenario editor will let you prepend whitespace to a scenario name :(
 	boost::algorithm::trim_left(a);
 	std::transform(a.begin(), a.end(), a.begin(), tolower);
+	// Some party makers start with the name of the corresponding scenario in quotes
+	if(a.substr(0,1) == "\"") a.erase(a.begin(), a.begin() + 1);
 	if(a.substr(0,2) == "a ") a.erase(a.begin(), a.begin() + 2);
 	else if(a.substr(0,4) == "the ") a.erase(a.begin(), a.begin() + 4);
 	return a;
@@ -359,11 +361,9 @@ std::vector<scen_header_type> build_scen_headers() {
 		std::string scen_file;
 		while(std::getline(in, scen_file)){
 			scen_header_type scen_head;
-			fs::path full_path;
-			for(fs::path scenDir : all_scen_dirs()){
-				full_path = scenDir / scen_file;
-				if (fs::exists(full_path))
-					break;
+			fs::path full_path = locate_scenario(scen_file, true);
+			if(full_path.empty()){
+				LOG("Scenario missing! " + scen_file);
 			}
 			if(load_scenario_header(full_path, scen_head)){
 				scen_headers.push_back(scen_head);