1 files changed, 8 insertions, 41 deletions

diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index ed69e9260e..bf23747daf 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -36,7 +36,11 @@ namespace Kyra {
 typedef Common::Functor0<void> UpdateFunctor;
 
 class KyraEngine;
-struct Rect;
+
+struct Rect {
+	int x, y;
+	int x2, y2;
+};
 
 struct ScreenDim {
 	uint16 sx;
@@ -59,9 +63,7 @@ struct Font {
 };
 
 class Screen {
-	friend class Debugger_v1;
 public:
-
 	enum {
 		SCREEN_W = 320,
 		SCREEN_H = 200,
@@ -97,7 +99,10 @@ public:
 	Screen(KyraEngine *vm, OSystem *system);
 	virtual ~Screen();
 
+	// init
 	virtual bool init();
+	virtual void setResolution();
+
 
 	void updateScreen();
 
@@ -349,48 +354,10 @@ protected:
 	int _drawShapeVar4;
 	int _drawShapeVar5;
 
-	// init
-	virtual void setResolution();
-
 	// debug
 	bool _debugEnabled;
 };
 
-class ScreenEx : public Screen {
-public:
-	ScreenEx(KyraEngine *vm, OSystem *system) : Screen(vm, system) {}
-
-	// screen page handling
-	void copyWsaRect(int x, int y, int w, int h, int dimState, int plotFunc, const uint8 *src,
-					int unk1, const uint8 *unkPtr1, const uint8 *unkPtr2);
-
-	// palette handling
-	uint8 *generateOverlay(const uint8 *palette, uint8 *buffer, int color, uint16 factor);
-	void applyOverlay(int x, int y, int w, int h, int pageNum, const uint8 *overlay);
-	int findLeastDifferentColor(const uint8 *paletteEntry, const uint8 *palette, uint16 numColors);
-
-	// shape handling
-	uint8 *getPtrToShape(uint8 *shpFile, int shape);
-	const uint8 *getPtrToShape(const uint8 *shpFile, int shape);
-
-	int getShapeScaledWidth(const uint8 *shpFile, int scale);
-	int getShapeScaledHeight(const uint8 *shpFile, int scale);
-
-	uint16 getShapeSize(const uint8 *shp);
-
-	uint8 *makeShapeCopy(const uint8 *src, int index);
-
-	// rect handling
-	int getRectSize(int w, int h);
-
-	// text display
-	void setTextColorMap(const uint8 *cmap);
-
-	// layer handling
-	virtual int getLayer(int x, int y);
-protected:
-};
-
 } // End of namespace Kyra
 
 #endif