aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe/utils.h
diff options
context:
space:
mode:
authorEugene Sandulenko2013-08-12 12:32:49 +0300
committerEugene Sandulenko2013-09-06 14:51:13 +0300
commit13059906c5f68bebb6344cf5617dc62243d146cf (patch)
treec29ca3cf7c637f89ad90106eadb5d420204c71ba /engines/fullpipe/utils.h
parent687d0624e57177322c64bc660132c4c017a6e9f0 (diff)
downloadscummvm-rg350-13059906c5f68bebb6344cf5617dc62243d146cf.tar.gz
scummvm-rg350-13059906c5f68bebb6344cf5617dc62243d146cf.tar.bz2
scummvm-rg350-13059906c5f68bebb6344cf5617dc62243d146cf.zip
FULLPIPE: Rename base class variables to avoid ambigiuity
Diffstat (limited to 'engines/fullpipe/utils.h')
-rw-r--r--engines/fullpipe/utils.h16
1 files changed, 8 insertions, 8 deletions
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: