Some tweaks and comments to try and satisfy @x-qq, plus fix scons build

This commit is contained in:
2020-01-30 00:48:34 -05:00
parent 4859fa70bc
commit 589d919f13
3 changed files with 38 additions and 20 deletions

View File

@@ -24,7 +24,6 @@ class cToolbar {
// These correspond to the button frames in buttons.png (top row)
enum eButtonType {BTN_LG, BTN_SM_HI, BTN_SM_LO};
static std::vector<eToolbarButton> out_buttons, town_buttons, fight_buttons;
struct cButton {
eToolbarButton btn;
eButtonType type;
@@ -37,6 +36,8 @@ class cToolbar {
enum eMode {UNKNOWN, OUTDOORS, TOWN, COMBAT};
eMode cur_mode = UNKNOWN, get_mode();
int active = -1;
void place_buttons(const std::vector<eToolbarButton>& src);
void draw_buttons();
void init();
public:
void draw(sf::RenderTarget& targ);