From 13059906c5f68bebb6344cf5617dc62243d146cf Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 12 Aug 2013 12:32:49 +0300
Subject: FULLPIPE: Rename base class variables to avoid ambigiuity

---
 engines/fullpipe/utils.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'engines/fullpipe/utils.h')

diff --git a/engines/fullpipe/utils.h b/engines/fullpipe/utils.h
index 00ae76eac7..cfe9d93a74 100644
--- a/engines/fullpipe/utils.h
+++ b/engines/fullpipe/utils.h
@@ -83,16 +83,16 @@ class MemoryObject : CObject {
 
  protected:
 	char *_memfilename;
-	int _field_8;
-	int _field_C;
-	int _field_10;
-	char _field_14;
-	char _field_15;
-	char _field_16;
-	char _field_17;
+	int _mfield_8;
+	int _mfield_C;
+	int _mfield_10;
+	char _mfield_14;
+	char _mfield_15;
+	char _mfield_16;
+	char _mfield_17;
 	byte *_data;
 	int _dataSize;
-	int _flags;
+	int _mflags;
 	NGIArchive *_libHandle;
 
  public:
-- 
cgit v1.2.3