[Scummvm-git-logs] scummvm master -> 51888c13bad1014e7236bccfe198cc3888f13c83

aquadran noreply at scummvm.org
Tue Dec 7 23:09:10 UTC 2021 

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
51888c13ba STARK: Remove global constructors


Commit: 51888c13bad1014e7236bccfe198cc3888f13c83
    https://github.com/scummvm/scummvm/commit/51888c13bad1014e7236bccfe198cc3888f13c83
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-08T00:09:03+01:00

Commit Message:
STARK: Remove global constructors

Changed paths:
    engines/stark/ui/cursor.cpp
    engines/stark/ui/dialogbox.cpp
    engines/stark/ui/dialogbox.h
    engines/stark/ui/menu/dialogmenu.cpp
    engines/stark/ui/menu/dialogmenu.h
    engines/stark/ui/menu/diaryindex.cpp
    engines/stark/ui/menu/diaryindex.h
    engines/stark/ui/menu/diarypages.cpp
    engines/stark/ui/menu/fmvmenu.cpp
    engines/stark/ui/menu/fmvmenu.h
    engines/stark/ui/menu/saveloadmenu.cpp
    engines/stark/ui/menu/saveloadmenu.h
    engines/stark/ui/menu/settingsmenu.cpp
    engines/stark/ui/menu/settingsmenu.h
    engines/stark/ui/window.cpp
    engines/stark/ui/world/actionmenu.cpp
    engines/stark/ui/world/button.cpp
    engines/stark/ui/world/clicktext.cpp
    engines/stark/ui/world/dialogpanel.cpp
    engines/stark/ui/world/dialogpanel.h
    engines/stark/ui/world/fmvscreen.cpp
    engines/stark/ui/world/gamescreen.cpp
    engines/stark/ui/world/gamewindow.cpp
    engines/stark/ui/world/gamewindow.h
    engines/stark/ui/world/inventorywindow.cpp
    engines/stark/ui/world/inventorywindow.h
    engines/stark/ui/world/topmenu.cpp


diff --git a/engines/stark/ui/cursor.cpp b/engines/stark/ui/cursor.cpp
index 8db11d741b..f1638e6541 100644
--- a/engines/stark/ui/cursor.cpp
+++ b/engines/stark/ui/cursor.cpp
@@ -21,18 +21,14 @@
  */
 
 #include "engines/stark/ui/cursor.h"
-
 #include "engines/stark/gfx/driver.h"
 #include "engines/stark/gfx/texture.h"
-
 #include "engines/stark/services/gameinterface.h"
 #include "engines/stark/services/global.h"
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/staticprovider.h"
-
 #include "engines/stark/resources/item.h"
 #include "engines/stark/resources/sound.h"
-
 #include "engines/stark/visual/image.h"
 #include "engines/stark/visual/text.h"
 
diff --git a/engines/stark/ui/dialogbox.cpp b/engines/stark/ui/dialogbox.cpp
index 15c10d852d..2e138b2a6f 100644
--- a/engines/stark/ui/dialogbox.cpp
+++ b/engines/stark/ui/dialogbox.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "engines/stark/ui/dialogbox.h"
-
 #include "engines/stark/gfx/driver.h"
 #include "engines/stark/gfx/surfacerenderer.h"
 #include "engines/stark/gfx/texture.h"
@@ -33,9 +32,10 @@
 #include "common/memstream.h"
 #include "common/stream.h"
 #include "common/winexe_pe.h"
+
 #include "graphics/surface.h"
-#include "image/bmp.h"
 
