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

Fix unclickable shop info icons

Browse Source
This commit is contained in:
x-qq
2020-02-11 11:35:14 +02:00
parent feb1045feb
commit 158de40ce3
5 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/game/boe.newgraph.cpp
View File

@@ -13,6 +13,7 @@
#include "boe.fileio.hpp"
#include "boe.locutils.hpp"
#include "boe.text.hpp"
#include "boe.consts.hpp"
#include "sounds.hpp"
#include "mathutil.hpp"
#include "render_image.hpp"
@@ -592,15 +593,6 @@ void do_explosion_anim(short /*sound_num*/,short special_draw, short snd) {
store_booms[i].boom_type = -1;
}
void click_shop_rect(rectangle area_rect) {
draw_shop_graphics(1,area_rect);
mainPtr.display();
play_sound(37, time_in_ticks(5));
draw_shop_graphics(0,area_rect);
}
graf_pos calc_item_rect(int num,rectangle& to_rect) {
if(num >= 1000) return spec_scen_g.find_graphic(num - 1000);
rectangle from_rect = {0,0,18,18};
@@ -778,7 +770,6 @@ void draw_shop_graphics(bool pressed,rectangle clip_area_rect) {
style.pointSize = 10;
win_draw_string(talk_gworld,shopping_rects[i][SHOPRECT_ITEM_EXTRA],cur_info_str,eTextMode::WRAP,style);
rect_draw_some_item(invenbtn_gworld,item_info_from,talk_gworld,shopping_rects[i][SHOPRECT_ITEM_HELP],pressed ? sf::BlendNone : sf::BlendAlpha);
}
// Finally, cost info and help strs
@@ -804,9 +795,8 @@ void draw_shop_graphics(bool pressed,rectangle clip_area_rect) {
void refresh_shopping() {
rectangle from_rect(talk_gworld);
rectangle to_rect = from_rect;
to_rect.offset(19,7);
to_rect.offset(talk_gword_offset_x, talk_gword_offset_y);
rect_draw_some_item(talk_gworld.getTexture(),from_rect,mainPtr,to_rect);
shop_sbar->draw();
}
static void place_talk_face() {