From c4136c862a6b978ea14b57ad2890aaf613aee0af Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Tue, 16 Dec 2014 14:57:59 -0500 Subject: [PATCH] Fix unseen mask --- osx/boe.newgraph.cpp | 4 +--- osx/tools/graphtool.cpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/osx/boe.newgraph.cpp b/osx/boe.newgraph.cpp index 50bbd473d..f925ec206 100644 --- a/osx/boe.newgraph.cpp +++ b/osx/boe.newgraph.cpp @@ -139,8 +139,6 @@ RECT explode_place_rect[30]; char last_light_mask[13][13]; void apply_unseen_mask() { - // TODO: This is causing major lag and not even working properly - return; RECT base_rect = {9,9,53,45},to_rect,big_to = {13,13,337,265}; short i,j,k,l; bool need_bother = false; @@ -167,7 +165,7 @@ void apply_unseen_mask() { to_rect = base_rect; to_rect.offset(-28 + i * 28,-36 + 36 * j); to_rect |= big_to; - tileImage(mainPtr, to_rect, bw_pats[3], sf::BlendAlpha); + tileImage(terrain_screen_gworld, to_rect, bw_pats[3], sf::BlendAlpha); //PaintRoundRect(&to_rect,4,4); for(k = i - 2; k < i + 1; k++) for(l = j - 2; l < j + 1; l++) diff --git a/osx/tools/graphtool.cpp b/osx/tools/graphtool.cpp index e09930bbb..b8343f799 100644 --- a/osx/tools/graphtool.cpp +++ b/osx/tools/graphtool.cpp @@ -30,7 +30,7 @@ RECT map_pat_rects[30]; RECT bw_rects[6]; tessel_ref_t bg[21]; tessel_ref_t map_pat[30]; -tessel_ref_t bw_pat[6]; +tessel_ref_t bw_pats[6]; sf::Texture bg_gworld; bool use_win_graphics = false; sf::Shader maskShader; @@ -1196,7 +1196,7 @@ static void register_main_patterns() { for(int i = 0; i < 30; i++) { if(i < 21) { if(i < 6) { - bw_pat[i] = prepareForTiling(bg_gworld, bw_rects[i]); + bw_pats[i] = prepareForTiling(bg_gworld, bw_rects[i]); } bg[i] = prepareForTiling(bg_gworld, bg_rects[i]); }