improve error reporting for game data verification, start new menu buttons

diff --git a/game/src/engine.cpp b/game/src/engine.cpp
index 769ae44..6525f55 100644
--- a/game/src/engine.cpp
+++ b/game/src/engine.cpp

Author: FolkertVanVerseveld

game/src/engine.cpp

@@ -53,10 +53,12 @@ unsigned sp_player_count = 5, sp_player_ui_count = sp_player_count - 1;
 std::array<PlayerSetting, max_legacy_players> sp_players;
 ScenarioSettings sp_scn;
 
+MenuState next_menu_state = MenuState::init;
+
 Engine::Engine()
 	: net(), show_demo(false), show_debug(false), font_scaling(true)
 	, connection_mode(0), connection_port(32768), connection_host("")
-	, menu_state(MenuState::init), next_menu_state(MenuState::init)
+	, menu_state(MenuState::init)
 	, multiplayer_ready(false), m_show_menubar(false)
 	, chat_line(), chat(), server()
 	, tp(2), ui_tasks(), ui_mod_id(), popups(), popups_async()

game/src/engine.hpp

@@ -60,6 +60,8 @@ enum class EngineAsyncTask {
 
 class EngineView;
 
+extern MenuState next_menu_state;
+
 // TODO make engine view that wraps eng and m_eng magic
 // TODO split async?
 // TODO split ui
@@ -70,7 +72,7 @@ class Engine final {
 	int connection_mode;
 	unsigned short connection_port;
 	char connection_host[256]; // 253 according to https://web.archive.org/web/20190518124533/https://devblogs.microsoft.com/oldnewthing/?p=7873
-	MenuState menu_state, next_menu_state;
+	MenuState menu_state;
 
 	// multiplayer_host
 	bool multiplayer_ready;
@@ -220,9 +222,8 @@ class Engine final {
 	void trigger_async_flags(unsigned f);
 	void trigger_async_flags(EngineAsyncTask t) { trigger_async_flags((unsigned)t); }
 
-private:
 	void open_help();
-
+private:
 	void goto_multiplayer_menu();
 	void start_multiplayer_game();
 

game/src/engine/views/engine_view.cpp

@@ -14,7 +14,7 @@ void EngineView::trigger_async_flags(EngineAsyncTask t) {
 }
 
 void EngineView::goto_menu(MenuState ms) {
-	eng->next_menu_state = ms;
+	next_menu_state = ms;
 }
 
 void EngineView::play_sfx(SfxId id, int loops) {

game/src/legacy/drs.cpp

@@ -26,7 +26,11 @@ struct DrsHdr final {
 
 DRS::DRS(const std::string &path) : in(path, std::ios_base::binary), items() {
 	ZoneScoped;
-	in.exceptions(std::ofstream::failbit | std::ofstream::badbit);
+	try {
+		in.exceptions(std::ifstream::failbit | std::ifstream::badbit);
+	} catch (const std::ifstream::failure &ex) {
+		throw std::runtime_error(std::string("cannot find \"") + path + "\"");
+	}
 
 	DrsHdr hdr{ 0 };
 	in.read((char*)&hdr, sizeof(hdr));

game/src/net/netrw.cpp

@@ -107,7 +107,7 @@ unsigned NetPkg::read(const std::string &fmt, netargs &dst, unsigned offset) {
 				if (!has_mult)
 					throw std::runtime_error("string has no length");
 
-				// FIXME this looks like a bug... shouldn't this be: sz = mult
+				// NOTE the size of data should be correct, but just in case limit it to mult
 				unsigned sz = std::min<unsigned>(data.at(offset) << 8 | data.at(offset + 1), mult);
 
 				std::string s;

game/src/ui.cpp

@@ -461,7 +461,7 @@ void Engine::show_multiplayer_diplomacy() {
 		return;
 
 	Assets &a = *assets.get();
-	ImDrawList *lst = ImGui::GetWindowDrawList();
+	ImDrawList *lst = ImGui::GetWindowDrawList(); // TODO refactor to bkg
 
 	const gfx::ImageRef &rbkg = a.at(io::DrsId::img_dialog0);
 	ImVec2 pos(ImGui::GetWindowPos());
@@ -543,6 +543,7 @@ void Engine::show_multiplayer_host() {
 		f.str("Multiplayer game -");
 		f.sl();
 
+		// FIXME make this less ugly
 		--player_count;
 		f.scalar(player_count == 1 ? "player" : "players", player_count, 1, 1, MAX_PLAYERS - 1);
 		++player_count;
@@ -555,6 +556,7 @@ void Engine::show_multiplayer_host() {
 
 		player_tbl_y = ImGui::GetCursorPosY();
 	} else {
+		// FIXME make this less ugly
 		--player_count;
 		f.fmt("Multiplayer game - %u %s", player_count, player_count == 1 ? "player" : "players");
 		++player_count;
@@ -631,7 +633,7 @@ void UICache::show_editor_menu() {
 	ImGui::SetCursorPosY(272.0f / 768.0f * vp->WorkSize.y);
 
 	if (btn(f, "Create Scenario", TextHalign::center, e->sfx))
-		e->next_menu_state = MenuState::editor_scenario;
+		next_menu_state = MenuState::editor_scenario;
 
 	ImGui::SetCursorPosY(352.0f / 768.0f * vp->WorkSize.y);
 
@@ -644,7 +646,7 @@ void UICache::show_editor_menu() {
 	ImGui::SetCursorPosY(512.0f / 768.0f * vp->WorkSize.y);
 
 	if (btn(f, "Cancel", TextHalign::center, e->sfx))
-		e->next_menu_state = MenuState::start;
+		next_menu_state = MenuState::start;
 
 	ImGui::SetCursorPosX(old_x);
 }
@@ -1007,51 +1009,107 @@ void Engine::open_help() {
 	open_url("https://github.com/FolkertVanVerseveld/aoe");
 }
 
-void Engine::show_start() {
-	ZoneScoped;
-	ImGuiViewport *vp = ImGui::GetMainViewport();
-	ImGui::SetNextWindowPos(vp->WorkPos);
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) // NOTE a is compile constant and evaluated twice
 
-	Frame f;
+class MenuButton final {
+public:
+	float relY;
+	float x0, y0, x1, y1;
+	const char *name;
 
-	if (!f.begin("start", ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBackground))
-		return;
+	MenuButton(float y, const char *name)
+		: relY(y), name(name)
+		, x0(0), y0(0), x1(0), y1(0) {}
 
-	ImGui::SetWindowSize(vp->WorkSize);
+	void reshape(ImGuiViewport *vp) {
+		float w = vp->WorkSize.x, h = vp->WorkSize.y;
+		x0 = 212 / 800.0f * w;
+		x1 = 586 / 800.0f * w;
+		y0 = relY / 768.0f * h;
+		y1 = (relY + 64.0f) / 768.0f * h;
+	}
 
-	float old_x = ImGui::GetCursorPosX();
+	bool showDisabled(Frame &f, const char *tooltip, const BackgroundColors &col) const {
+		DrawBorder(x0, y0, x1, y1, col);
+		ImGui::SetCursorPosY(y0);
+		return f.xbtn(name, tooltip, TextHalign::center);
+	}
 
-	{
-		FontGuard fg(fnt.copper);
+	bool show(Frame &f, Audio &sfx, const BackgroundColors &col) const {
+		ImGui::SetCursorPosY(y0);
+		bool b = btn(f, name, TextHalign::center, sfx);
+		if (b)
+			DrawBorderInv(x0, y0, x1, y1, col);
+		else
+			DrawBorder(x0, y0, x1, y1, col);
+		return b;
+	}
+};
+
+MenuButton mainMenuButtons[] = {
+	{284, "Single Player"},
+	{364, "Multiplayer"},
+	{444, "Help"},
+	{524, "Scenario Builder"},
+	{604, "Exit"},
+};
+
+class MainMenu final {
+public:
+	const MenuButton &sp, &mp, &help, &scn, &quit;
+
+	MainMenu() : sp(mainMenuButtons[0]), mp(mainMenuButtons[1])
+		, help(mainMenuButtons[2]), scn(mainMenuButtons[3]), quit(mainMenuButtons[4]) {}
+
+	void reshape(ImGuiViewport *vp) {
+		for (unsigned i = 0; i < ARRAY_SIZE(mainMenuButtons); ++i)
+			mainMenuButtons[i].reshape(vp);
+	}
+} mainMenu;
+
+static void DrawMainMenu(Frame &f, Audio &sfx, Assets &ass)
+{
+	MainMenu &mm = mainMenu;
+	ImGuiViewport *vp = ImGui::GetMainViewport();
 
-		ImGui::SetCursorPosY(284.0f / 768.0f * vp->WorkSize.y);
+	FontGuard fg(fnt.copper);
+
+	mm.reshape(vp);
+
+	float y0 = 284 / 768.0f * vp->WorkSize.y, y1 = 348 / 768.0f * vp->WorkSize.y;
+	BackgroundColors col = ass.bkg_cols.at(io::DrsId::bkg_main_menu);
+
+#define DRAW_BTN(btn) btn.show(f, sfx, col)
+#define DRAW_DISABLED(btn, tt) btn.showDisabled(f, tt, col)
 
 #if 0
-		if (btn(f, "Single Player", TextHalign::center, sfx))
-			next_menu_state = MenuState::singleplayer_menu;
+	if (DRAW_BTN(mm.sp))
+		next_menu_state = MenuState::singleplayer_menu;
 #else
-		f.xbtn("Single Player", "Single player mode is not supported yet. Use multiplayer mode with 1 player instead.", TextHalign::center);
+	DRAW_DISABLED(mm.sp, "Single player mode is not supported yet. Use multiplayer mode with 1 player instead.");
 #endif
 
-		ImGui::SetCursorPosY(364.0f / 768.0f * vp->WorkSize.y);
+	if (DRAW_BTN(mm.mp  )) next_menu_state = MenuState::multiplayer_menu;
+	if (DRAW_BTN(mm.help)) eng->open_help();
+	if (DRAW_BTN(mm.scn )) next_menu_state = MenuState::editor_menu;
+	if (DRAW_BTN(mm.quit)) throw 0;
+}
 
-		if (btn(f, "Multiplayer", TextHalign::center, sfx))
-			next_menu_state = MenuState::multiplayer_menu;
+void Engine::show_start() {
+	ZoneScoped;
+	ImGuiViewport *vp = ImGui::GetMainViewport();
+	ImGui::SetNextWindowPos(vp->WorkPos);
 
-		ImGui::SetCursorPosY(444.0f / 768.0f * vp->WorkSize.y);
-		if (btn(f, "Help", TextHalign::center, sfx))
-			open_help();
+	Frame f;
 
-		ImGui::SetCursorPosY(524.0f / 768.0f * vp->WorkSize.y);
+	if (!f.begin("start", ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBackground))
+		return;
 
-		if (btn(f, "Scenario Builder", TextHalign::center, sfx))
-			next_menu_state = MenuState::editor_menu;
+	ImGui::SetWindowSize(vp->WorkSize);
 
-		ImGui::SetCursorPosY(604.0f / 768.0f * vp->WorkSize.y);
+	float old_x = ImGui::GetCursorPosX();
 
-		if (btn(f, "Exit", TextHalign::center, sfx))
-			throw 0;
-	}
+	DrawMainMenu(f, sfx, *assets.get());
 
 	ImGui::SetCursorPosX(old_x);
 	ImGui::SetCursorPosY((710.0f - 40.0f) / 768.0f * vp->WorkSize.y);
@@ -1076,7 +1134,7 @@ void Engine::show_init() {
 	f.str("Age of Empires game setup");
 
 	ImGui::TextWrapped("%s", "In this menu, you can change general settings how the game behaves and where the game assets will be loaded from.");
-	ImGui::TextWrapped("%s", "This game is free software. If you have paid for this free software remake, you have been scammed! If you like Age of Empires, please support Microsoft by buying the original game on Steam");
+	ImGui::TextWrapped("%s", "This game is free software. If you have paid for this free software remake, you have been fooled!");
 
 
 	if (!fnt.loaded()) {
@@ -1329,6 +1387,19 @@ void DrawLine(float x0, float y0, float x1, float y1, SDL_Color col)
 	bkg->AddLine(ImVec2(x0, y0), ImVec2(x1, y1), IM_COL32(col.r, col.g, col.b, SDL_ALPHA_OPAQUE), 1);
 }
 
+void DrawBorderInv(float x0, float y0, float x1, float y1, const BackgroundColors &bkgcol)
+{
+	BackgroundColors bkgcol2;
+	bkgcol2.border[0] = bkgcol.border[3];
+	bkgcol2.border[1] = bkgcol.border[4];
+	bkgcol2.border[2] = bkgcol.border[5];
+	bkgcol2.border[3] = bkgcol.border[0];
+	bkgcol2.border[4] = bkgcol.border[1];
+	bkgcol2.border[5] = bkgcol.border[2];
+
+	DrawBorder(x0, y0, x1, y1, bkgcol2);
+}
+
 void DrawBorder(float x0, float y0, float x1, float y1, const BackgroundColors &bkgcol)
 {
 	DrawLine(x0, y0, x1, y0, bkgcol.border[0]);

game/src/ui.hpp

@@ -31,6 +31,7 @@ class Assets;
 class Engine;
 
 void DrawLine(float x0, float y0, float x1, float y1, SDL_Color col);
+void DrawBorderInv(float x0, float y0, float x1, float y1, const BackgroundColors &bkgcol);
 void DrawBorder(float x0, float y0, float x1, float y1, const BackgroundColors &bkgcol);
 
 void DrawTextWrapped(const std::string&);

game/src/ui/scenario_editor.cpp

@@ -100,7 +100,7 @@ void UICache::show_editor_scenario() {
 
 	if (ImGui::BeginPopup("EditMenuPopup")) {
 		if (ImGui::MenuItem("Quit")) {
-			e->next_menu_state = MenuState::start;
+			next_menu_state = MenuState::start;
 			ImGui::CloseCurrentPopup();
 		}