[Scummvm-git-logs] scummvm master -> c1a2541d3bf4aa6eec4e5aad3f8d50bf6422dac3

[ccawley2011]

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:
f14cd2ff45 UNITY: Fix warning
4cf9d7fa73 ILLUSIONS: Fix typo in variable name
c1a2541d3b DRAGONS: Mark engine as requiring 16bit colour support


Commit: f14cd2ff4534b424f15f03d02520b2159cd1c8b8
    https://github.com/scummvm/scummvm/commit/f14cd2ff4534b424f15f03d02520b2159cd1c8b8
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-06-07T15:39:15+01:00

Commit Message:
UNITY: Fix warning

Changed paths:
    backends/taskbar/unity/unity-taskbar.cpp


diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp
index 532d9656c3..396a2dc27b 100644
--- a/backends/taskbar/unity/unity-taskbar.cpp
+++ b/backends/taskbar/unity/unity-taskbar.cpp
@@ -68,7 +68,7 @@ void UnityTaskbarManager::setProgressState(TaskbarProgressState state) {
 	switch (state) {
 	default:
 		warning("[UnityTaskbarManager::setProgressState] Unknown state / Not implemented (%d)", state);
-		// fallback to noprogress state
+		// fall through
 
 	case kTaskbarNoProgress:
 		unity_launcher_entry_set_progress_visible(_launcher, FALSE);


Commit: 4cf9d7fa732bea497c77926ffc70911560084492
    https://github.com/scummvm/scummvm/commit/4cf9d7fa732bea497c77926ffc70911560084492
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-06-07T15:40:00+01:00

Commit Message:
ILLUSIONS: Fix typo in variable name

Changed paths:
    engines/illusions/duckman/menusystem_duckman.cpp
    engines/illusions/duckman/menusystem_duckman.h


diff --git a/engines/illusions/duckman/menusystem_duckman.cpp b/engines/illusions/duckman/menusystem_duckman.cpp
index a36a22d8e7..b60722b6f5 100644
--- a/engines/illusions/duckman/menusystem_duckman.cpp
+++ b/engines/illusions/duckman/menusystem_duckman.cpp
@@ -410,17 +410,17 @@ void MenuActionUpdateSlider::setSliderValue(uint8 newValue) {
 
 MenuActionResetOptionSliders::MenuActionResetOptionSliders(BaseMenuSystem *menuSystem,
 														   MenuActionUpdateSlider *sfxSlider,
-														   MenuActionUpdateSlider *musiclider,
+														   MenuActionUpdateSlider *musicSlider,
 														   MenuActionUpdateSlider *speechSlider,
 														   MenuActionUpdateSlider *textDurationSlider)
-: BaseMenuAction(menuSystem), _sfxSlider(sfxSlider), _musiclider(musiclider),
+: BaseMenuAction(menuSystem), _sfxSlider(sfxSlider), _musicSlider(musicSlider),
   _speechSlider(speechSlider), _textDurationSlider(textDurationSlider) {
 
 }
 
 void MenuActionResetOptionSliders::execute() {
 	_sfxSlider->setSliderValue(11);
-	_musiclider->setSliderValue(11);
+	_musicSlider->setSliderValue(11);
 	_speechSlider->setSliderValue(15);
 	_textDurationSlider->setSliderValue(0);
 }
diff --git a/engines/illusions/duckman/menusystem_duckman.h b/engines/illusions/duckman/menusystem_duckman.h
index 1870d5bd17..bc67d73147 100644
--- a/engines/illusions/duckman/menusystem_duckman.h
+++ b/engines/illusions/duckman/menusystem_duckman.h
@@ -117,14 +117,14 @@ class MenuActionResetOptionSliders : public BaseMenuAction {
 public:
 	MenuActionResetOptionSliders(BaseMenuSystem *menuSystem,
 								 MenuActionUpdateSlider *sfxSlider,
-								 MenuActionUpdateSlider *musiclider,
+								 MenuActionUpdateSlider *musicSlider,
 								 MenuActionUpdateSlider *speechSlider,
 								 MenuActionUpdateSlider *textDurationSlider
 	);
 	void execute() override;
 protected:
 	MenuActionUpdateSlider *_sfxSlider;
-	MenuActionUpdateSlider *_musiclider;
+	MenuActionUpdateSlider *_musicSlider;
 	MenuActionUpdateSlider *_speechSlider;
 	MenuActionUpdateSlider *_textDurationSlider;
 };


Commit: c1a2541d3bf4aa6eec4e5aad3f8d50bf6422dac3
    https://github.com/scummvm/scummvm/commit/c1a2541d3bf4aa6eec4e5aad3f8d50bf6422dac3
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-06-07T16:05:45+01:00

Commit Message:
DRAGONS: Mark engine as requiring 16bit colour support

Changed paths:
    engines/dragons/configure.engine


diff --git a/engines/dragons/configure.engine b/engines/dragons/configure.engine
index 4dccbdf866..5d1e820a38 100644
--- a/engines/dragons/configure.engine
+++ b/engines/dragons/configure.engine
@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine dragons "Blazing Dragons" no
+add_engine dragons "Blazing Dragons" no "" "" "16bit"