This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
58be873808 NUVIE: Close options dialog when choosing to save or load game
4bdc9992ec NUVIE: Fix walking when mouse button is held down
e8988e4d36 NUVIE: Mark Ultima VI English entries for testing
Commit: 58be873808ce43eaccc06d2118846799c41c0924
https://github.com/scummvm/scummvm/commit/58be873808ce43eaccc06d2118846799c41c0924
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-18T20:43:46-07:00
Commit Message:
NUVIE: Close options dialog when choosing to save or load game
Changed paths:
engines/ultima/nuvie/menus/game_menu_dialog.cpp
diff --git a/engines/ultima/nuvie/menus/game_menu_dialog.cpp b/engines/ultima/nuvie/menus/game_menu_dialog.cpp
index 701bf380db..be1032b27c 100644
--- a/engines/ultima/nuvie/menus/game_menu_dialog.cpp
+++ b/engines/ultima/nuvie/menus/game_menu_dialog.cpp
@@ -85,7 +85,7 @@ bool GameMenuDialog::init() {
button_index[++last_index] = cheats_button;
continue_button = new GUI_Button(this, buttonX, buttonY += row_h, width, height, "Back to Game", gui->get_font(), BUTTON_TEXTALIGN_CENTER, 0, this, 0);
AddWidget(continue_button);
- button_index[++last_index] = cheats_button;
+ button_index[++last_index] = continue_button;
quit_button = new GUI_Button(this, buttonX, buttonY += row_h, width, height, "Quit", gui->get_font(), BUTTON_TEXTALIGN_CENTER, 0, this, 0);
AddWidget(quit_button);
button_index[++last_index] = quit_button;
@@ -146,8 +146,10 @@ GUI_status GameMenuDialog::callback(uint16 msg, GUI_CallBack *caller, void *data
if (caller == this) {
close_dialog();
} else if (caller == save_button) {
+ close_dialog();
g_engine->saveGameDialog();
} else if (caller == load_button) {
+ close_dialog();
g_engine->loadGameDialog();
} else if (caller == video_button) {
GUI_Widget *video_dialog;
Commit: 4bdc9992ec61dd5f1e7d1ca390abd35fcdfdfd73
https://github.com/scummvm/scummvm/commit/4bdc9992ec61dd5f1e7d1ca390abd35fcdfdfd73
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-18T21:26:12-07:00
Commit Message:
NUVIE: Fix walking when mouse button is held down
Changed paths:
engines/ultima/nuvie/core/nuvie_defs.h
engines/ultima/nuvie/gui/widgets/map_window.cpp
engines/ultima/nuvie/views/container_widget.cpp
engines/ultima/nuvie/views/doll_widget.cpp
engines/ultima/nuvie/views/inventory_widget.cpp
engines/ultima/nuvie/views/party_view.cpp
diff --git a/engines/ultima/nuvie/core/nuvie_defs.h b/engines/ultima/nuvie/core/nuvie_defs.h
index cda81940a7..34c4f111e5 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 37520f483c..ba61f42152 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 1634aede47..2cc8e08d07 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 ee23775c8f..aaff8ac6e5 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 0be9434b02..b83485cae0 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 9f1699b5b0..a5b5276171 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;
Commit: e8988e4d3684b3781c4f3bc7e3bb45ccf708c706
https://github.com/scummvm/scummvm/commit/e8988e4d3684b3781c4f3bc7e3bb45ccf708c706
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-18T21:26:15-07:00
Commit Message:
NUVIE: Mark Ultima VI English entries for testing
Changed paths:
engines/ultima/detection_tables.h
diff --git a/engines/ultima/detection_tables.h b/engines/ultima/detection_tables.h
index eda02dc677..c777a4a7bc 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -115,7 +115,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("converse.a", "5065716423ef1389e3f7b4946d815c26", 162615),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_UNSTABLE,
+ ADGF_TESTING,
GUIO0()
},
GAME_ULTIMA6,
@@ -130,7 +130,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("converse.a", "5065716423ef1389e3f7b4946d815c26", 162615),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_UNSTABLE,
+ ADGF_TESTING,
GUIO0()
},
GAME_ULTIMA6,