aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2013-06-04 23:26:37 +0300
committerEugene Sandulenko2013-09-06 14:48:08 +0300
commit4f4834d934df9cb320058ad3f58f52a38e2894ef (patch)
treef8cc87948b6532d25c609a4a83f8ff6d54cfecbd /engines
parente624ee3442a9777ed4efeaf52223579cf7eabc4e (diff)
downloadscummvm-rg350-4f4834d934df9cb320058ad3f58f52a38e2894ef.tar.gz
scummvm-rg350-4f4834d934df9cb320058ad3f58f52a38e2894ef.tar.bz2
scummvm-rg350-4f4834d934df9cb320058ad3f58f52a38e2894ef.zip
FULLPIPE: CFile -> MfcArchive
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/objects.h12
-rw-r--r--engines/fullpipe/stateloader.cpp14
-rw-r--r--engines/fullpipe/utils.h2
3 files changed, 14 insertions, 14 deletions
diff --git a/engines/fullpipe/objects.h b/engines/fullpipe/objects.h
index 04fc42b279..20fbcdea9d 100644
--- a/engines/fullpipe/objects.h
+++ b/engines/fullpipe/objects.h
@@ -88,7 +88,7 @@ class SceneTag {
int16 _field_12;
public:
- SceneTag(CFile &file);
+ SceneTag(MfcArchive &file);
~SceneTag();
};
@@ -98,7 +98,7 @@ class SceneTagList {
SceneTagList_ _list;
public:
- SceneTagList(CFile &file);
+ SceneTagList(MfcArchive &file);
};
class GameProject {
@@ -109,7 +109,7 @@ class GameProject {
int _field_10;
public:
- GameProject(CFile &file);
+ GameProject(MfcArchive &file);
~GameProject();
};
@@ -213,7 +213,7 @@ class CInventory {
public:
CInventory() { _sceneId = 0; }
- bool load(CFile &file);
+ bool load(MfcArchive &file);
};
struct InventoryItem {
@@ -311,8 +311,8 @@ class CInventory2 {
public:
CInventory2();
- bool load(CFile &file);
- bool read(CFile &file);
+ bool load(MfcArchive &file);
+ bool read(MfcArchive &file);
};
class CGameLoader {
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 5c571e0cbd..ba80798a9b 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -43,7 +43,7 @@ bool FullpipeEngine::loadGam(const char *fname) {
}
bool CGameLoader::loadFile(const char *fname) {
- CFile file;
+ MfcArchive file;
if (!file.open(fname))
return false;
@@ -72,7 +72,7 @@ CGameLoader::~CGameLoader() {
delete _gameProject;
}
-GameProject::GameProject(CFile &file) {
+GameProject::GameProject(MfcArchive &file) {
_field_4 = 0;
_headerFilename = 0;
_field_10 = 12;
@@ -103,7 +103,7 @@ GameProject::~GameProject() {
free(_headerFilename);
}
-SceneTagList::SceneTagList(CFile &file) {
+SceneTagList::SceneTagList(MfcArchive &file) {
int numEntries = file.readUint16LE();
debug(0, "numEntries: %d", numEntries);
@@ -114,7 +114,7 @@ SceneTagList::SceneTagList(CFile &file) {
}
}
-SceneTag::SceneTag(CFile &file) {
+SceneTag::SceneTag(MfcArchive &file) {
_field_4 = 0;
_scene = 0;
@@ -129,7 +129,7 @@ SceneTag::~SceneTag() {
free(_tag);
}
-bool CInventory::load(CFile &file) {
+bool CInventory::load(MfcArchive &file) {
_sceneId = file.readUint16LE();
int numInvs = file.readUint32LE();
@@ -161,11 +161,11 @@ CInventory2::CInventory2() {
_topOffset = -65;
}
-bool CInventory2::load(CFile &file) {
+bool CInventory2::load(MfcArchive &file) {
return _inventory.load(file);
}
-bool CInventory2::read(CFile &file) { // CInventory2_SerializePartially
+bool CInventory2::read(MfcArchive &file) { // CInventory2_SerializePartially
int numInvs = file.readUint32LE();
debug(0, "numInvs: %d", numInvs);
diff --git a/engines/fullpipe/utils.h b/engines/fullpipe/utils.h
index 55f0b6fe3b..73be4618c8 100644
--- a/engines/fullpipe/utils.h
+++ b/engines/fullpipe/utils.h
@@ -25,7 +25,7 @@
namespace Fullpipe {
-class CFile : public Common::File {
+class MfcArchive : public Common::File {
public:
char *readPascalString() {
char *tmp;