aboutsummaryrefslogtreecommitdiff
path: root/engines/hugo/file_v3d.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/hugo/file_v3d.cpp')
-rw-r--r--engines/hugo/file_v3d.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/hugo/file_v3d.cpp b/engines/hugo/file_v3d.cpp
index 34c745efb6..5eb0cfc2c8 100644
--- a/engines/hugo/file_v3d.cpp
+++ b/engines/hugo/file_v3d.cpp
@@ -50,9 +50,9 @@ FileManager_v3d::~FileManager_v3d() {
void FileManager_v3d::readBackground(const int screenIndex) {
debugC(1, kDebugFile, "readBackground(%d)", screenIndex);
- _sceneryArchive1.seek((uint32) screenIndex * sizeof(sceneBlock_t), SEEK_SET);
+ _sceneryArchive1.seek((uint32) screenIndex * sizeof(SceneBlock), SEEK_SET);
- sceneBlock_t sceneBlock; // Read a database header entry
+ SceneBlock sceneBlock; // Read a database header entry
sceneBlock._sceneOffset = _sceneryArchive1.readUint32LE();
sceneBlock._sceneLength = _sceneryArchive1.readUint32LE();
sceneBlock._boundaryOffset = _sceneryArchive1.readUint32LE();
@@ -62,7 +62,7 @@ void FileManager_v3d::readBackground(const int screenIndex) {
sceneBlock._baseOffset = _sceneryArchive1.readUint32LE();
sceneBlock._baseLength = _sceneryArchive1.readUint32LE();
- seq_t *dummySeq; // Image sequence structure for Read_pcx
+ Seq *dummySeq; // Image sequence structure for Read_pcx
if (screenIndex < 20) {
_sceneryArchive1.seek(sceneBlock._sceneOffset, SEEK_SET);
// Read the image into dummy seq and static dib_a
@@ -106,13 +106,13 @@ void FileManager_v3d::closeDatabaseFiles() {
/**
* Open and read in an overlay file, close file
*/
-void FileManager_v3d::readOverlay(const int screenNum, image_pt image, ovl_t overlayType) {
+void FileManager_v3d::readOverlay(const int screenNum, ImagePtr image, OvlType overlayType) {
debugC(1, kDebugFile, "readOverlay(%d, ...)", screenNum);
- image_pt tmpImage = image; // temp ptr to overlay file
- _sceneryArchive1.seek((uint32)screenNum * sizeof(sceneBlock_t), SEEK_SET);
+ ImagePtr tmpImage = image; // temp ptr to overlay file
+ _sceneryArchive1.seek((uint32)screenNum * sizeof(SceneBlock), SEEK_SET);
- sceneBlock_t sceneBlock; // Database header entry
+ SceneBlock sceneBlock; // Database header entry
sceneBlock._sceneOffset = _sceneryArchive1.readUint32LE();
sceneBlock._sceneLength = _sceneryArchive1.readUint32LE();
sceneBlock._boundaryOffset = _sceneryArchive1.readUint32LE();