From 919c0a2833273d3ae92d0eb3635a479c34e1ced9 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Thu, 22 Nov 2007 21:51:33 +0000
Subject: * added adapter from Graphics::Surface to Frames * changed all Disk
 routines to return Frames* instead of Graphics::Surface* * changed
 displayItemComment to use new gfx routines * merged code for Examine zones
 into displayComment

svn-id: r29615
---
 engines/parallaction/parallaction.h | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'engines/parallaction/parallaction.h')

diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index f6749d908f..521aa634b5 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -213,7 +213,7 @@ struct Character {
 
 
 	Animation		_ani;
-	Graphics::Surface		*_head;
+	Frames			*_head;
 	Frames		    *_talk;
 	Frames 			*_objs;
 	PathBuilder		_builder;
@@ -558,8 +558,7 @@ protected:		// members
 	void 		freeLocation();
 	void 		showLocationComment(const char *text, bool end);
 
-	void 		displayCharacterComment(ExamineData *data);
-	void 		displayItemComment(ExamineData *data);
+	void 		displayComment(ExamineData *data);
 
 	uint16 		checkDoor();
 
@@ -705,7 +704,7 @@ private:
 	void initCursors();
 
 	static byte			_mouseArrow[256];
-	Graphics::Surface			*_mouseComposedArrow;
+	Frames			*_mouseComposedArrow;
 
 	static const Callable _dosCallables[25];
 	static const Callable _amigaCallables[25];
@@ -1002,10 +1001,10 @@ private:
 	void setMousePointer(int16 index);
 	void initCursors();
 
-	Graphics::Surface 	*_dinoCursor;
-	Graphics::Surface 	*_dougCursor;
-	Graphics::Surface 	*_donnaCursor;
-	Graphics::Surface 	*_mouseArrow;
+	Frames 	*_dinoCursor;
+	Frames	*_dougCursor;
+	Frames	*_donnaCursor;
+	Frames 	*_mouseArrow;
 
 
 	int showMenu();
-- 
cgit v1.2.3