[Scummvm-cvs-logs] SF.net SVN: scummvm:[48384] scummvm/trunk/engines/teenagent/scene.cpp

[megath at users.sourceforge.net]

Revision: 48384
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48384&view=rev
Author:   megath
Date:     2010-03-24 19:48:32 +0000 (Wed, 24 Mar 2010)

Log Message:
-----------
fixed warning

Modified Paths:
--------------
    scummvm/trunk/engines/teenagent/scene.cpp

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2010-03-24 19:34:58 UTC (rev 48383)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2010-03-24 19:48:32 UTC (rev 48384)
@@ -1188,7 +1188,7 @@
 	return &scene_objects[id];
 }
 
-Common::Point Scene::messagePosition(const Common::String &str, Common::Point position) {
+Common::Point Scene::messagePosition(const Common::String &str, Common::Point message_position) {
 	Resources *res = Resources::instance();
 	int lines = 1;
 	for(uint i = 0; i < str.size(); ++i)
@@ -1198,19 +1198,19 @@
 	uint w = res->font7.render(NULL, 0, 0, str, 0);
 	uint h = res->font7.height * lines + 3;
 
-	position.x -= w / 2;
-	position.y -= h;
+	message_position.x -= w / 2;
+	message_position.y -= h;
 
-	if (position.x + w > 320)
-		position.x = 320 - w;
-	if (position.x < 0)
-		position.x = 0;
-	if (position.y + h > 320)
-		position.y = 200 - h;
-	if (position.y < 0)
-		position.y = 0;
+	if (message_position.x + w > 320)
+		message_position.x = 320 - w;
+	if (message_position.x < 0)
+		message_position.x = 0;
+	if (message_position.y + h > 320)
+		message_position.y = 200 - h;
+	if (message_position.y < 0)
+		message_position.y = 0;
 
-	return position;
+	return message_position;
 }
 
 uint Scene::messageDuration(const Common::String &str) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.