fix multiple cancellable tasks, audio error refactoring

fix more compilerwarnings

Author: FolkertVanVerseveld

game/src/async.hpp

@@ -29,6 +29,10 @@ struct UI_Task final {
 
 	UI_Task(IdPoolRef id, TaskFlags flags, const std::string &title, const std::string &desc, unsigned steps, unsigned total)
 		: id(id), flags(flags), title(title), desc(desc), steps(steps), total(total) {}
+
+	constexpr bool is_cancellable() const noexcept {
+		return !!((unsigned)flags & (unsigned)TaskFlags::cancellable);
+	}
 };
 
 /** Wrapper to manage ui task info. */

game/src/engine.cpp

@@ -42,6 +42,8 @@
 
 #include "debug.hpp"
 
+#pragma clang diagnostic ignored "-Wswitch"
+
 namespace aoe {
 
 Engine *eng;
@@ -346,37 +348,37 @@ void Engine::display_ui_tasks() {
 	std::lock_guard<std::mutex> lock(m_ui);
 
 	ImGui::OpenPopup("tasks");
-
 	ImGui::SetNextWindowSize(ImVec2(400, 0));
 
 	if (ImGui::BeginPopupModal("tasks", NULL, ImGuiWindowFlags_AlwaysAutoResize)) {
 		int i = 0;
-		bool cancellable = false;
+		unsigned cancellable = 0;
 
 		for (auto it = eng->ui_tasks.begin(); it != eng->ui_tasks.end(); ++i) {
 			UI_Task &tsk = it->second;
 
 			float f = (float)tsk.steps / tsk.total;
-			ImGui::TextWrapped("%s", tsk.title.c_str());
+			DrawTextWrapped(tsk.title);
 			ImGui::ProgressBar(f, ImVec2(-1, 0));
-			if (!tsk.desc.empty())
-				ImGui::TextWrapped("%s", tsk.desc.c_str());
+			DrawTextWrapped(tsk.desc);
 
 			std::string str("Cancel##" + std::to_string(i));
+			bool b = tsk.is_cancellable();
 
-			if ((unsigned)tsk.flags & (unsigned)TaskFlags::cancellable)
-				cancellable = true;
+			if (b)
+				++cancellable;
 
-			if (((unsigned)tsk.flags & (unsigned)TaskFlags::cancellable) && ImGui::Button(str.c_str()))
+			if (b && ImGui::Button(str.c_str()))
 				it = eng->ui_tasks.erase(it);
 			else
 				++it;
 		}
 
-		if (cancellable && ImGui::Button("Cancel all tasks")) {
+		// only show when more than one can be cancelled
+		if (cancellable > 1 && ImGui::Button("Cancel all tasks")) {
 			for (auto it = eng->ui_tasks.begin(); it != eng->ui_tasks.end(); ++i) {
 				UI_Task &tsk = it->second;
-				if ((unsigned)tsk.flags & (unsigned)TaskFlags::cancellable)
+				if (tsk.is_cancellable())
 					it = eng->ui_tasks.erase(it);
 				else
 					++it;
@@ -548,29 +550,8 @@ void Engine::set_background(io::DrsId id) {
 }
 
 void Engine::set_background(MenuState s) {
-	io::DrsId id = io::DrsId::bkg_main_menu;
-
-	switch (s) {
-	case MenuState::multiplayer_host:
-	case MenuState::multiplayer_menu:
-		id = io::DrsId::bkg_multiplayer;
-		break;
-	case MenuState::singleplayer_menu:
-	case MenuState::singleplayer_host:
-		id = io::DrsId::bkg_singleplayer;
-		break;
-	case MenuState::defeat:
-		id = io::DrsId::bkg_defeat;
-		break;
-	case MenuState::victory:
-		id = io::DrsId::bkg_victory;
-		break;
-	case MenuState::editor_menu:
-		id = io::DrsId::bkg_editor_menu;
-		break;
-	}
-
-	set_background(id);
+	const MenuInfo &mi = GetMenuInfo(s);
+	set_background(mi.border_col);
 }
 
 ImVec2 Engine::tilepos(float x, float y, float left, float top, int h) {

game/src/engine/assets.cpp

@@ -7,6 +7,8 @@
 
 #include <algorithm>
 
+#pragma clang diagnostic ignored "-Wmacro-redefined"
+
 namespace aoe {
 
 using namespace gfx;

game/src/engine/audio.cpp

@@ -15,6 +15,8 @@
 #define SAMPLING_FREQ 48000
 #define NUM_CHANNELS 2
 
+#pragma clang diagnostic ignored "-Wswitch"
+
 namespace aoe {
 
 static const double exp_base = 5.0;
@@ -59,7 +61,7 @@ Audio::Audio() : freq(0), channels(0), format(0), music(nullptr, Mix_FreeMusic)
 		if (msg)
 			throw std::runtime_error(std::string("Mix: Could not initialize audio: ") + msg);
 		else
-			throw std::runtime_error(std::string("Mix: Could not initialize audio: unknown error"));
+			throw std::runtime_error("Mix: Could not initialize audio: unknown error");
 	}
 
 	if (Mix_OpenAudio(SAMPLING_FREQ, MIX_DEFAULT_FORMAT, NUM_CHANNELS, 1024) == -1)
@@ -143,7 +145,7 @@ void Audio::play_music(const char *file, int loops) {
 void Audio::play_music(MusicId id, int loops) {
 	auto it = jukebox.find(id);
 	if (it == jukebox.end()) {
-		fprintf(stderr, "%s: cannot play music id %d: not found\n", __func__, id);
+		fprintf(stderr, "%s: cannot play music id %u: not found\n", __func__, id);
 		return;
 	}
 
@@ -221,7 +223,7 @@ void Audio::play_taunt(TauntId id) {
 
 	auto it = taunts.find(id);
 	if (it == taunts.end()) {
-		fprintf(stderr, "%s: cannot play taunt id %d: not found\n", __func__, id);
+		fprintf(stderr, "%s: cannot play taunt id %u: not found\n", __func__, id);
 		return;
 	}
 

game/src/engine/menu.cpp

@@ -9,14 +9,14 @@ const MenuInfo menu_info[] = {
 	{ true, DrsId::bkg_main_menu }, // start
 	{ true, DrsId::bkg_singleplayer },
 	{ true, DrsId::bkg_singleplayer },
-	{ true, DrsId::bkg_singleplayer },
+	{ false, (DrsId)0 }, // sp game
 	{ true, DrsId::bkg_multiplayer },
 	{ true, DrsId::bkg_multiplayer },
+	{ false, (DrsId)0 }, // mp game
 	{ false, (DrsId)0 }, // mp settings
-	{ true, DrsId::bkg_multiplayer },
 	{ true, DrsId::bkg_defeat },
 	{ true, DrsId::bkg_victory },
-	{ false, (DrsId)0 }, // edit menu
+	{ true, DrsId::bkg_editor_menu }, // edit menu
 	{ false, (DrsId)0 }, // edit scn
 };
 

game/src/legacy/legacy.cpp

@@ -12,6 +12,8 @@
 
 #include <tracy/Tracy.hpp>
 
+#pragma clang diagnostic ignored "-Wswitch"
+
 // don't ask me why, but windows needs this and including the correct header does not seem to help
 #if _WIN32
 int ::rand(void);

game/src/legacy/scenario.cpp

@@ -12,6 +12,8 @@
 #include "../game.hpp"
 #include "../world/terrain.hpp"
 
+#pragma clang diagnostic ignored "-Wunused-value"
+
 // yes, including .c's is evil, but... we have no choice :/
 #include <miniz.c>
 

game/src/ui.cpp

@@ -917,6 +917,8 @@ void UICache::show_entities() {
 
 #define MAPSIZE_STEP 4
 
+#pragma clang diagnostic ignored "-Wparentheses"
+
 // TODO extract to ui/widgets/scenario_settings.cpp
 void Engine::show_mph_cfg(ui::Frame &f) {
 	ZoneScoped;
@@ -1356,6 +1358,12 @@ void DrawBorder(float x0, float y0, float x1, float y1, const BackgroundColors &
 	DrawLine(x0 + 2, y1 - 3, x1 - 2, y1 - 3, bkgcol.border[3]);
 }
 
+void DrawTextWrapped(const std::string &s)
+{
+	if (!s.empty())
+		ImGui::TextWrapped("%s", s.c_str());
+}
+
 void Engine::draw_background_border() {
 	ZoneScoped;
 	assert(assets.get());

game/src/ui.hpp

@@ -33,6 +33,8 @@ class Engine;
 void DrawLine(float x0, float y0, float x1, float y1, SDL_Color col);
 void DrawBorder(float x0, float y0, float x1, float y1, const BackgroundColors &bkgcol);
 
+void DrawTextWrapped(const std::string&);
+
 namespace ui {
 
 bool chkbox(const char *s, bool &b);