- makes Screen::getPagePtr private

- introduces Screen::getCPagePtr and Screen::getPageRect (which should ease the introduction of dirty rect handling)
- moves KyraEngine::loadBitmap to Screen

svn-id: r22716

1 files changed, 7 insertions, 1 deletions

diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index 0b6426847c..2c7140a0e1 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -92,7 +92,8 @@ public:
 	bool init();
 
 	void updateScreen();
-	uint8 *getPagePtr(int pageNum);
+	const uint8 *getCPagePtr(int pageNum) const;
+	uint8 *getPageRect(int pageNum, int x, int y, int w, int h);
 	void clearPage(int pageNum);
 	int setCurPage(int pageNum);
 	void clearCurPage();
@@ -135,6 +136,9 @@ public:
 	static void decodeFrameDeltaPage(uint8 *dst, const uint8 *src, int pitch, int noXor);
 	uint8 *encodeShape(int x, int y, int w, int h, int flags);
 	void copyRegionToBuffer(int pageNum, int x, int y, int w, int h, uint8 *dest);
+	void loadBitmap(const char *filename, int tempPage, int dstPage, uint8 *palData);
+
+	uint8 *getMaskBuffer() { return getPagePtr(5); }
 
 	void shakeScreen(int times);
 
@@ -186,6 +190,8 @@ public:
 	static const ScreenDim _screenDimTableK3[];
 	static const int _screenDimTableCountK3;
 private:
+	uint8 *getPagePtr(int pageNum);
+
 	int16 encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size);
 	void restoreMouseRect();
 	void copyMouseToScreen();