[Scummvm-cvs-logs] SF.net SVN: scummvm:[35780] scummvm/trunk/engines/parallaction

[fingolfin at users.sourceforge.net]

Revision: 35780
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35780&view=rev
Author:   fingolfin
Date:     2009-01-07 23:30:31 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
Fixed warnings

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/graphics.cpp
    scummvm/trunk/engines/parallaction/graphics.h
    scummvm/trunk/engines/parallaction/parallaction.cpp

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2009-01-07 23:05:28 UTC (rev 35779)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2009-01-07 23:30:31 UTC (rev 35780)
@@ -385,7 +385,7 @@
 		uint h = _backgroundInfo->height;
 		byte *backgroundData = (byte*)_backgroundInfo->bg.getBasePtr(0, 0);
 		uint16 backgroundPitch = _backgroundInfo->bg.pitch;
-		copyRectToScreen(backgroundData, backgroundPitch, _backgroundInfo->x, _backgroundInfo->y, w, h);
+		copyRectToScreen(backgroundData, backgroundPitch, _backgroundInfo->_x, _backgroundInfo->_y, w, h);
 	}
 /*
 	if (_varDrawPathZones == 1) {
@@ -823,7 +823,7 @@
 }
 
 
-BackgroundInfo::BackgroundInfo() : x(0), y(0), width(0), height(0), _mask(0), _path(0) {
+BackgroundInfo::BackgroundInfo() : _x(0), _y(0), width(0), height(0), _mask(0), _path(0) {
 	layers[0] = layers[1] = layers[2] = layers[3] = 0;
 	memset(ranges, 0, sizeof(ranges));
 }

Modified: scummvm/trunk/engines/parallaction/graphics.h
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.h	2009-01-07 23:05:28 UTC (rev 35779)
+++ scummvm/trunk/engines/parallaction/graphics.h	2009-01-07 23:30:31 UTC (rev 35780)
@@ -356,7 +356,7 @@
 	void clearPathData();
 
 public:
-	int x, y;		// used to display bitmaps smaller than the screen
+	int _x, _y;		// used to display bitmaps smaller than the screen
 	int width;
 	int height;
 

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2009-01-07 23:05:28 UTC (rev 35779)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2009-01-07 23:30:31 UTC (rev 35780)
@@ -292,8 +292,8 @@
 	BackgroundInfo *info = new BackgroundInfo;
 	_disk->loadSlide(*info, name);
 
-	info->x = (x == CENTER_LABEL_HORIZONTAL) ? ((_screenWidth - info->width) >> 1) : x;
-	info->y = (y == CENTER_LABEL_VERTICAL) ? ((_screenHeight - info->height) >> 1) : y;
+	info->_x = (x == CENTER_LABEL_HORIZONTAL) ? ((_screenWidth - info->width) >> 1) : x;
+	info->_y = (y == CENTER_LABEL_VERTICAL) ? ((_screenHeight - info->height) >> 1) : y;
 
 	_gfx->setBackground(kBackgroundSlide, info);
 }


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