[Scummvm-git-logs] scummvm master -> 6cac88ffdb5de7d1143dd11953dda149f7943c8f

[bluegr]

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

Summary:
57996bee7d TINSEL: Fix compilation
6cac88ffdb DISTS: Revert accidentally committed changes


Commit: 57996bee7d4d75f6b2e0411bb2eabccb9b787df2
    https://github.com/scummvm/scummvm/commit/57996bee7d4d75f6b2e0411bb2eabccb9b787df2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-02-22T20:52:43+02:00

Commit Message:
TINSEL: Fix compilation

Changed paths:
    engines/tinsel/background.cpp
    engines/tinsel/background.h
    engines/tinsel/font.h


diff --git a/engines/tinsel/background.cpp b/engines/tinsel/background.cpp
index 9f98275..19aa585 100644
--- a/engines/tinsel/background.cpp
+++ b/engines/tinsel/background.cpp
@@ -67,17 +67,16 @@ void Background::InitBackground() {
 	};
 
 	// set current background
-	_pCurBgnd = new BACKGND{
-		BLACK,			// sky color
-		Common::Point(0, 0),	// initial world pos
-		Common::Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),	// scroll limits
-		0,				// no background update process
-		NULL,			// no x scroll table
-		NULL,			// no y scroll table
-		2,				// 2 playfields
-		playfield,		// playfield pointer
-		false			// no auto-erase
-	};
+	_pCurBgnd = new BACKGND();
+	_pCurBgnd->rgbSkyColor = BLACK;
+	_pCurBgnd->ptInitWorld = Common::Point(0, 0);
+	_pCurBgnd->rcScrollLimits = Common::Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+	_pCurBgnd->refreshRate = 0;	// no background update process
+	_pCurBgnd->pXscrollTable = nullptr;
+	_pCurBgnd->pYscrollTable = nullptr;
+	_pCurBgnd->numPlayfields = 2;
+	_pCurBgnd->fieldArray = playfield;
+	_pCurBgnd->bAutoErase = false;
 
 	// init background sky color
 	SetBgndColor(_pCurBgnd->rgbSkyColor);
diff --git a/engines/tinsel/background.h b/engines/tinsel/background.h
index 420d0e3..625d5b5 100644
--- a/engines/tinsel/background.h
+++ b/engines/tinsel/background.h
@@ -148,7 +148,7 @@ private:
 	Font *_font;
 
 	// current background
-	const BACKGND *_pCurBgnd;
+	BACKGND *_pCurBgnd;
 
 	SCNHANDLE _hBgPal;	// Background's palette
 	int _BGspeed;
diff --git a/engines/tinsel/font.h b/engines/tinsel/font.h
index c31a3fe..bb7269b 100644
--- a/engines/tinsel/font.h
+++ b/engines/tinsel/font.h
@@ -91,8 +91,8 @@ public:
 private:
 	char _tBuffer[TBUFSZ];
 
-	SCNHANDLE _hTagFont = 0, _hTalkFont = 0;
-	SCNHANDLE _hRegularTalkFont = 0, _hRegularTagFont = 0;
+	SCNHANDLE _hTagFont, _hTalkFont;
+	SCNHANDLE _hRegularTalkFont, _hRegularTagFont;
 };
 
 } // End of namespace Tinsel


Commit: 6cac88ffdb5de7d1143dd11953dda149f7943c8f
    https://github.com/scummvm/scummvm/commit/6cac88ffdb5de7d1143dd11953dda149f7943c8f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-02-22T20:53:49+02:00

Commit Message:
DISTS: Revert accidentally committed changes

Changed paths:
    dists/msvc/create_msvc.bat


diff --git a/dists/msvc/create_msvc.bat b/dists/msvc/create_msvc.bat
index 43385a1..6746a98 100644
--- a/dists/msvc/create_msvc.bat
+++ b/dists/msvc/create_msvc.bat
@@ -55,7 +55,7 @@ goto done
 echo.
 echo Creating project files with all engines enabled (stable and unstable)
 echo.
-create_project ..\.. --enable-all-engines --disable-fluidsynth --msvc --build-events --enable-vkeybd --enable-updates --enable-faad --enable-mpeg2
+create_project ..\.. --enable-all-engines --disable-fluidsynth --msvc
 goto done
 
 :stable