.

Author: Pentarctagon

src/build_info.cpp

@@ -199,7 +199,7 @@ version_table_manager::version_table_manager()
 
 	compiled[LIB_SDL_MIXER] = format_version(SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_MICRO_VERSION);
 
-	int linked_mix_version = Mix_Version();
+	int linked_mix_version = MIX_Version();
 	linked[LIB_SDL_MIXER] = format_version(SDL_VERSIONNUM_MAJOR(linked_mix_version), SDL_VERSIONNUM_MINOR(linked_mix_version), SDL_VERSIONNUM_MICRO(linked_mix_version));
 
 	names[LIB_SDL_MIXER] = "SDL_mixer";

src/controller_base.cpp

@@ -82,7 +82,7 @@ void controller_base::long_touch_callback(int x, int y)
 		if(!yes_actually_dragging
 		   && (mouse_state & SDL_BUTTON_MASK(SDL_BUTTON_LEFT)) != 0)
 		{
-			show_menu(get_display().get_theme().context_menu(), { x_now, y_now }, true);
+			show_menu(get_display().get_theme().context_menu(), { static_cast<int>(x_now), static_cast<int>(y_now) }, true);
 		}
 	}
 
@@ -200,7 +200,7 @@ void controller_base::handle_event(const SDL_Event& event)
 
 		mh_base.mouse_press(event.button, is_browsing());
 		if(mh_base.get_show_menu()) {
-			show_menu(get_display().get_theme().context_menu(), { event.button.x, event.button.y }, true);
+			show_menu(get_display().get_theme().context_menu(), { static_cast<int>(event.button.x), static_cast<int>(event.button.y) }, true);
 		}
 		break;
 
@@ -225,8 +225,6 @@ void controller_base::handle_event(const SDL_Event& event)
 		gui2::execute_timer(reinterpret_cast<std::size_t>(event.user.data1));
 		break;
 
-	// TODO: Support finger specifically, like pan the map. For now, SDL's "shadow mouse" events will do.
-	case SDL_MULTIGESTURE:
 	default:
 		break;
 	}

src/draw.cpp

@@ -216,7 +216,7 @@ void draw::line(int from_x, int from_y, int to_x, int to_y, const color_t& c)
 	SDL_RenderLine(renderer(), from_x, from_y, to_x, to_y);
 }
 
-void draw::points(const std::vector<::point>& points)
+void draw::points(const std::vector<SDL_FPoint>& points)
 {
 	// We cannot decay vector<point> to SDL_Point* unless the two types are the same size.
 	static_assert(sizeof(::point) == sizeof(SDL_Point));
@@ -249,27 +249,26 @@ void draw::circle(int cx, int cy, int r, uint8_t octants)
 	int x = r;
 	int y = 0;
 
-	std::vector<::point> points;
+	std::vector<SDL_FPoint> points;
 
-		if(octants & 0x08) {
-			points.push_back({static_cast<float>(cx + y), static_cast<float>(cy + x)});
-		}
-		if(octants & 0x01) {
-			points.push_back({static_cast<float>(cx + y), static_cast<float>(cy - x)});
-		}
-		if(octants & 0x10) {
-			points.push_back({static_cast<float>(cx - y), static_cast<float>(cy + x)});
-		}
-		if(octants & 0x80) {
-			points.push_back({static_cast<float>(cx - y), static_cast<float>(cy - x)});
-		}
+	if(octants & 0x08) {
+		points.push_back({static_cast<float>(cx + y), static_cast<float>(cy + x)});
+	}
+	if(octants & 0x01) {
+		points.push_back({static_cast<float>(cx + y), static_cast<float>(cy - x)});
+	}
+	if(octants & 0x10) {
+		points.push_back({static_cast<float>(cx - y), static_cast<float>(cy + x)});
+	}
+	if(octants & 0x80) {
+		points.push_back({static_cast<float>(cx - y), static_cast<float>(cy - x)});
+	}
 
-		d += 2 * y + 1;
-		++y;
-		if(d > 0) {
-			d += -2 * x + 2;
-			--x;
-		}
+	d += 2 * y + 1;
+	++y;
+	if(d > 0) {
+		d += -2 * x + 2;
+		--x;
 	}
 
 	draw::points(points);

src/draw.hpp

@@ -165,7 +165,7 @@ void line(int from_x, int from_y, int to_x, int to_y);
 void line(int from_x, int from_y, int to_x, int to_y, const color_t& c);
 
 /** Draw a set of points. */
-void points(const std::vector<::point>& points);
+void points(const std::vector<SDL_FPoint>& points);
 
 /** Draw a single point. */
 void point(int x, int y);

src/gui/core/event/handler.cpp

@@ -476,23 +476,6 @@ void sdl_event_handler::handle_event(const SDL_Event& event)
 			}
 			break;
 
