src/Font.cpp in gosu-1.1.1.1 vs src/Font.cpp in gosu-1.2.0

- old
+ new

@@ -110,17 +110,17 @@ return width; } void Gosu::Font::draw_text(const string& text, double x, double y, ZPos z, - double scale_x, double scale_y, Color c, AlphaMode mode) const + double scale_x, double scale_y, Color c, BlendMode mode) const { draw_markup(escape_markup(text), x, y, z, scale_x, scale_y, c, mode); } void Gosu::Font::draw_markup(const string& markup, double x, double y, ZPos z, - double scale_x, double scale_y, Color c, AlphaMode mode) const + double scale_x, double scale_y, Color c, BlendMode mode) const { double current_y = y; // Split the text into lines (split_words = false) because Font doesn't implement word-wrapping. MarkupParser parser(pimpl->base_flags, false, [&](vector<FormattedString>&& line) { @@ -140,20 +140,20 @@ parser.parse(markup); } void Gosu::Font::draw_text_rel(const string& text, double x, double y, ZPos z, double rel_x, double rel_y, double scale_x, double scale_y, - Color c, AlphaMode mode) const + Color c, BlendMode mode) const { if (rel_x) x -= text_width(text) * scale_x * rel_x; if (rel_y) y -= height() * scale_y * rel_y; draw_text(text, x, y, z, scale_x, scale_y, c, mode); } void Gosu::Font::draw_markup_rel(const string& markup, double x, double y, ZPos z, double rel_x, double rel_y, double scale_x, double scale_y, - Color c, AlphaMode mode) const + Color c, BlendMode mode) const { if (rel_x) x -= markup_width(markup) * scale_x * rel_x; if (rel_y) y -= height() * scale_y * rel_y; draw_markup(markup, x, y, z, scale_x, scale_y, c, mode);