aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2013-09-12 21:37:46 +0300
committerEugene Sandulenko2013-09-12 22:51:21 +0300
commit7e08d4f6b290824e43c91cea8cb3b8716144b859 (patch)
tree6cb80c60b297de22b93a2924cf6c79e2861dee80
parentc2161b95640779677f186786ed1bbfad34da074c (diff)
downloadscummvm-rg350-7e08d4f6b290824e43c91cea8cb3b8716144b859.tar.gz
scummvm-rg350-7e08d4f6b290824e43c91cea8cb3b8716144b859.tar.bz2
scummvm-rg350-7e08d4f6b290824e43c91cea8cb3b8716144b859.zip
FULLPIPE: Move PreloadItems to gameloader.h
-rw-r--r--engines/fullpipe/gameloader.h12
-rw-r--r--engines/fullpipe/objects.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h
index a8d51cd794..73873fb839 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/fullpipe/gameloader.h
@@ -34,6 +34,18 @@ class CMctlCompound;
class CInputController;
class CInteractionController;
+struct PreloadItem {
+ int preloadId1;
+ int preloadId2;
+ int sceneId;
+ int field_C;
+};
+
+class PreloadItems : public Common::Array<PreloadItem>, public CObject {
+ public:
+ virtual bool load(MfcArchive &file);
+};
+
class CGameLoader : public CObject {
public:
CGameLoader();
diff --git a/engines/fullpipe/objects.h b/engines/fullpipe/objects.h
index 55686acaec..008e684a68 100644
--- a/engines/fullpipe/objects.h
+++ b/engines/fullpipe/objects.h
@@ -117,18 +117,6 @@ class CGameVar : public CObject {
CGameVar *getSubVarByIndex(int idx);
};
-struct PreloadItem {
- int preloadId1;
- int preloadId2;
- int sceneId;
- int field_C;
-};
-
-class PreloadItems : public Common::Array<PreloadItem>, public CObject {
- public:
- virtual bool load(MfcArchive &file);
-};
-
} // End of namespace Fullpipe
#endif /* FULLPIPE_OBJECTS_H */