[Scummvm-cvs-logs] scummvm master -> a34ed8f9a0b4e99ed37864bf94625011a10676da

somaen einarjohants at gmail.com
Mon Jul 29 23:51:32 CEST 2013


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:
cdf7bfe6b0 WINTERMUTE: Handle setting Save/Load-screen to NULL.
94ff62feab WINTERMUTE: Add detection for The Shine of a Star.
a34ed8f9a0 WINTERMUTE: Align detection-entries properly with spaces.


Commit: cdf7bfe6b061f19dd737aeebc7729a6d85fd4a3e
    https://github.com/scummvm/scummvm/commit/cdf7bfe6b061f19dd737aeebc7729a6d85fd4a3e
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-07-29T14:42:56-07:00

Commit Message:
WINTERMUTE: Handle setting Save/Load-screen to NULL.

Changed paths:
    engines/wintermute/base/gfx/base_renderer.cpp



diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index c20881e..b3f05ce 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -113,15 +113,21 @@ void BaseRenderer::setIndicatorVal(int value) {
 }
 
 void BaseRenderer::setLoadingScreen(const char *filename, int x, int y) {
-	// TODO: Handle NULL
-	_loadImageName = filename;
+	if (filename == nullptr) {
+		_saveImageName = "";
+	} else {
+		_loadImageName = filename;
+	}
 	_loadImageX = x;
 	_loadImageY = y;
 }
 
 void BaseRenderer::setSaveImage(const char *filename, int x, int y) {
-	// TODO: Handle NULL
-	_saveImageName = filename;
+	if (filename == nullptr) {
+		_saveImageName = "";
+	} else {
+		_saveImageName = filename;
+	}
 	_saveImageX = x;
 	_saveImageY = y;
 }


Commit: 94ff62feab71bf344b6bed9923285581b379c43b
    https://github.com/scummvm/scummvm/commit/94ff62feab71bf344b6bed9923285581b379c43b
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-07-29T14:47:08-07:00

Commit Message:
WINTERMUTE: Add detection for The Shine of a Star.

Changed paths:
    engines/wintermute/detection_tables.h



diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index 2639084..d3284cd 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -49,6 +49,7 @@ static const PlainGameDescriptor wintermuteGames[] = {
 	{"reversion1",      "Reversion: The Escape"},
 	{"reversion2",      "Reversion: The Meeting"},
 	{"rosemary",        "Rosemary"},
+	{"shinestar",       "The Shine of a Star"},
 	{"thebox",          "The Box"},
 	{"tib",				"Fairy Tales About Toshechka and Boshechka"},
 	{"tradestory",		"The Trader of Stories"},
@@ -582,6 +583,16 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE,
 		GUIO0()
 	},
+	// The Shine of a Star
+	{
+		"shinestar",
+		"",
+		AD_ENTRY1s("data.dcp", "f05abe9e2427a5e4f73648fa09c4ba8e", 94113060),
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
 	// The Box
 	{
 		"thebox",


Commit: a34ed8f9a0b4e99ed37864bf94625011a10676da
    https://github.com/scummvm/scummvm/commit/a34ed8f9a0b4e99ed37864bf94625011a10676da
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-07-29T14:49:28-07:00

Commit Message:
WINTERMUTE: Align detection-entries properly with spaces.

Changed paths:
    engines/wintermute/detection_tables.h



diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index d3284cd..7df061c 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -42,7 +42,7 @@ static const PlainGameDescriptor wintermuteGames[] = {
 	{"dreamscape",      "Dreamscape"},
 	{"ghostsheet",      "Ghost in the Sheet"},
 	{"hamlet",          "Hamlet or the last game without MMORPS features, shaders and product placement"},
-	{"jamesperis",		"James Peris: No License Nor Control"},
+	{"jamesperis",      "James Peris: No License Nor Control"},
 	{"julia",           "J.U.L.I.A."},
 	{"mirage",          "Mirage"},
 	{"pigeons",         "Pigeons in the Park"},
@@ -51,8 +51,8 @@ static const PlainGameDescriptor wintermuteGames[] = {
 	{"rosemary",        "Rosemary"},
 	{"shinestar",       "The Shine of a Star"},
 	{"thebox",          "The Box"},
-	{"tib",				"Fairy Tales About Toshechka and Boshechka"},
-	{"tradestory",		"The Trader of Stories"},
+	{"tib",             "Fairy Tales About Toshechka and Boshechka"},
+	{"tradestory",      "The Trader of Stories"},
 	{"twc",             "the white chamber"},
 	{"wintermute",      "Wintermute engine game"},
 	{0, 0}






More information about the Scummvm-git-logs mailing list