[Scummvm-cvs-logs] scummvm master -> 379aadb851f36594d46db46f8715bffa5d62c983

clone2727 clone2727 at gmail.com
Sun Jun 1 23:34:03 CEST 2014


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:
a83ce70467 SCI: Silence a gcc conversion warning
d5b5d4b545 BBVS: Silence gcc conversion warnings
379aadb851 MADS: Silence gcc conversion warnings


Commit: a83ce70467bf25ebb9637ae80f134bdb9c0733bb
    https://github.com/scummvm/scummvm/commit/a83ce70467bf25ebb9637ae80f134bdb9c0733bb
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-06-01T17:28:34-04:00

Commit Message:
SCI: Silence a gcc conversion warning

Changed paths:
    engines/sci/sound/soundcmd.cpp



diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 2bd7f50..73e0a23 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -61,7 +61,7 @@ reg_t SoundCommandParser::kDoSoundInit(int argc, reg_t *argv, reg_t acc) {
 }
 
 int SoundCommandParser::getSoundResourceId(reg_t obj) {
-	int resourceId = obj.getSegment() ? readSelectorValue(_segMan, obj, SELECTOR(number)) : -1;
+	int resourceId = obj.getSegment() ? (int)readSelectorValue(_segMan, obj, SELECTOR(number)) : -1;
 	// Modify the resourceId for the Windows versions that have an alternate MIDI soundtrack, like SSCI did.
 	if (g_sci && g_sci->_features->useAltWinGMSound()) {
 		// Check if the alternate MIDI song actually exists...


Commit: d5b5d4b5454d52de32f9e1fecf6e3fa47aa798c0
    https://github.com/scummvm/scummvm/commit/d5b5d4b5454d52de32f9e1fecf6e3fa47aa798c0
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-06-01T17:28:34-04:00

Commit Message:
BBVS: Silence gcc conversion warnings

Changed paths:
    engines/bbvs/minigames/bbtennis.cpp
    engines/bbvs/walk.cpp



diff --git a/engines/bbvs/minigames/bbtennis.cpp b/engines/bbvs/minigames/bbtennis.cpp
index 926642c..6f680d0 100644
--- a/engines/bbvs/minigames/bbtennis.cpp
+++ b/engines/bbvs/minigames/bbtennis.cpp
@@ -594,9 +594,9 @@ void MinigameBbTennis::updateTennisBall(int objIndex) {
 	}
 
 	obj->fltX = obj->fltX - obj->fltStepX;
-	obj->x = obj->fltX;
+	obj->x = (int)obj->fltX;
 	obj->fltY = obj->fltY - obj->fltStepY;
-	obj->y = obj->fltY;
+	obj->y = (int)obj->fltY;
 
 }
 
@@ -1100,9 +1100,9 @@ void MinigameBbTennis::updateEnemyTennisBall(int objIndex) {
 	}
 
 	obj->fltX = obj->fltX - obj->fltStepX;
-	obj->x = obj->fltX;
+	obj->x = (int)obj->fltX;
 	obj->fltY = obj->fltY - obj->fltStepY;
-	obj->y = obj->fltY;
+	obj->y = (int)obj->fltY;
 	
 }
 
diff --git a/engines/bbvs/walk.cpp b/engines/bbvs/walk.cpp
index cf8942e..4d71d95 100644
--- a/engines/bbvs/walk.cpp
+++ b/engines/bbvs/walk.cpp
@@ -112,9 +112,9 @@ void BbvsEngine::walkObject(SceneObject *sceneObject, const Common::Point &destP
 	float distance = sqrt((double)(deltaX * deltaX + deltaY * deltaY));
 	// NOTE The original doesn't have this check but without it the whole pathfinding breaks
 	if (distance > 0.0) {
-		sceneObject->walkCount = distance / ((((float)ABS(deltaX) / distance) + 1.0) * ((float)walkSpeed / 120));
-		sceneObject->xIncr = ((float)deltaX / sceneObject->walkCount) * 65536.0;
-		sceneObject->yIncr = ((float)deltaY / sceneObject->walkCount) * 65536.0;
+		sceneObject->walkCount = (int)(distance / ((((float)ABS(deltaX) / distance) + 1.0) * ((float)walkSpeed / 120)));
+		sceneObject->xIncr = (int)(((float)deltaX / sceneObject->walkCount) * 65536.0);
+		sceneObject->yIncr = (int)(((float)deltaY / sceneObject->walkCount) * 65536.0);
 		sceneObject->x = (sceneObject->x & 0xFFFF0000) | 0x8000;
 		sceneObject->y = (sceneObject->y & 0xFFFF0000) | 0x8000;
 	} else


Commit: 379aadb851f36594d46db46f8715bffa5d62c983
    https://github.com/scummvm/scummvm/commit/379aadb851f36594d46db46f8715bffa5d62c983
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-06-01T17:28:34-04:00

Commit Message:
MADS: Silence gcc conversion warnings

Changed paths:
    engines/mads/player.cpp
    engines/mads/rails.cpp



diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index a78d35d..bde313a 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -648,7 +648,7 @@ void Player::startMovement() {
 		break;
 	}
 
-	_totalDistance = sqrt((double)(xAmt100 * xAmt100 + yAmt100 * yAmt100));
+	_totalDistance = (int)sqrt((double)(xAmt100 * xAmt100 + yAmt100 * yAmt100));
 	_posDiff.x = xDiff + 1;
 	_posDiff.y = yDiff + 1;
 	_posChange.x = xDiff;
diff --git a/engines/mads/rails.cpp b/engines/mads/rails.cpp
index 7f8a56d..322e6e7 100644
--- a/engines/mads/rails.cpp
+++ b/engines/mads/rails.cpp
@@ -201,7 +201,7 @@ void Rails::setNodePosition(int nodeIndex, const Common::Point &pt) {
 
 			int xDiff = ABS(_nodes[idx]._walkPos.x - pt.x);
 			int yDiff = ABS(_nodes[idx]._walkPos.y - pt.y);
-			hypotenuse = sqrt((double)(xDiff * xDiff + yDiff * yDiff));
+			hypotenuse = (int)sqrt((double)(xDiff * xDiff + yDiff * yDiff));
 
 			if (hypotenuse >= 0x3FFF)
 				// Shouldn't ever be this large






More information about the Scummvm-git-logs mailing list