+#include "image/bmp.h"
 
 namespace Stark {
 
@@ -44,7 +44,6 @@ static const uint dialogHorizontalMargin = 10;
 static const uint dialogVerticalMargin   = 20;
 static const uint buttonHorizontalMargin = 25;
 static const uint buttonVerticalMargin   = 5;
-static const Color textColor = Color(0xFF, 0xFF, 0xFF);
 
 DialogBox::DialogBox(StarkEngine *vm, Gfx::Driver *gfx, Cursor *cursor) :
 		Window(gfx, cursor),
@@ -69,16 +68,16 @@ DialogBox::DialogBox(StarkEngine *vm, Gfx::Driver *gfx, Cursor *cursor) :
 	delete background;
 
 	_messageVisual = new VisualText(gfx);
-	_messageVisual->setColor(textColor);
+	_messageVisual->setColor(_textColor);
 	_messageVisual->setTargetWidth(dialogMaxWidth - 2 * dialogHorizontalMargin);
 	_messageVisual->setAlign(Graphics::kTextAlignCenter);
 
 	_confirmLabelVisual = new VisualText(gfx);
-	_confirmLabelVisual->setColor(textColor);
+	_confirmLabelVisual->setColor(_textColor);
 	_confirmLabelVisual->setTargetWidth(96);
 
 	_cancelLabelVisual = new VisualText(gfx);
-	_cancelLabelVisual->setColor(textColor);
+	_cancelLabelVisual->setColor(_textColor);
 	_cancelLabelVisual->setTargetWidth(96);
 }
 
diff --git a/engines/stark/ui/dialogbox.h b/engines/stark/ui/dialogbox.h
index 58e0343963..55e11982bb 100644
--- a/engines/stark/ui/dialogbox.h
+++ b/engines/stark/ui/dialogbox.h
@@ -25,6 +25,7 @@
 
 #include "engines/stark/stark.h"
 #include "engines/stark/ui/window.h"
+#include "engines/stark/visual/text.h"
 
 #include "common/keyboard.h"
 #include "common/scummsys.h"
@@ -90,6 +91,8 @@ private:
 	Common::Rect _cancelButtonRect;
 	Common::Rect _messageRect;
 
+	const Color _textColor = Color(0xFF, 0xFF, 0xFF);
+
 	ConfirmCallback *_confirmCallback;
 };
 
diff --git a/engines/stark/ui/menu/dialogmenu.cpp b/engines/stark/ui/menu/dialogmenu.cpp
index ef4da1983f..a7ff55b7cb 100644
--- a/engines/stark/ui/menu/dialogmenu.cpp
+++ b/engines/stark/ui/menu/dialogmenu.cpp
@@ -21,27 +21,18 @@
  */
 
 #include "engines/stark/ui/menu/dialogmenu.h"
-
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/userinterface.h"
 #include "engines/stark/services/diary.h"
 #include "engines/stark/services/gamechapter.h"
 #include "engines/stark/services/staticprovider.h"
 #include "engines/stark/services/global.h"
-
 #include "engines/stark/gfx/renderentry.h"
