aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorWalter van Niftrik2016-03-26 20:16:03 +0100
committerWalter van Niftrik2016-06-06 20:35:49 +0200
commit53e7ecb79c8926481bf916b16af6b6e0a88f7b7b (patch)
tree383bb42b8979efa03abc3c255b41972dd1779d71 /engines
parent42c41b449587f388796fe6a95a1a68027da629f9 (diff)
downloadscummvm-rg350-53e7ecb79c8926481bf916b16af6b6e0a88f7b7b.tar.gz
scummvm-rg350-53e7ecb79c8926481bf916b16af6b6e0a88f7b7b.tar.bz2
scummvm-rg350-53e7ecb79c8926481bf916b16af6b6e0a88f7b7b.zip
ADL: Remove unused DrawPic color parameter
Diffstat (limited to 'engines')
-rw-r--r--engines/adl/graphics.h6
-rw-r--r--engines/adl/graphics_v1.cpp2
-rw-r--r--engines/adl/graphics_v2.cpp4
-rw-r--r--engines/adl/hires1.cpp2
-rw-r--r--engines/adl/hires2.cpp6
5 files changed, 10 insertions, 10 deletions
diff --git a/engines/adl/graphics.h b/engines/adl/graphics.h
index 95f4159a68..b422959dbd 100644
--- a/engines/adl/graphics.h
+++ b/engines/adl/graphics.h
@@ -35,7 +35,7 @@ class Display;
class GraphicsMan {
public:
virtual ~GraphicsMan() { }
- virtual void drawPic(Common::SeekableReadStream &pic, const Common::Point &pos, byte color) = 0;
+ virtual void drawPic(Common::SeekableReadStream &pic, const Common::Point &pos) = 0;
protected:
GraphicsMan(Display &display) : _display(display) { }
@@ -47,7 +47,7 @@ protected:
class Graphics_v1 : public GraphicsMan {
public:
Graphics_v1(Display &display) : GraphicsMan(display) { }
- void drawPic(Common::SeekableReadStream &pic, const Common::Point &pos, byte color);
+ void drawPic(Common::SeekableReadStream &pic, const Common::Point &pos);
void drawCorners(Common::ReadStream &corners, const Common::Point &pos, byte rotation = 0, byte scaling = 1, byte color = 0x7f) const;
private:
@@ -57,7 +57,7 @@ private:
class Graphics_v2 : public GraphicsMan {
public:
Graphics_v2(Display &display) : GraphicsMan(display), _color(0) { }
- void drawPic(Common::SeekableReadStream &pic, const Common::Point &pos, byte color);
+ void drawPic(Common::SeekableReadStream &pic, const Common::Point &pos);
private:
void clear();
diff --git a/engines/adl/graphics_v1.cpp b/engines/adl/graphics_v1.cpp
index edf16b8be4..29c5ef47af 100644
--- a/engines/adl/graphics_v1.cpp
+++ b/engines/adl/graphics_v1.cpp
@@ -29,7 +29,7 @@
namespace Adl {
-void Graphics_v1::drawPic(Common::SeekableReadStream &pic, const Common::Point &pos, byte color) {
+void Graphics_v1::drawPic(Common::SeekableReadStream &pic, const Common::Point &pos) {
byte x, y;
bool bNewLine = false;
byte oldX = 0, oldY = 0;
diff --git a/engines/adl/graphics_v2.cpp b/engines/adl/graphics_v2.cpp
index 7da4eedc64..40936f5b7d 100644
--- a/engines/adl/graphics_v2.cpp
+++ b/engines/adl/graphics_v2.cpp
@@ -240,8 +240,8 @@ void Graphics_v2::fill(Common::SeekableReadStream &pic) {
}
}
-void Graphics_v2::drawPic(Common::SeekableReadStream &pic, const Common::Point &pos, byte color) {
- _color = color;
+void Graphics_v2::drawPic(Common::SeekableReadStream &pic, const Common::Point &pos) {
+ _color = 0;
_offset = pos;
while (true) {
diff --git a/engines/adl/hires1.cpp b/engines/adl/hires1.cpp
index 4161bfed05..c1a43b8c0d 100644
--- a/engines/adl/hires1.cpp
+++ b/engines/adl/hires1.cpp
@@ -263,7 +263,7 @@ void HiRes1Engine::restartGame() {
}
void HiRes1Engine::drawPic(byte pic, Common::Point pos) const {
- _graphics->drawPic(*_pictures[pic]->createReadStream(), pos, 0x7f);
+ _graphics->drawPic(*_pictures[pic]->createReadStream(), pos);
}
void HiRes1Engine::printString(const Common::String &str) {
diff --git a/engines/adl/hires2.cpp b/engines/adl/hires2.cpp
index 1e06135278..c33857a317 100644
--- a/engines/adl/hires2.cpp
+++ b/engines/adl/hires2.cpp
@@ -196,15 +196,15 @@ void HiRes2Engine::restartGame() {
void HiRes2Engine::drawPic(byte pic, Common::Point pos) const {
if (_roomData.pictures.contains(pic))
- _graphics->drawPic(*_roomData.pictures[pic]->createReadStream(), pos, 0);
+ _graphics->drawPic(*_roomData.pictures[pic]->createReadStream(), pos);
else
- _graphics->drawPic(*_pictures[pic]->createReadStream(), pos, 0);
+ _graphics->drawPic(*_pictures[pic]->createReadStream(), pos);
}
void HiRes2Engine::drawItem(const Item &item, const Common::Point &pos) const {
StreamPtr stream(_itemPics[item.picture - 1]->createReadStream());
stream->readByte(); // Skip clear opcode
- _graphics->drawPic(*stream, pos, 0);
+ _graphics->drawPic(*stream, pos);
}
void HiRes2Engine::loadRoom(byte roomNr) {