diff options
| author | Max Horn | 2009-01-07 23:30:31 +0000 |
|---|---|---|
| committer | Max Horn | 2009-01-07 23:30:31 +0000 |
| commit | e955e0b4c4ad168d54f9ae16c86ac50640b3c8b3 (patch) | |
| tree | 32444503340ddd669179858ed8d8b8f7d4fd9ae5 | |
| parent | 1f63a1dfcd69af0db9ba039b9c316541180a7795 (diff) | |
| download | scummvm-rg350-e955e0b4c4ad168d54f9ae16c86ac50640b3c8b3.tar.gz scummvm-rg350-e955e0b4c4ad168d54f9ae16c86ac50640b3c8b3.tar.bz2 scummvm-rg350-e955e0b4c4ad168d54f9ae16c86ac50640b3c8b3.zip | |
Fixed warnings
svn-id: r35780
| -rw-r--r-- | engines/parallaction/graphics.cpp | 4 | ||||
| -rw-r--r-- | engines/parallaction/graphics.h | 2 | ||||
| -rw-r--r-- | engines/parallaction/parallaction.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp index bab7ed0605..8dd8a04219 100644 --- a/engines/parallaction/graphics.cpp +++ b/engines/parallaction/graphics.cpp @@ -385,7 +385,7 @@ void Gfx::updateScreen() { 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 @@ void Gfx::setBackground(uint type, BackgroundInfo *info) { } -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)); } diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h index 88c43ee4c5..69e048ff15 100644 --- a/engines/parallaction/graphics.h +++ b/engines/parallaction/graphics.h @@ -356,7 +356,7 @@ protected: 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; diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index d6bb2582f4..0b1ac96fa1 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -292,8 +292,8 @@ void Parallaction::showSlide(const char *name, int x, int y) { 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); } |