support loading from tradegoods.txt aswell

schombert · Jan 20, 2025 · 58b9351 · 58b9351
1 parent 69bfd2b
commit 58b9351
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/gamestate/system_state.cpp b/src/gamestate/system_state.cpp
@@ -1905,15 +1905,21 @@ void state::load_scenario_data(parsers::error_handler& err, sys::year_month_day
 			auto money_id = world.create_commodity();
 			assert(money_id.index() == 0);
 		}
-		auto goods = open_file(common, NATIVE("goods.txt"));
-		if(goods) {
+		if(auto goods = open_file(common, NATIVE("goods.txt")); goods) {
 			auto content = view_contents(*goods);
 			err.file_name = "goods.txt";
 			parsers::token_generator gen(content.data, content.data + content.file_size);
 			parsers::parse_goods_file(gen, err, context);
 		} else {
-			err.fatal = true;
-			err.accumulated_errors += "File common/goods.txt could not be opened\n";
+			if(auto goods = open_file(common, NATIVE("tradegoods")); goods) {
+				auto content = view_contents(*goods);
+				err.file_name = "tradegoods.txt";
+				parsers::token_generator gen(content.data, content.data + content.file_size);
+				parsers::parse_goods_file(gen, err, context);
+			} else {
+				err.fatal = true;
+				err.accumulated_errors += "File common/goods.txt nor common/tradegoods.txt could not be opened\n";
+			}
 		}
 	}
 	// read buildings.text