The only uses for StaticCnv::_data2 were by Get and Door zones, so a new field has been added to those structure and _data2 has been deleted. Some graphic routines has been renamed to better reflect this change, too.

svn-id: r26107

1 files changed, 6 insertions, 3 deletions

diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index f338c91ccf..a2e248af0b 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -61,6 +61,9 @@ extern byte _palette[];
 
 class Parallaction;
 
+struct DoorData;
+struct GetData;
+
 class Graphics {
 
 public:
@@ -90,9 +93,9 @@ public:
 	void makeCnvFromString(StaticCnv *cnv, char *text);
 	void freeCnv(Cnv *cnv);
 	void freeStaticCnv(StaticCnv *cnv);
-	void backupCnvBackground(StaticCnv *cnv, int16 x, int16 y);
-	void backupCnvBackgroundTransparent(StaticCnv *cnv, int16 x, int16 y);
-	void restoreCnvBackground(StaticCnv *cnv, int16 x, int16 y);
+	void backupDoorBackground(DoorData *data, int16 x, int16 y);
+	void backupGetBackground(GetData *data, int16 x, int16 y);
+	void restoreZoneBackground(byte *data, int16 x, int16 y, uint16 w, uint16 h);
 
 	// location
 	void setBackground(byte *background);