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

Fixed up: Move file-static RenderWindow and RenderTexture instances inside functions to fix GL race condition on startup (#682)

Browse Source
This commit is contained in:
Nathan R
2025-03-06 18:31:18 -06:00
committed by Nat Quayle Nelson
parent cf736d1835
commit 598fd4836a
51 changed files with 719 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/game/boe.items.cpp
View File

@@ -32,15 +32,11 @@
extern short which_combat_type;
extern eGameMode overall_mode;
extern eItemWinMode stat_window;
extern sf::RenderWindow mainPtr;
extern bool boom_anim_active;
extern rectangle d_rects[80];
extern short d_rect_index[80];
extern bool map_visible;
extern sf::RenderWindow mini_map;
extern sf::Texture pc_gworld;
extern sf::RenderTexture map_gworld;
extern cUniverse univ;
extern void draw_map(bool need_refresh);
@@ -678,20 +674,20 @@ short get_num_of_items(short max_num) {
void init_mini_map() {
double map_scale = get_ui_scale_map();
if (map_scale < 0.1) map_scale = 1.0;
if (mini_map.isOpen()) mini_map.close();
mini_map.create(sf::VideoMode(map_scale*296,map_scale*277), "Map", sf::Style::Titlebar | sf::Style::Close);
mini_map.setPosition(sf::Vector2i(52,62));
if (mini_map().isOpen()) mini_map().close();
mini_map().create(sf::VideoMode(map_scale*296,map_scale*277), "Map", sf::Style::Titlebar | sf::Style::Close);
mini_map().setPosition(sf::Vector2i(52,62));
sf::View view;
view.reset(sf::FloatRect(0, 0, map_scale*296,map_scale*277));
view.setViewport(sf::FloatRect(0, 0, map_scale, map_scale));
mini_map.setView(view);
mini_map.setVisible(false);
mini_map().setView(view);
mini_map().setVisible(false);
map_visible=false;
setWindowFloating(mini_map, true);
makeFrontWindow(mainPtr);
setWindowFloating(mini_map(), true);
makeFrontWindow(mainPtr());
// Create and initialize map gworld
if(!map_gworld.create(384, 384)) {
if(!map_gworld().create(384, 384)) {
play_sound(2);
throw std::string("Failed to initialized automap!");
} else {