-
 #include "engines/stark/resources/location.h"
 #include "engines/stark/resources/item.h"
 
 namespace Stark {
 
-const Color ChapterTitleText::_color = Color(0x68, 0x05, 0x04);
-const Color DialogTitleWidget::_textColorHovered = Color(0x1E, 0x1E, 0x96);
-const Color DialogTitleWidget::_textColorDefault = Color(0x00, 0x00, 0x00);
-const Color DialogLineText::_textColorApril = Color(0x68, 0x05, 0x04);
-const Color DialogLineText::_textColorNormal = Color(0x1E, 0x1E, 0x96);
-
 DialogScreen::DialogScreen(Gfx::Driver *gfx, Cursor *cursor) :
 		StaticLocationScreen(gfx, cursor, "DiaryLog", Screen::kScreenDialog),
 		_startTitleIndex(0), _nextTitleIndex(0),
diff --git a/engines/stark/ui/menu/dialogmenu.h b/engines/stark/ui/menu/dialogmenu.h
index f099ba8097..19acec383c 100644
--- a/engines/stark/ui/menu/dialogmenu.h
+++ b/engines/stark/ui/menu/dialogmenu.h
@@ -24,7 +24,6 @@
 #define STARK_UI_MENU_DIALOG_H
 
 #include "engines/stark/ui/menu/locationscreen.h"
-
 #include "engines/stark/visual/text.h"
 
 namespace Stark {
@@ -101,7 +100,7 @@ public:
 	void onScreenChanged() { _text.resetTexture(); }
 
 private:
-	static const Color _color;
+	const Color _color = Color(0x68, 0x05, 0x04);
 
 	Common::Point _pos;
 	VisualText _text;
@@ -129,8 +128,8 @@ public:
 	}
 
 private:
-	static const Color _textColorApril;
-	static const Color _textColorNormal;
+	const Color _textColorApril = Color(0x68, 0x05, 0x04);
+	const Color _textColorNormal = Color(0x1E, 0x1E, 0x96);
 
 	Common::Point _namePos, _linePos;
 	VisualText _nameText, _lineText;
@@ -160,8 +159,8 @@ public:
 	void onScreenChanged() override;
 
 private:
-	static const Color _textColorHovered;
-	static const Color _textColorDefault;
+	const Color _textColorHovered = Color(0x1E, 0x1E, 0x96);
+	const Color _textColorDefault = Color(0x00, 0x00, 0x00);
 
 	uint _logIndex, _chapter;
 	int _width, _height;
diff --git a/engines/stark/ui/menu/diaryindex.cpp b/engines/stark/ui/menu/diaryindex.cpp
index 303957b197..23a393fd31 100644
--- a/engines/stark/ui/menu/diaryindex.cpp
+++ b/engines/stark/ui/menu/diaryindex.cpp
@@ -21,24 +21,20 @@
  */
 
 #include "engines/stark/ui/menu/diaryindex.h"
-
 #include "engines/stark/gfx/driver.h"
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/diary.h"
 #include "engines/stark/services/userinterface.h"
 #include "engines/stark/services/gamemessage.h"
-
 #include "engines/stark/ui/cursor.h"
 
 #include "engines/engine.h"
+
 #include "gui/message.h"
 #include "gui/saveload.h"
 
 namespace Stark {
 
-const Color DiaryIndexScreen::_textColorHovered = Color(0x1E, 0x1E, 0x96);
-const Color DiaryIndexScreen::_textColorDefault = Color(0x00, 0x00, 0x00);
-
 DiaryIndexScreen::DiaryIndexScreen(Gfx::Driver *gfx, Cursor *cursor) :
 		StaticLocationScreen(gfx, cursor, "DiaryIndexLocation", Screen::kScreenDiaryIndex) {
 }
diff --git a/engines/stark/ui/menu/diaryindex.h b/engines/stark/ui/menu/diaryindex.h
index 5c735603b8..3cb0e88e8a 100644
--- a/engines/stark/ui/menu/diaryindex.h
+++ b/engines/stark/ui/menu/diaryindex.h
@@ -49,8 +49,8 @@ private:
 	void dialogHandler();
 	void quitHandler();
 
-	static const Color _textColorHovered;
-	static const Color _textColorDefault;
+	const Color _textColorHovered = Color(0x1E, 0x1E, 0x96);
+	const Color _textColorDefault = Color(0x00, 0x00, 0x00);
 };
 
 } // End of namespace Stark
diff --git a/engines/stark/ui/menu/diarypages.cpp b/engines/stark/ui/menu/diarypages.cpp
index 19ec8d0ed6..ab76c7b63e 100644
--- a/engines/stark/ui/menu/diarypages.cpp
+++ b/engines/stark/ui/menu/diarypages.cpp
@@ -21,15 +21,12 @@
  */
 
 #include "engines/stark/ui/menu/diarypages.h"
-
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/userinterface.h"
 #include "engines/stark/services/diary.h"
 #include "engines/stark/services/staticprovider.h"
-
 #include "engines/stark/resources/location.h"
 #include "engines/stark/resources/layer.h"
