[Scummvm-cvs-logs] scummvm master -> 9075bd71cd2f306095a8be0ffb6e3521ba53b6be

clone2727 clone2727 at gmail.com
Sun Sep 28 21:42:47 CEST 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:
b2676c412d VIDEO: Fix seeking in AVI videos with no initial audio frames
cbfa8bfccd CGE2: Silence gcc warnings
8e0e03c8ba SAGA: Silence a gcc warning
9075bd71cd FULLPIPE: Silence a gcc warning


Commit: b2676c412dc79af6c9f8d2ff423fcc95421eff97
    https://github.com/scummvm/scummvm/commit/b2676c412dc79af6c9f8d2ff423fcc95421eff97
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-09-28T15:29:42-04:00

Commit Message:
VIDEO: Fix seeking in AVI videos with no initial audio frames

Changed paths:
    video/avi_decoder.cpp



diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index 39deaea..d9761e1 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -528,7 +528,10 @@ bool AVIDecoder::seekIntern(const Audio::Timestamp &time) {
 		// Recreate the audio stream
 		audioTrack->resetStream();
 
-		uint framesNeeded = _header.initialFrames;
+		uint framesNeeded = _header.initialFrames;	
+		if (framesNeeded == 0)
+			framesNeeded = 1;
+
 		uint startAudioChunk = 0;
 		int startAudioSearch = (lastRecord < 0) ? (frameIndex - 1) : (lastRecord - 1);
 


Commit: cbfa8bfccdf66229608387528360107ee34ab860
    https://github.com/scummvm/scummvm/commit/cbfa8bfccdf66229608387528360107ee34ab860
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-09-28T15:29:49-04:00

Commit Message:
CGE2: Silence gcc warnings

Changed paths:
    engines/cge2/hero.cpp
    engines/cge2/toolbar.cpp
    engines/cge2/vga13h.cpp



diff --git a/engines/cge2/hero.cpp b/engines/cge2/hero.cpp
index 86bd7ac..b5e8cac 100644
--- a/engines/cge2/hero.cpp
+++ b/engines/cge2/hero.cpp
@@ -120,7 +120,8 @@ Sprite *Hero::expand() {
 				break;
 			case kIdName:
 				Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
-				for (p = tmpStr; *p != '='; p++); // We search for the =
+				for (p = tmpStr; *p != '='; p++) // We search for the =
+					;
 				setName(_vm->tail(p));
 				break;
 			default:
@@ -201,7 +202,7 @@ Sprite *Hero::expand() {
 	delete[] text;
 
 	int i = stepSize() / 2;
-	_maxDist = sqrt(double(i * i * 2));
+	_maxDist = (int)sqrt(double(i * i * 2));
 	setCurrent();
 	
 	return this;
@@ -413,7 +414,7 @@ void Hero::fun() {
 }
 
 int Hero::len(V2D v) {
-	return sqrt(double(v.x * v.x + v.y * v.y));
+	return (int)sqrt(double(v.x * v.x + v.y * v.y));
 }
 
 bool Hero::findWay(){
diff --git a/engines/cge2/toolbar.cpp b/engines/cge2/toolbar.cpp
index 6af64b1..92f7387 100644
--- a/engines/cge2/toolbar.cpp
+++ b/engines/cge2/toolbar.cpp
@@ -120,7 +120,7 @@ void CGE2Engine::setVolume(int idx, int cnt) {
 		int p = _vol[idx]->_seqPtr + cnt;
 		if ((p >= 0) && (p < _vol[idx]->_seqCnt)) {
 			_vol[idx]->step(p);
-			int newVolume = p * kSoundStatetoNumRate;
+			int newVolume = (int)(p * kSoundStatetoNumRate);
 			switch (idx) {
 			case 0:
 				_oldSfxVolume = ConfMan.getInt("sfx_volume");
@@ -140,11 +140,11 @@ void CGE2Engine::setVolume(int idx, int cnt) {
 void CGE2Engine::checkVolumeSwitches() {
 	int musicVolume = ConfMan.getInt("music_volume");
 	if (musicVolume != _oldMusicVolume)
-		_vol[1]->step(musicVolume / kSoundNumtoStateRate);
+		_vol[1]->step((int)(musicVolume / kSoundNumtoStateRate));
 
 	int sfxVolume = ConfMan.getInt("sfx_volume");
 	if (sfxVolume != _oldSfxVolume)
-		_vol[0]->step(sfxVolume / kSoundNumtoStateRate);
+		_vol[0]->step((int)(sfxVolume / kSoundNumtoStateRate));
 }
 
 void CGE2Engine::switchCap() {
@@ -208,7 +208,7 @@ void CGE2Engine::initToolbar() {
 
 void CGE2Engine::initVolumeSwitch(Sprite *volSwitch, int val) {
 	int state = 0;
-	state = val / kSoundNumtoStateRate;
+	state = (int)(val / kSoundNumtoStateRate);
 	volSwitch->step(state);
 }
 
diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp
index db96682..2276335 100644
--- a/engines/cge2/vga13h.cpp
+++ b/engines/cge2/vga13h.cpp
@@ -371,7 +371,8 @@ Sprite *Sprite::expand() {
 				break;
 			case kIdName:
 				Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
-				for (p = tmpStr; *p != '='; p++); // We search for the =
+				for (p = tmpStr; *p != '='; p++) // We search for the =
+					;
 				setName(_vm->tail(p));
 				break;
 			default:


Commit: 8e0e03c8ba15894fb048bdd66352fd8cf0a3746e
    https://github.com/scummvm/scummvm/commit/8e0e03c8ba15894fb048bdd66352fd8cf0a3746e
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-09-28T15:29:49-04:00

Commit Message:
SAGA: Silence a gcc warning

Changed paths:
    engines/saga/shorten.cpp



diff --git a/engines/saga/shorten.cpp b/engines/saga/shorten.cpp
index edb12a3..1e1c397 100644
--- a/engines/saga/shorten.cpp
+++ b/engines/saga/shorten.cpp
@@ -438,7 +438,7 @@ byte *loadShortenFromStream(Common::ReadStream &stream, int &size, int &rate, by
 				for (i = 0; i < 64; ++i)
 					oldValues[curChannel][i] = 0;
 
-				int arrayTerminator = MIN<int>(64, blockSize);
+				uint arrayTerminator = MIN<int>(64, blockSize);
 				for (i = 0; i < arrayTerminator; ++i)
 					oldValues[curChannel][i] = buffer[curChannel][blockSize - (i + 1)];
 


Commit: 9075bd71cd2f306095a8be0ffb6e3521ba53b6be
    https://github.com/scummvm/scummvm/commit/9075bd71cd2f306095a8be0ffb6e3521ba53b6be
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-09-28T15:29:49-04:00

Commit Message:
FULLPIPE: Silence a gcc warning

Changed paths:
    engines/fullpipe/scenes/scene27.cpp



diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp
index 1431cef..8ec05ca 100644
--- a/engines/fullpipe/scenes/scene27.cpp
+++ b/engines/fullpipe/scenes/scene27.cpp
@@ -340,7 +340,7 @@ void sceneHandler27_wipeDo() {
 bool sceneHandler27_batFallLogic(uint batn) {
 	Bat *bat = g_vars->scene27_bats[batn];
 
-	int y = (bat->currY - 458.0) * 0.4848484848484849 + 734.0;
+	int y = (int)((bat->currY - 458.0) * 0.4848484848484849 + 734.0);
 
 	if (y >= bat->currX)
 		return false;






More information about the Scummvm-git-logs mailing list