[Scummvm-cvs-logs] scummvm master -> 7976a34bbfbece2686712d80b1efa3612cb2b441

bluegr bluegr at gmail.com
Tue Dec 2 23:56:21 CET 2014


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

Summary:
11d41ace02 ZVISION: Use the ScummVM defined type int32, instead of int32_t
61f654e4ee ZVISION: Explicitly define which version of atan2() to use
daeb1ea288 ZVISION: Silence some false positive warnings by MSVC
7976a34bbf ZVISION: Rename struct member to fix compilation with MSVC


Commit: 11d41ace02ce84ab40de2ae315a106950579e2bd
    https://github.com/scummvm/scummvm/commit/11d41ace02ce84ab40de2ae315a106950579e2bd
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-03T00:52:11+02:00

Commit Message:
ZVISION: Use the ScummVM defined type int32, instead of int32_t

Changed paths:
    engines/zvision/text/text.cpp



diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 872d687..3cfc5b2 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -457,7 +457,7 @@ void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 			j++;
 		}
 		dx = 0;
-		for (int32_t jj = 0; jj < j; jj++) {
+		for (int32 jj = 0; jj < j; jj++) {
 			if (TxtJustify[i] == TXT_JUSTIFY_LEFT)
 				_engine->getRenderManager()->blitSurfaceToSurface(*TxtSurfaces[i][jj], dst, dx, dy + TxtPoint[i] - TxtSurfaces[i][jj]->h, 0);
 
@@ -474,7 +474,7 @@ void TextRenderer::drawTxtInOneLine(const Common::String &text, Graphics::Surfac
 	}
 
 	for (i = 0; i < TXT_CFG_TEXTURES_LINES; i++)
-		for (int32_t j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
+		for (int32 j = 0; j < TXT_CFG_TEXTURES_PER_LINE; j++)
 			if (TxtSurfaces[i][j] != NULL) {
 				TxtSurfaces[i][j]->free();
 				delete TxtSurfaces[i][j];


Commit: 61f654e4eee90d761c06583a67dc9631db9d0d29
    https://github.com/scummvm/scummvm/commit/61f654e4eee90d761c06583a67dc9631db9d0d29
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-03T00:53:36+02:00

Commit Message:
ZVISION: Explicitly define which version of atan2() to use

This is needed by MSVC

Changed paths:
    engines/zvision/graphics/render_table.cpp
    engines/zvision/scripting/controls/safe_control.cpp



diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index 629cbde..5500b50 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -200,7 +200,7 @@ void RenderTable::generateTiltLookupTable() {
 
 	float fovInRadians = (_tiltOptions.fieldOfView * M_PI / 180.0f);
 	float cylinderRadius = halfWidth / tan(fovInRadians);
-	_tiltOptions.gap = cylinderRadius * atan2(halfHeight / cylinderRadius, 1.0) * _tiltOptions.linearScale;
+	_tiltOptions.gap = cylinderRadius * atan2((float)(halfHeight / cylinderRadius), 1.0f) * _tiltOptions.linearScale;
 
 	for (uint y = 0; y < _numRows; ++y) {
 
diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp
index de1ece5..66ab530 100644
--- a/engines/zvision/scripting/controls/safe_control.cpp
+++ b/engines/zvision/scripting/controls/safe_control.cpp
@@ -181,7 +181,7 @@ bool SafeControl::onMouseUp(const Common::Point &screenSpacePos, const Common::P
 
 			Common::Point tmp = backgroundImageSpacePos - _center;
 
-			float dd = atan2(tmp.x, tmp.y) * 57.29578;
+			float dd = atan2((float)tmp.x, (float)tmp.y) * 57.29578;
 
 			int16 dp_state = 360 / _statesCount;
 


Commit: daeb1ea288ee8ae9742f0a0fa41aeaea8c41bc9e
    https://github.com/scummvm/scummvm/commit/daeb1ea288ee8ae9742f0a0fa41aeaea8c41bc9e
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-03T00:54:19+02:00

Commit Message:
ZVISION: Silence some false positive warnings by MSVC

Changed paths:
    engines/zvision/scripting/sidefx/music_node.cpp
    engines/zvision/scripting/sidefx/syncsound_node.cpp
    engines/zvision/sound/zork_raw.cpp



diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index e9baadb..b1e16e7 100644
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -49,7 +49,7 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
 	_pantrackPosition = 0;
 	_sub = NULL;
 
-	Audio::RewindableAudioStream *audioStream;
+	Audio::RewindableAudioStream *audioStream = NULL;
 
 	if (filename.contains(".wav")) {
 		Common::File *file = new Common::File();
diff --git a/engines/zvision/scripting/sidefx/syncsound_node.cpp b/engines/zvision/scripting/sidefx/syncsound_node.cpp
index 2bfdc34..3954267 100644
--- a/engines/zvision/scripting/sidefx/syncsound_node.cpp
+++ b/engines/zvision/scripting/sidefx/syncsound_node.cpp
@@ -41,7 +41,7 @@ SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filena
 	_syncto = syncto;
 	_sub = NULL;
 
-	Audio::RewindableAudioStream *audioStream;
+	Audio::RewindableAudioStream *audioStream = NULL;
 
 	if (filename.contains(".wav")) {
 		Common::File *file = new Common::File();
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index a0f660f..1581210 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -259,7 +259,7 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
 	Common::String fileName = getFileName(filePath);
 	fileName.toLowercase();
 
-	SoundParams soundParams;
+	SoundParams soundParams = {};
 
 	if (engine->getGameId() == GID_NEMESIS) {
 		for (int i = 0; i < 32; ++i) {


Commit: 7976a34bbfbece2686712d80b1efa3612cb2b441
    https://github.com/scummvm/scummvm/commit/7976a34bbfbece2686712d80b1efa3612cb2b441
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-03T00:55:14+02:00

Commit Message:
ZVISION: Rename struct member to fix compilation with MSVC

A struct member can't have the same name as the struct itself

Changed paths:
    engines/zvision/subtitles/subtitles.cpp
    engines/zvision/subtitles/subtitles.h



diff --git a/engines/zvision/subtitles/subtitles.cpp b/engines/zvision/subtitles/subtitles.cpp
index 1f68b24..d36eb24 100644
--- a/engines/zvision/subtitles/subtitles.cpp
+++ b/engines/zvision/subtitles/subtitles.cpp
@@ -55,7 +55,7 @@ Subtitle::Subtitle(ZVision *engine, const Common::String &subname) :
 						sub curSubtitle;
 						curSubtitle.start = -1;
 						curSubtitle.stop = -1;
-						curSubtitle.sub = txtline;
+						curSubtitle.subStr = txtline;
 
 						_subs.push_back(curSubtitle);
 					}
@@ -98,9 +98,9 @@ void Subtitle::process(int32 time) {
 	}
 
 	if (j != -1 && j != _subId) {
-		if (_subs[j].sub.size())
+		if (_subs[j].subStr.size())
 			if (_areaId != -1)
-				_engine->getRenderManager()->updateSubArea(_areaId, _subs[j].sub);
+				_engine->getRenderManager()->updateSubArea(_areaId, _subs[j].subStr);
 		_subId = j;
 	}
 }
diff --git a/engines/zvision/subtitles/subtitles.h b/engines/zvision/subtitles/subtitles.h
index 09e079b..c3da658 100644
--- a/engines/zvision/subtitles/subtitles.h
+++ b/engines/zvision/subtitles/subtitles.h
@@ -43,7 +43,7 @@ private:
 	struct sub {
 		int start;
 		int stop;
-		Common::String sub;
+		Common::String subStr;
 	};
 
 	Common::Array<sub> _subs;






More information about the Scummvm-git-logs mailing list