-
 #include "engines/stark/gfx/renderentry.h"
 
 namespace Stark {
diff --git a/engines/stark/ui/menu/fmvmenu.cpp b/engines/stark/ui/menu/fmvmenu.cpp
index 2b0756fb2d..c066fcf335 100644
--- a/engines/stark/ui/menu/fmvmenu.cpp
+++ b/engines/stark/ui/menu/fmvmenu.cpp
@@ -21,29 +21,21 @@
  */
 
 #include "engines/stark/ui/menu/fmvmenu.h"
-
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/userinterface.h"
 #include "engines/stark/services/diary.h"
 #include "engines/stark/services/staticprovider.h"
-
 #include "engines/stark/resources/location.h"
-
 #include "engines/stark/visual/text.h"
 
 namespace Stark {
 
-const Color FMVWidget::_textColorHovered = Color(0x1E, 0x1E, 0x96);
-const Color FMVWidget::_textColorDefault = Color(0x00, 0x00, 0x00);
-
-// Hard-coded parameters in case cannot retrieve the format rectangle
-Common::Point FMVMenuScreen::_formatRectPos(202, 61);
-int FMVMenuScreen::_fontHeight(16);
-uint FMVMenuScreen::_fmvPerPage(18);
-
 FMVMenuScreen::FMVMenuScreen(Gfx::Driver *gfx, Cursor *cursor) :
 		StaticLocationScreen(gfx, cursor, "DiaryFMV", Screen::kScreenFMVMenu),
 		_fmvWidgets() {
+	_formatRectPos = Common::Point(202, 61);
+	_fontHeight = 16;
+	_fmvPerPage = 18;
 }
 
 FMVMenuScreen::~FMVMenuScreen() {
@@ -184,9 +176,12 @@ FMVWidget::FMVWidget(Gfx::Driver *gfx, uint fmvIndex) :
 	Common::Rect rect = _title.getRect();
 	_width = rect.right - rect.left;
 
-	_position.x = FMVMenuScreen::_formatRectPos.x;
-	_position.y = FMVMenuScreen::_formatRectPos.y +
-	              (fmvIndex % FMVMenuScreen::_fmvPerPage) * (FMVMenuScreen::_fontHeight + 4);
+	_formatRectPos = Common::Point(202, 61);
+	_fontHeight = 16;
+	_fmvPerPage = 18;
+
+	_position.x = _formatRectPos.x;
+	_position.y = _formatRectPos.y + (fmvIndex % _fmvPerPage) * (_fontHeight + 4);
 }
 
 void FMVWidget::onClick() {
@@ -195,7 +190,7 @@ void FMVWidget::onClick() {
 
 bool FMVWidget::isMouseInside(const Common::Point &mousePos) const {
 	return mousePos.x >= _position.x && mousePos.x <= _position.x + _width &&
-		   mousePos.y >= _position.y && mousePos.y <= _position.y + FMVMenuScreen::_fontHeight;
+		   mousePos.y >= _position.y && mousePos.y <= _position.y + _fontHeight;
 }
 
 } // End of namespace Stark
diff --git a/engines/stark/ui/menu/fmvmenu.h b/engines/stark/ui/menu/fmvmenu.h
index 42bad23429..c050239242 100644
--- a/engines/stark/ui/menu/fmvmenu.h
+++ b/engines/stark/ui/menu/fmvmenu.h
@@ -24,7 +24,6 @@
 #define STARK_UI_MENU_FMV_MENU_H
 
 #include "engines/stark/ui/menu/locationscreen.h"
-
 #include "engines/stark/visual/text.h"
 
 namespace Stark {
@@ -36,10 +35,6 @@ class FMVWidget;
  */
 class FMVMenuScreen : public StaticLocationScreen {
 public:
-	static Common::Point _formatRectPos;
-	static int _fontHeight;
-	static uint _fmvPerPage;
-
 	FMVMenuScreen(Gfx::Driver *gfx, Cursor *cursor);
 	virtual ~FMVMenuScreen();
 
@@ -62,6 +57,10 @@ private:
 
 	Common::Array<FMVWidget *> _fmvWidgets;
 
+	Common::Point _formatRectPos;
+	int _fontHeight;
+	uint _fmvPerPage;
+
 	// Count from zero
 	uint _page, _maxPage;
 
@@ -97,8 +96,12 @@ public:
 	void onScreenChanged() { _title.resetTexture(); }
 
 private:
-	static const Color _textColorHovered;
-	static const Color _textColorDefault;
+	const Color _textColorHovered = Color(0x1E, 0x1E, 0x96);
+	const Color _textColorDefault = Color(0x00, 0x00, 0x00);
+
+	Common::Point _formatRectPos;
+	int _fontHeight;
+	uint _fmvPerPage;
 
 	const Common::String &_filename;
 	VisualText _title;
diff --git a/engines/stark/ui/menu/saveloadmenu.cpp b/engines/stark/ui/menu/saveloadmenu.cpp
index 4d57063106..e0cd3a3785 100644
--- a/engines/stark/ui/menu/saveloadmenu.cpp
+++ b/engines/stark/ui/menu/saveloadmenu.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "engines/stark/ui/menu/saveloadmenu.h"
-
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/userinterface.h"
 #include "engines/stark/services/stateprovider.h"
@@ -29,11 +28,9 @@
 #include "engines/stark/services/settings.h"
 #include "engines/stark/services/gamechapter.h"
 #include "engines/stark/services/gamemessage.h"
-
 #include "engines/stark/gfx/driver.h"
 #include "engines/stark/gfx/texture.h"
 #include "engines/stark/gfx/surfacerenderer.h"
-
 #include "engines/stark/stark.h"
 #include "engines/stark/savemetadata.h"
 
@@ -46,9 +43,6 @@
 
 namespace Stark {
 
-const Color SaveDataWidget::_outlineColor = Color(0x1E, 0x1E, 0x96);
-const Color SaveDataWidget::_textColor    = Color(0x5C, 0x48, 0x3D);
-
 SaveLoadMenuScreen::SaveLoadMenuScreen(Gfx::Driver *gfx, Cursor *cursor, Screen::Name screenName) :
 		StaticLocationScreen(gfx, cursor, "LoadSaveLocation", screenName),
 		_page(0),
diff --git a/engines/stark/ui/menu/saveloadmenu.h b/engines/stark/ui/menu/saveloadmenu.h
index 9fc10210c2..2c37990a05 100644
--- a/engines/stark/ui/menu/saveloadmenu.h
+++ b/engines/stark/ui/menu/saveloadmenu.h
@@ -24,7 +24,6 @@
 #define STARK_UI_MENU_SAVELOAD_MENU_H
 
 #include "engines/stark/ui/menu/locationscreen.h"
-
 #include "engines/stark/visual/text.h"
 
 #include "common/error.h"
@@ -158,8 +157,8 @@ public:
 	bool hasSave() { return _hasSave; }
 
 private:
-	static const Color _outlineColor;
-	static const Color _textColor;
+	const Color _outlineColor = Color(0x1E, 0x1E, 0x96);
+	const Color _textColor = Color(0x5C, 0x48, 0x3D);
 
 	int _slot;
 	SaveLoadMenuScreen *_screen;
diff --git a/engines/stark/ui/menu/settingsmenu.cpp b/engines/stark/ui/menu/settingsmenu.cpp
index b956ff3989..5bce6733ca 100644
--- a/engines/stark/ui/menu/settingsmenu.cpp
+++ b/engines/stark/ui/menu/settingsmenu.cpp
@@ -25,17 +25,11 @@
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/userinterface.h"
 #include "engines/stark/services/staticprovider.h"
-
 #include "engines/stark/visual/image.h"
-
 #include "engines/stark/resources/sound.h"
 
 namespace Stark {
 
-const Color SettingsMenuScreen::_textColorHovered = Color(0x1E, 0x1E, 0x96);
-const Color SettingsMenuScreen::_textColorDefault = Color(0x00, 0x00, 0x00);
-const Color VolumeWidget::_textColorBgHovered = Color(0xFF, 0xFF, 0xFF);
-
 SettingsMenuScreen::SettingsMenuScreen(Gfx::Driver *gfx, Cursor *cursor) :
 		StaticLocationScreen(gfx, cursor, "OptionLocation", Screen::kScreenSettingsMenu),
 		_soundManager() {
diff --git a/engines/stark/ui/menu/settingsmenu.h b/engines/stark/ui/menu/settingsmenu.h
index c67d38e9c4..25f71240fc 100644
--- a/engines/stark/ui/menu/settingsmenu.h
+++ b/engines/stark/ui/menu/settingsmenu.h
@@ -106,8 +106,8 @@ private:
 	void backHandler();
 
 private:
-	static const Color _textColorHovered;
-	static const Color _textColorDefault;
+	const Color _textColorHovered = Color(0x1E, 0x1E, 0x96);
+	const Color _textColorDefault = Color(0x00, 0x00, 0x00);
 
 	TestSoundManager _soundManager;
 };
@@ -156,7 +156,7 @@ public:
 	void onMouseUp() override;
 
 private:
-	static const Color _textColorBgHovered;
+	const Color _textColorBgHovered = Color(0xFF, 0xFF, 0xFF);
 	static const int _maxVolume = 256;
 
 	VisualImageXMG *_sliderImage;
diff --git a/engines/stark/ui/window.cpp b/engines/stark/ui/window.cpp
index 7e6484694e..38d884cb54 100644
--- a/engines/stark/ui/window.cpp
+++ b/engines/stark/ui/window.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "engines/stark/ui/window.h"
-
 #include "engines/stark/gfx/driver.h"
 #include "engines/stark/services/services.h"
 #include "engines/stark/ui/cursor.h"
diff --git a/engines/stark/ui/world/actionmenu.cpp b/engines/stark/ui/world/actionmenu.cpp
index bded2fcb6c..10844375df 100644
--- a/engines/stark/ui/world/actionmenu.cpp
+++ b/engines/stark/ui/world/actionmenu.cpp
@@ -21,27 +21,21 @@
  */
 
 #include "engines/stark/ui/world/actionmenu.h"
-
 #include "engines/stark/ui/cursor.h"
 #include "engines/stark/ui/world/gamewindow.h"
 #include "engines/stark/ui/world/inventorywindow.h"
-
 #include "engines/stark/gfx/driver.h"
-
 #include "engines/stark/resources/anim.h"
 #include "engines/stark/resources/item.h"
 #include "engines/stark/resources/knowledgeset.h"
 #include "engines/stark/resources/level.h"
 #include "engines/stark/resources/pattable.h"
 #include "engines/stark/resources/sound.h"
-
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/gameinterface.h"
 #include "engines/stark/services/staticprovider.h"
 #include "engines/stark/services/global.h"
-
 #include "engines/stark/scene.h"
-
 #include "engines/stark/visual/image.h"
 #include "engines/stark/visual/text.h"
 
diff --git a/engines/stark/ui/world/button.cpp b/engines/stark/ui/world/button.cpp
index 128071f52b..a8ee7d6293 100644
--- a/engines/stark/ui/world/button.cpp
+++ b/engines/stark/ui/world/button.cpp
@@ -21,11 +21,9 @@
  */
 
 #include "engines/stark/ui/world/button.h"
-
 #include "engines/stark/services/services.h"
 #include "engines/stark/gfx/driver.h"
 #include "engines/stark/gfx/texture.h"
-
 #include "engines/stark/visual/explodingimage.h"
 #include "engines/stark/visual/flashingimage.h"
 #include "engines/stark/visual/image.h"
diff --git a/engines/stark/ui/world/clicktext.cpp b/engines/stark/ui/world/clicktext.cpp
index 7597f06c4b..edf2e1f2af 100644
--- a/engines/stark/ui/world/clicktext.cpp
+++ b/engines/stark/ui/world/clicktext.cpp
@@ -21,9 +21,7 @@
  */
 
 #include "engines/stark/ui/world/clicktext.h"
-
 #include "engines/stark/services/services.h"
-
 #include "engines/stark/visual/text.h"
 
 namespace Stark {
diff --git a/engines/stark/ui/world/dialogpanel.cpp b/engines/stark/ui/world/dialogpanel.cpp
index e93b602cb9..e52c180169 100644
--- a/engines/stark/ui/world/dialogpanel.cpp
+++ b/engines/stark/ui/world/dialogpanel.cpp
@@ -21,28 +21,20 @@
  */
 
 #include "engines/stark/ui/world/dialogpanel.h"
-
 #include "engines/stark/gfx/driver.h"
-
 #include "engines/stark/resources/speech.h"
-
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/staticprovider.h"
 #include "engines/stark/services/dialogplayer.h"
 #include "engines/stark/services/settings.h"
 #include "engines/stark/services/userinterface.h"
-
 #include "engines/stark/ui/cursor.h"
 #include "engines/stark/ui/world/clicktext.h"
-
 #include "engines/stark/visual/image.h"
 #include "engines/stark/visual/text.h"
 
 namespace Stark {
 
-const Color DialogPanel::_aprilColor = Color(0xFF, 0xC0, 0x00);
-const Color DialogPanel::_otherColor = Color(0xFF, 0x40, 0x40);
-
 DialogPanel::DialogPanel(Gfx::Driver *gfx, Cursor *cursor) :
 		Window(gfx, cursor),
 		_subtitleVisual(nullptr),
diff --git a/engines/stark/ui/world/dialogpanel.h b/engines/stark/ui/world/dialogpanel.h
index 91cbf54fcf..528ebdf341 100644
--- a/engines/stark/ui/world/dialogpanel.h
+++ b/engines/stark/ui/world/dialogpanel.h
@@ -24,7 +24,6 @@
 #define STARK_UI_DIALOG_PANEL_H
 
 #include "engines/stark/ui/window.h"
-
 #include "engines/stark/visual/text.h"
 
 #include "common/scummsys.h"
@@ -105,8 +104,8 @@ private:
 	Common::Array<ClickText*> _options;
 	bool _acceptIdleMousePos;
 
-	static const Color _aprilColor;
-	static const Color _otherColor;
+	Color _aprilColor = Color(0xFF, 0xC0, 0x00);
+	Color _otherColor = Color(0xFF, 0x40, 0x40);
 	static const uint32 _optionsTop = 4;
 	static const uint32 _optionsLeft = 30;
 	static const uint32 _optionsHeight = 80;
diff --git a/engines/stark/ui/world/fmvscreen.cpp b/engines/stark/ui/world/fmvscreen.cpp
index a93ee9933e..2c96f0714f 100644
--- a/engines/stark/ui/world/fmvscreen.cpp
+++ b/engines/stark/ui/world/fmvscreen.cpp
@@ -23,11 +23,9 @@
 #include "common/rect.h"
 
 #include "engines/stark/ui/world/fmvscreen.h"
-
 #include "engines/stark/gfx/driver.h"
 #include "engines/stark/gfx/surfacerenderer.h"
 #include "engines/stark/gfx/texture.h"
-
 #include "engines/stark/services/archiveloader.h"
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/userinterface.h"
diff --git a/engines/stark/ui/world/gamescreen.cpp b/engines/stark/ui/world/gamescreen.cpp
index f1fbee6c7b..ec1765a0bd 100644
--- a/engines/stark/ui/world/gamescreen.cpp
+++ b/engines/stark/ui/world/gamescreen.cpp
@@ -21,18 +21,15 @@
  */
 
 #include "engines/stark/ui/world/gamescreen.h"
-
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/userinterface.h"
 #include "engines/stark/services/global.h"
-
 #include "engines/stark/ui/cursor.h"
 #include "engines/stark/ui/world/actionmenu.h"
 #include "engines/stark/ui/world/dialogpanel.h"
 #include "engines/stark/ui/world/gamewindow.h"
 #include "engines/stark/ui/world/inventorywindow.h"
 #include "engines/stark/ui/world/topmenu.h"
-
 #include "engines/stark/resources/level.h"
 #include "engines/stark/resources/location.h"
 
diff --git a/engines/stark/ui/world/gamewindow.cpp b/engines/stark/ui/world/gamewindow.cpp
index afb8e23a2e..81dfa7691a 100644
--- a/engines/stark/ui/world/gamewindow.cpp
+++ b/engines/stark/ui/world/gamewindow.cpp
@@ -21,28 +21,22 @@
  */
 
 #include "engines/stark/ui/world/gamewindow.h"
-
 #include "engines/stark/scene.h"
-
 #include "engines/stark/gfx/driver.h"
-
 #include "engines/stark/resources/anim.h"
 #include "engines/stark/resources/knowledgeset.h"
 #include "engines/stark/resources/image.h"
 #include "engines/stark/resources/item.h"
 #include "engines/stark/resources/location.h"
 #include "engines/stark/resources/layer.h"
-
 #include "engines/stark/services/global.h"
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/staticprovider.h"
 #include "engines/stark/services/gameinterface.h"
 #include "engines/stark/services/userinterface.h"
-
 #include "engines/stark/ui/cursor.h"
 #include "engines/stark/ui/world/actionmenu.h"
 #include "engines/stark/ui/world/inventorywindow.h"
-
 #include "engines/stark/visual/text.h"
 #include "engines/stark/visual/image.h"
 
diff --git a/engines/stark/ui/world/gamewindow.h b/engines/stark/ui/world/gamewindow.h
index 73c5934c55..4aeafa7d17 100644
--- a/engines/stark/ui/world/gamewindow.h
+++ b/engines/stark/ui/world/gamewindow.h
@@ -25,7 +25,6 @@
 
 #include "engines/stark/gfx/faderenderer.h"
 #include "engines/stark/gfx/renderentry.h"
-
 #include "engines/stark/ui/window.h"
 
 #include "common/scummsys.h"
diff --git a/engines/stark/ui/world/inventorywindow.cpp b/engines/stark/ui/world/inventorywindow.cpp
index 35ed6d90ee..0634842a3d 100644
--- a/engines/stark/ui/world/inventorywindow.cpp
+++ b/engines/stark/ui/world/inventorywindow.cpp
@@ -21,21 +21,16 @@
  */
 
 #include "engines/stark/ui/world/inventorywindow.h"
-
 #include "engines/stark/ui/cursor.h"
 #include "engines/stark/ui/world/actionmenu.h"
-
 #include "engines/stark/gfx/driver.h"
-
 #include "engines/stark/resources/knowledgeset.h"
 #include "engines/stark/resources/item.h"
 #include "engines/stark/resources/pattable.h"
-
 #include "engines/stark/services/global.h"
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/staticprovider.h"
 #include "engines/stark/services/gameinterface.h"
-
 #include "engines/stark/visual/image.h"
 
 namespace Stark {
diff --git a/engines/stark/ui/world/inventorywindow.h b/engines/stark/ui/world/inventorywindow.h
index 13aeecec04..aabc1fbd47 100644
--- a/engines/stark/ui/world/inventorywindow.h
+++ b/engines/stark/ui/world/inventorywindow.h
@@ -24,7 +24,6 @@
 #define STARK_UI_INVENTORY_WINDOW_H
 
 #include "engines/stark/gfx/renderentry.h"
-
 #include "engines/stark/ui/window.h"
 
 #include "common/scummsys.h"
diff --git a/engines/stark/ui/world/topmenu.cpp b/engines/stark/ui/world/topmenu.cpp
index 4925deda34..b000cf4447 100644
--- a/engines/stark/ui/world/topmenu.cpp
+++ b/engines/stark/ui/world/topmenu.cpp
@@ -21,21 +21,16 @@
  */
 
 #include "engines/stark/ui/world/topmenu.h"
-
 #include "engines/stark/ui/cursor.h"
 #include "engines/stark/ui/world/button.h"
-
 #include "engines/stark/gfx/driver.h"
-
 #include "engines/stark/resources/knowledgeset.h"
 #include "engines/stark/resources/sound.h"
-
 #include "engines/stark/services/diary.h"
 #include "engines/stark/services/global.h"
 #include "engines/stark/services/services.h"
 #include "engines/stark/services/userinterface.h"
 #include "engines/stark/services/gamemessage.h"
-
 #include "engines/stark/visual/image.h"
 
 namespace Stark {

More information about the Scummvm-git-logs mailing list