diff --git a/engines/ultima/nuvie/core/nuvie_defs.h b/engines/ultima/nuvie/core/nuvie_defs.h index cda81940a75..34c4f111e53 100644 --- a/engines/ultima/nuvie/core/nuvie_defs.h +++ b/engines/ultima/nuvie/core/nuvie_defs.h @@ -33,6 +33,11 @@ typedef int8 sint8; typedef int16 sint16; typedef int32 sint32; +#define USE_BUTTON Shared::MK_LBUTTON +#define WALK_BUTTON Shared::MK_RBUTTON +#define ACTION_BUTTON Shared::MK_RBUTTON +#define DRAG_BUTTON Shared::MK_LBUTTON + typedef uint8 nuvie_game_t; // Game type (1=u6,2=md,4=se) #define NUVIE_GAME_NONE 0 diff --git a/engines/ultima/nuvie/gui/widgets/map_window.cpp b/engines/ultima/nuvie/gui/widgets/map_window.cpp index 37520f483c4..ba61f421523 100644 --- a/engines/ultima/nuvie/gui/widgets/map_window.cpp +++ b/engines/ultima/nuvie/gui/widgets/map_window.cpp @@ -50,11 +50,6 @@ namespace Ultima { namespace Nuvie { -#define USE_BUTTON 1 /* FIXME: put this in a common location */ -#define WALK_BUTTON 3 -#define ACTION_BUTTON 3 -#define DRAG_BUTTON 1 - #define TMP_MAP_BORDER 3 #define WRAP_VIEWP(p,p1,s) ((p1-p) < 0 ? (p1-p) + s : p1-p) diff --git a/engines/ultima/nuvie/views/container_widget.cpp b/engines/ultima/nuvie/views/container_widget.cpp index 1634aede477..2cc8e08d07f 100644 --- a/engines/ultima/nuvie/views/container_widget.cpp +++ b/engines/ultima/nuvie/views/container_widget.cpp @@ -42,11 +42,6 @@ namespace Ultima { namespace Nuvie { -#define USE_BUTTON 1 /* FIXME: put this in a common location */ -#define ACTION_BUTTON 3 -#define DRAG_BUTTON 1 - - ContainerWidget::ContainerWidget(Configuration *cfg, GUI_CallBack *callback): GUI_Widget(NULL, 0, 0, 0, 0) { config = cfg; callback_object = callback; diff --git a/engines/ultima/nuvie/views/doll_widget.cpp b/engines/ultima/nuvie/views/doll_widget.cpp index ee23775c8fb..aaff8ac6e58 100644 --- a/engines/ultima/nuvie/views/doll_widget.cpp +++ b/engines/ultima/nuvie/views/doll_widget.cpp @@ -42,10 +42,6 @@ namespace Ultima { namespace Nuvie { -#define USE_BUTTON 1 /* FIXME: put this in a common location */ -#define ACTION_BUTTON 3 -#define DRAG_BUTTON 1 - static const byte gump_blocked_tile_data[] = { 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, diff --git a/engines/ultima/nuvie/views/inventory_widget.cpp b/engines/ultima/nuvie/views/inventory_widget.cpp index 0be9434b027..b83485cae04 100644 --- a/engines/ultima/nuvie/views/inventory_widget.cpp +++ b/engines/ultima/nuvie/views/inventory_widget.cpp @@ -42,10 +42,6 @@ namespace Ultima { namespace Nuvie { -#define USE_BUTTON 1 /* FIXME: put this in a common location */ -#define ACTION_BUTTON 3 -#define DRAG_BUTTON 1 - InventoryWidget::InventoryWidget(Configuration *cfg, GUI_CallBack *callback): GUI_Widget(NULL, 0, 0, 0, 0) { config = cfg; callback_object = callback; diff --git a/engines/ultima/nuvie/views/party_view.cpp b/engines/ultima/nuvie/views/party_view.cpp index 9f1699b5b0f..a5b52761714 100644 --- a/engines/ultima/nuvie/views/party_view.cpp +++ b/engines/ultima/nuvie/views/party_view.cpp @@ -47,8 +47,6 @@ extern GUI_status actorViewButtonCallback(void *data); #define SE Game::get_game()->get_game_type()==NUVIE_GAME_SE #define MD Game::get_game()->get_game_type()==NUVIE_GAME_MD -static const uint8 ACTION_BUTTON = 3; - PartyView::PartyView(Configuration *cfg) : View(cfg) { player = NULL; view_manager = NULL;