vultures/gamedata/graphics/tb2.png @@ -104,20 +104,21 @@ void levelwin::init() new hotspot(this, 20, 0, w - 40, 20, V_HOTSPOT_SCROLL_UP, "scroll up"); /* Toolbar1: inventory, map, cast spell, extended commands */ - const tb_buttondesc tb1_desc[5] = { + const tb_buttondesc tb1_desc[6] = { {V_HOTSPOT_BUTTON_INVENTORY, "Inventory"}, {V_HOTSPOT_BUTTON_MAP, "Map"}, {V_HOTSPOT_BUTTON_SPELLBOOK, "Cast spell"}, {V_HOTSPOT_BUTTON_EXTENDED, "Extended commands"}, - {V_HOTSPOT_BUTTON_DISCOVERIES, "Show discoveries"} + {V_HOTSPOT_BUTTON_DISCOVERIES, "Show discoveries"}, + {0,""} }; new toolbar(this, V_WIN_TOOLBAR1, vultures_opts.show_actiontb, w - 215, h - 84, V_FILENAME_TOOLBAR1, tb1_desc); - /* Toolbar 2: look at, previous messages, options, help */ - const tb_buttondesc tb2_desc[5] = { + const tb_buttondesc tb2_desc[6] = { + {V_HOTSPOT_BUTTON_GOLD, "Gold"}, {V_HOTSPOT_BUTTON_LOOK, "Look"}, {V_HOTSPOT_BUTTON_MESSAGES, "Old messages"}, {V_HOTSPOT_BUTTON_OPTIONS, "Options"}, @@ -126,7 +127,7 @@ void levelwin::init() }; new toolbar(this, V_WIN_TOOLBAR2, vultures_opts.show_helptb, - w - 215, h - 45, V_FILENAME_TOOLBAR2, tb2_desc); + w - 255, h - 45, V_FILENAME_TOOLBAR2, tb2_desc); /* select wall style */ switch (vultures_opts.wall_style) vultures/winclass/levelwin.cpp @@ -38,6 +38,11 @@ typedef enum { V_ACTION_OPEN_DOOR, V_ACTION_SEARCH, + V_ACTION_GOLD_QUERY, + V_ACTION_GOLD_DROP, + V_ACTION_GOLD_THROW, + V_ACTION_GOLD_PAY, + V_ACTION_ENGRAVE, V_ACTION_LOOK_AROUND, V_ACTION_PAY_BILL, vultures/winclass/mapdata.h @@ -12,6 +12,8 @@ #include "hotspot.h" #include "messagewin.h" #include "map.h" +#include "levelwin.h" +#include "contextmenu.h" toolbar::toolbar(window *p, int menuid, bool visible, int x, int y, std::string imgfile, const tb_buttondesc buttons[5]) : window(p) @@ -30,6 +32,7 @@ toolbar::toolbar(window *p, int menuid, bool visible, int x, int y, std::string new hotspot(this, 84, 0, 38, 39, buttons[2].menu_id, buttons[2].name); new hotspot(this, 124, 0, 38, 39, buttons[3].menu_id, buttons[3].name); new hotspot(this, 164, 0, 38, 39, buttons[4].menu_id, buttons[4].name); + new hotspot(this, 184, 0, 38, 39, buttons[5].menu_id, buttons[5].name); } @@ -76,6 +79,46 @@ eventresult toolbar::handle_mousebuttonup_event(window* target, void* result, /* one of the buttons was clicked */ switch (target->menu_id) { + case V_HOTSPOT_BUTTON_GOLD: + { + int action; + contextmenu *menu = new contextmenu( levwin ); + + menu->add_item("Check Wallet", V_ACTION_GOLD_QUERY); + menu->add_item("Drop Gold", V_ACTION_GOLD_DROP); + menu->add_item("Throw Gold", V_ACTION_GOLD_THROW); + if (*u.ushops) + menu->add_item("Pay shopkeeper", V_ACTION_GOLD_PAY); + + menu->layout(); + vultures_event_dispatcher(&action, V_RESPOND_INT, menu ); + + switch (action) { + + case V_ACTION_GOLD_QUERY: + ((vultures_event*)result)->num = '$'; + break; + + case V_ACTION_GOLD_DROP: + vultures_eventstack_add('$', -1, -1, V_RESPOND_CHARACTER); + ((vultures_event*)result)->num = 'd'; + break; + + case V_ACTION_GOLD_THROW: + vultures_eventstack_add('$', -1, -1, V_RESPOND_CHARACTER); + ((vultures_event*)result)->num = 't'; + break; + + case V_ACTION_GOLD_PAY: + ((vultures_event*)result)->num = 'p'; + break; + + } + + delete menu; + } + return V_EVENT_HANDLED_FINAL; + case V_HOTSPOT_BUTTON_LOOK: vultures_eventstack_add('y', -1, -1, V_RESPOND_CHARACTER); ((vultures_event*)result)->num = '/'; vultures/winclass/toolbar.cpp @@ -62,6 +62,7 @@ enum hotspots { V_WIN_ENHANCE, /* child windows of the statusbar */ + V_HOTSPOT_BUTTON_GOLD, V_HOTSPOT_BUTTON_LOOK, V_HOTSPOT_BUTTON_EXTENDED, V_HOTSPOT_BUTTON_MAP, vultures/winclass/window.h 78964cdaed21793ca5c9314a3c741262400bfb38 Clive Crous clive@crous.co.za http://github.com/clivecrous/vultures/commit/3324ec30e3f29f090e2317df9092a00f3266028c 3324ec30e3f29f090e2317df9092a00f3266028c 2009-07-19T06:08:29-07:00 2009-07-19T06:08:29-07:00 Add a gold action button to the toolbar. Rough implementation pending toolbar rewrite for next release. Closes #61. d31ddd0a7b7abd97686f129748099a7608b215eb Clive Crous clive@crous.co.za