-		case SDL_MULTIGESTURE:
-			{
-				point c = video::game_canvas_size();
-				touch_multi_gesture(
-					point(event.mgesture.x * c.x, event.mgesture.y * c.y),
-					event.mgesture.dTheta, event.mgesture.dDist,
-					event.mgesture.numFingers
-				);
-			}
-			break;
-
-#if(defined(_X11) && !defined(__APPLE__)) || defined(_WIN32)
-		case SDL_SYSWMEVENT:
-			/* DO NOTHING */
-			break;
-#endif
-
 		// Silently ignored events.
 		case SDL_EVENT_KEY_UP:
 			break;

src/gui/dialogs/editor/custom_tod.cpp

@@ -274,7 +274,7 @@ void custom_tod::color_slider_callback(COLOR_TYPE type)
 
 void custom_tod::play_sound() {
 	std::string sound_path = find_widget<text_box>("path_sound").get_value();
-	sound::play_sound(sound_path, sound::SOUND_SOURCES);
+	sound::play_sound(sound_path, sound_channels::type::sound_source_tag);
 }
 
 void custom_tod::update_image(const std::string& id_stem) {

src/gui/dialogs/story_viewer.cpp

@@ -145,7 +145,7 @@ void story_viewer::display_part()
 
 	sound::stop_sound(VOICE_SOUND_SOURCE_ID);
 	if(!current_part_->voice().empty()) {
-		sound::play_sound_positioned(current_part_->voice(), VOICE_SOUND_SOURCE_ID, 0, 0);
+		sound::play_sound_positioned(current_part_->voice(), 0, 0);
 	}
 
 	config cfg;

src/hotkey/hotkey_item.cpp

@@ -153,7 +153,7 @@ hotkey_ptr create_hotkey(const std::string& id, const SDL_Event& event)
 		}
 	} break;
 
-	case SDL_MOUSEBUTTONUP: {
+	case SDL_EVENT_MOUSE_BUTTON_UP: {
 		auto mouse = std::make_shared<hotkey_mouse>();
 		base = std::dynamic_pointer_cast<hotkey_base>(mouse);
 		mouse->set_button(event.button.button);

src/mouse_handler_base.cpp

@@ -187,7 +187,7 @@ void mouse_handler_base::mouse_press(const SDL_MouseButtonEvent& event, const bo
 			if (!mouse_button_event(event, SDL_BUTTON_LEFT, loc, true)) {
 				left_click(event.x, event.y, browse);
 			}
-		} else if(event.sdown == false) {
+		} else if(event.down == false) {
 			minimap_scrolling_ = false;
 
 			if (!dragging_started_ && touch_timestamp != std::chrono::steady_clock::time_point{}) {

src/play_controller.cpp

@@ -579,7 +579,7 @@ void play_controller::init_side_end()
 	if(	did_tod_sound_this_turn_) {
 		did_tod_sound_this_turn_ = true;
 		const time_of_day& tod = gamestate().tod_manager_.get_time_of_day();
-		sound::play_sound(tod.sounds, sound::SOUND_SOURCES);
+		sound::play_sound(tod.sounds, sound_channels::type::sound_source_tag);
 	}
 	whiteboard_manager_->on_init_side();
 }