[Scummvm-cvs-logs] scummvm master -> 6b614f8ff508449fd5db3af5dcd5b689d69718b0

[somaen]

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:
fcc33c22d8 WINTERMUTE: Force the screen to black after loading/saving.
6b614f8ff5 WINTERMUTE: Avoid using ldepxf/frexpf


Commit: fcc33c22d869f7015cbac8d2e794040cae73e9ba
    https://github.com/scummvm/scummvm/commit/fcc33c22d869f7015cbac8d2e794040cae73e9ba
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-31T15:48:30-08:00

Commit Message:
WINTERMUTE: Force the screen to black after loading/saving.

Changed paths:
    engines/wintermute/base/gfx/osystem/base_render_osystem.cpp



diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index cec5945..061f527 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -650,6 +650,10 @@ void BaseRenderOSystem::endSaveLoad() {
 	// so just skip this single frame.
 	_skipThisFrame = true;
 	_drawNum = 1;
+
+	_renderSurface->fillRect(Common::Rect(0, 0, _renderSurface->h, _renderSurface->w), _renderSurface->format.ARGBToColor(255, 0, 0, 0));
+	g_system->copyRectToScreen((byte *)_renderSurface->pixels, _renderSurface->pitch, 0, 0, _renderSurface->w, _renderSurface->h);
+	g_system->updateScreen();
 }
 
 bool BaseRenderOSystem::startSpriteBatch() {


Commit: 6b614f8ff508449fd5db3af5dcd5b689d69718b0
    https://github.com/scummvm/scummvm/commit/6b614f8ff508449fd5db3af5dcd5b689d69718b0
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-31T15:48:47-08:00

Commit Message:
WINTERMUTE: Avoid using ldepxf/frexpf

Changed paths:
    engines/wintermute/base/base_persistence_manager.cpp



diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index 86b65fb..84a1c2e 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -502,7 +502,7 @@ bool BasePersistenceManager::putTimeDate(const TimeDate &t) {
 	_saveStream->writeSint32LE(t.tm_mday);
 	_saveStream->writeSint32LE(t.tm_mon);
 	_saveStream->writeSint32LE(t.tm_year);
-	_saveStream->writeSint32LE(t.tm_wday); //TODO: Add this in when merging next
+	_saveStream->writeSint32LE(t.tm_wday);
 
 	if (_saveStream->err()) {
 		return STATUS_FAILED;
@@ -518,13 +518,13 @@ TimeDate BasePersistenceManager::getTimeDate() {
 	t.tm_mday = _loadStream->readSint32LE();
 	t.tm_mon = _loadStream->readSint32LE();
 	t.tm_year = _loadStream->readSint32LE();
-	t.tm_wday = _loadStream->readSint32LE(); //TODO: Add this in when merging next
+	t.tm_wday = _loadStream->readSint32LE();
 	return t;
 }
 
 void BasePersistenceManager::putFloat(float val) {
 	int32 exponent = 0;
-	float significand = frexpf(val, &exponent);
+	float significand = frexp(val, &exponent);
 	Common::String str = Common::String::format("FS%f", significand);
 	_saveStream->writeUint32LE(str.size());
 	_saveStream->writeString(str);
@@ -537,7 +537,7 @@ float BasePersistenceManager::getFloat() {
 	float significand = 0.0f;
 	int32 exponent = _loadStream->readSint32LE();
 	int ret = sscanf(str, "FS%f", &significand);
-	value = ldexpf(significand, exponent);
+	value = ldexp(significand, exponent);
 	if (ret != 1) {
 		warning("%s not parsed as float", str);
 	}