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

[SupSuper]

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:
c92c1dddad TRECISION: Remove global constructor


Commit: c92c1dddad06bf3ce86fae1f9071b6e61343badd
    https://github.com/scummvm/scummvm/commit/c92c1dddad06bf3ce86fae1f9071b6e61343badd
Author: SupSuper (supsuper at gmail.com)
Date: 2021-05-29T23:54:51+01:00

Commit Message:
TRECISION: Remove global constructor

Changed paths:
    engines/trecision/graphics.cpp
    engines/trecision/graphics.h


diff --git a/engines/trecision/graphics.cpp b/engines/trecision/graphics.cpp
index 258399d307..38fb0b2ffa 100644
--- a/engines/trecision/graphics.cpp
+++ b/engines/trecision/graphics.cpp
@@ -38,9 +38,8 @@
 
 namespace Trecision {
 
-const Graphics::PixelFormat GraphicsManager::kImageFormat(2, 5, 5, 5, 0, 10, 5, 0, 0); // RGB555
-
-GraphicsManager::GraphicsManager(TrecisionEngine *vm) : _vm(vm), _font(nullptr) {
+GraphicsManager::GraphicsManager(TrecisionEngine *vm) : kImageFormat(2, 5, 5, 5, 0, 10, 5, 0, 0), // RGB555
+	_vm(vm), _font(nullptr) {	
 	_drawRect = Common::Rect(0, 0, 0, 0);
 	_drawObjRect = Common::Rect(0, 0, 0, 0);
 	_drawObjIndex = -1;
diff --git a/engines/trecision/graphics.h b/engines/trecision/graphics.h
index 2e7f113cd6..7a89ee231a 100644
--- a/engines/trecision/graphics.h
+++ b/engines/trecision/graphics.h
@@ -57,7 +57,7 @@ class GraphicsManager {
 	int _drawObjIndex;
 	bool _drawMask;
 
-	static const Graphics::PixelFormat kImageFormat;
+	const Graphics::PixelFormat kImageFormat;
 
 	uint16 aliasing(uint32 val1, uint32 val2, uint8 num);
 	void drawCharPixel(uint16 y, uint16 charLeft, uint16 charRight, Common::Rect rect, Common::Rect subtitleRect, uint16 color, Graphics::Surface *externalSurface = nullptr);