DM: Add support for drawing portions of bitmaps

Create Frame structure and drawFrame(..) convenience method, also
DisplayMan unpacks all the bitmaps with unpackGraphics()

1 files changed, 17 insertions, 3 deletions

diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h
index acdabfa77c..f52381e3a4 100644
--- a/engines/dm/gfx.h
+++ b/engines/dm/gfx.h
@@ -6,6 +6,8 @@
 
 namespace DM {
 
+struct Frame;
+
 enum dmPaletteEnum {
 	palSwoosh = 0,
 	palMousePointer = 1,
@@ -27,22 +29,34 @@ class DisplayMan {
 	uint16 _screenHeight;
 	byte *_vgaBuffer;
 	uint16 _itemCount;
-	uint32 *_indexBytePos;
-	uint8 *_compressedData;
+	// TODO: will probably be redundant
+	uint32 *_packedItemPos;
+	// TODO: will probably be reundant
+	byte *_packedBitmaps; // TODO: this doesn't not contaion graphics exclusively, will have to be moved
 	DisplayMan(const DisplayMan &other); // no implementation on purpose
 	void operator=(const DisplayMan &rhs); // no implementation on purpose
+
+
+	byte **_unpackedBitmaps;
+	void unpackGraphics();
+	void drawFrame(Frame &f);
 public:
 	DisplayMan(DMEngine *dmEngine);
 	~DisplayMan();
 	void setUpScreens(uint16 width, uint16 height);
 	void loadGraphics();
 	void loadPalette(dmPaletteEnum palette);
+	// TODO: will probably be redundant with public visibility
 	void loadIntoBitmap(uint16 index, byte *destBitmap);
 	uint16 getImageWidth(uint16 index);
 	uint16 getImageHeight(uint16 index);
-	void blitToScreen(byte *srcBitmap, uint16 srcWidth, uint16 srcHeight, uint16 destX, uint16 destY);
+	void DisplayMan::blitToBitmap(byte *srcBitmap, uint16 srcFromX, uint16 srcToX, uint16 srcFromY, uint16 srcToY,
+								  int16 srcWidth, uint16 destX, uint16 destY, byte *destBitmap, uint16 destWidth);
+	inline void DisplayMan::blitToScreen(byte *srcBitmap, uint16 srcFromX, uint16 srcToX, uint16 srcFromY, uint16 srcToY,
+								  int16 srcWidth, uint16 destX, uint16 destY);
 	byte *getCurrentVgaBuffer();
 	void updateScreen();
+	void drawDungeon();
 };
 
 }