openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix some uses of deprecated SFML API

Browse Source
This commit is contained in:
Celtic Minstrel
2025-08-10 13:07:16 -04:00
committed by Celtic Minstrel
parent 2c28b226bc
commit 436276e02b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gfx/render_image.cpp
View File

@@ -119,8 +119,8 @@ void rect_draw_some_item(const sf::Texture& src_gworld,rectangle src_rect,const
rect_draw_some_item(src_gworld, src_rect, src, dest_rect);
src.display();
maskShader.setParameter("texture", sf::Shader::CurrentTexture);
maskShader.setParameter("mask", mask_gworld);
maskShader.setUniform("texture", sf::Shader::CurrentTexture);
maskShader.setUniform("mask", mask_gworld);
rect_draw_some_item(src.getTexture(), dest_rect, targ_gworld, targ_rect, &maskShader, colour);
}

6
src/gfx/render_text.cpp
View File

@@ -51,7 +51,7 @@ void TextStyle::applyTo(sf::Text& text, double scale) const {
if(italic) style |= sf::Text::Italic;
if(underline) style |= sf::Text::Underlined;
text.setStyle(style);
text.setColor(colour);
text.setFillColor(colour);
}
struct text_params_t {
@@ -347,10 +347,10 @@ static void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,st
bounds.offset(-adjust_x, -adjust_y);
if(options.returnType == text_params_t::RECTS)
options.returnRects.push_back(bounds);
str_to_draw.setColor(options.hilite_fg);
str_to_draw.setFillColor(options.hilite_fg);
bounds.inset(0,-4);
fill_rect(dest_window, bounds, options.hilite_bg);
} else str_to_draw.setColor(options.style.colour);
} else str_to_draw.setFillColor(options.style.colour);
draw_scale_aware_text(dest_window, str_to_draw);
}
}