ADL: Add byte-access functions to Display class

scummvm · Mar 5, 2017 · 494682d · 494682d
1 parent 33c8073
commit 494682d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/engines/adl/display.cpp b/engines/adl/display.cpp
@@ -241,6 +241,12 @@ void Display::putPixel(const Common::Point &p, byte color) {
 	writeFrameBuffer(p, color, mask);
 }
 
+void Display::setPixelByte(const Common::Point &p, byte color) {
+	assert(p.x >= 0 && p.x < DISPLAY_WIDTH && p.y >= 0 && p.y < DISPLAY_HEIGHT);
+
+	_frameBuf[p.y * DISPLAY_PITCH + p.x / 7] = color;
+}
+
 void Display::setPixelBit(const Common::Point &p, byte color) {
 	writeFrameBuffer(p, color, 1 << (p.x % 7));
 }
@@ -249,6 +255,12 @@ void Display::setPixelPalette(const Common::Point &p, byte color) {
 	writeFrameBuffer(p, color, 0x80);
 }
 
+byte Display::getPixelByte(const Common::Point &p) const {
+	assert(p.x >= 0 && p.x < DISPLAY_WIDTH && p.y >= 0 && p.y < DISPLAY_HEIGHT);
+
+	return _frameBuf[p.y * DISPLAY_PITCH + p.x / 7];
+}
+
 bool Display::getPixelBit(const Common::Point &p) const {
 	assert(p.x >= 0 && p.x < DISPLAY_WIDTH && p.y >= 0 && p.y < DISPLAY_HEIGHT);
 

diff --git a/engines/adl/display.h b/engines/adl/display.h
@@ -67,8 +67,10 @@ class Display {
 	static void loadFrameBuffer(Common::ReadStream &stream, byte *dst);
 	void loadFrameBuffer(Common::ReadStream &stream);
 	void putPixel(const Common::Point &p, byte color);
+	void setPixelByte(const Common::Point &p, byte color);
 	void setPixelBit(const Common::Point &p, byte color);
 	void setPixelPalette(const Common::Point &p, byte color);
+	byte getPixelByte(const Common::Point &p) const;
 	bool getPixelBit(const Common::Point &p) const;
 	void clear(byte color);