[Scummvm-cvs-logs] scummvm master -> 48dbcbe8a1c469e98b60221350b4caec623c4131

[dreammaster]

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

Summary:
48dbcbe8a1 TSAGE: Fixed warnings identified by Buildbot


Commit: 48dbcbe8a1c469e98b60221350b4caec623c4131
    https://github.com/scummvm/scummvm/commit/48dbcbe8a1c469e98b60221350b4caec623c4131
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-04-13T05:02:40-07:00

Commit Message:
TSAGE: Fixed warnings identified by Buildbot

Changed paths:
    engines/tsage/core.cpp
    engines/tsage/ringworld_scenes1.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 2f6ba42..8d332c4 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1734,7 +1734,7 @@ SceneObject::SceneObject(): SceneHotspot() {
 	_frameChange = 0;
 }
 
-SceneObject::SceneObject(const SceneObject &so) {
+SceneObject::SceneObject(const SceneObject &so): SceneHotspot() {
 	*this = so;
 	if (_objectWrapper)
 		// Create a fresh object wrapper for this object
diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index f847943..46fbe77 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -3226,7 +3226,7 @@ void Scene6100::dispatch() {
 
 	if (_action != &_action3) {
 		// Display the distance remaining to the target
-		int distance = _probe._floats.sqrt(_rocks._floats);
+		int distance = (int)_probe._floats.sqrt(_rocks._floats);
 		Common::String s = Common::String::format("%06d", distance);
 
 		_sceneText.setPosition(Common::Point(24, 160));