From 998448128c8527427b1b472d17c68b7770ee6f4c Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 13 Jun 2012 11:50:49 +0200 Subject: HUGO: Some more renaming --- engines/hugo/file_v2d.cpp | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'engines/hugo/file_v2d.cpp') diff --git a/engines/hugo/file_v2d.cpp b/engines/hugo/file_v2d.cpp index 520e1b77b6..009b0b0bb8 100644 --- a/engines/hugo/file_v2d.cpp +++ b/engines/hugo/file_v2d.cpp @@ -81,16 +81,16 @@ void FileManager_v2d::readBackground(const int screenIndex) { _sceneryArchive1.seek((uint32) screenIndex * sizeof(sceneBlock_t), SEEK_SET); sceneBlock_t sceneBlock; // Read a database header entry - sceneBlock.scene_off = _sceneryArchive1.readUint32LE(); - sceneBlock.scene_len = _sceneryArchive1.readUint32LE(); - sceneBlock.b_off = _sceneryArchive1.readUint32LE(); - sceneBlock.b_len = _sceneryArchive1.readUint32LE(); - sceneBlock.o_off = _sceneryArchive1.readUint32LE(); - sceneBlock.o_len = _sceneryArchive1.readUint32LE(); - sceneBlock.ob_off = _sceneryArchive1.readUint32LE(); - sceneBlock.ob_len = _sceneryArchive1.readUint32LE(); + sceneBlock._scene_off = _sceneryArchive1.readUint32LE(); + sceneBlock._scene_len = _sceneryArchive1.readUint32LE(); + sceneBlock._b_off = _sceneryArchive1.readUint32LE(); + sceneBlock._b_len = _sceneryArchive1.readUint32LE(); + sceneBlock._o_off = _sceneryArchive1.readUint32LE(); + sceneBlock._o_len = _sceneryArchive1.readUint32LE(); + sceneBlock._ob_off = _sceneryArchive1.readUint32LE(); + sceneBlock._ob_len = _sceneryArchive1.readUint32LE(); - _sceneryArchive1.seek(sceneBlock.scene_off, SEEK_SET); + _sceneryArchive1.seek(sceneBlock._scene_off, SEEK_SET); // Read the image into dummy seq and static dib_a seq_t *dummySeq; // Image sequence structure for Read_pcx @@ -108,28 +108,28 @@ void FileManager_v2d::readOverlay(const int screenNum, image_pt image, ovl_t ove _sceneryArchive1.seek((uint32)screenNum * sizeof(sceneBlock_t), SEEK_SET); sceneBlock_t sceneBlock; // Database header entry - sceneBlock.scene_off = _sceneryArchive1.readUint32LE(); - sceneBlock.scene_len = _sceneryArchive1.readUint32LE(); - sceneBlock.b_off = _sceneryArchive1.readUint32LE(); - sceneBlock.b_len = _sceneryArchive1.readUint32LE(); - sceneBlock.o_off = _sceneryArchive1.readUint32LE(); - sceneBlock.o_len = _sceneryArchive1.readUint32LE(); - sceneBlock.ob_off = _sceneryArchive1.readUint32LE(); - sceneBlock.ob_len = _sceneryArchive1.readUint32LE(); + sceneBlock._scene_off = _sceneryArchive1.readUint32LE(); + sceneBlock._scene_len = _sceneryArchive1.readUint32LE(); + sceneBlock._b_off = _sceneryArchive1.readUint32LE(); + sceneBlock._b_len = _sceneryArchive1.readUint32LE(); + sceneBlock._o_off = _sceneryArchive1.readUint32LE(); + sceneBlock._o_len = _sceneryArchive1.readUint32LE(); + sceneBlock._ob_off = _sceneryArchive1.readUint32LE(); + sceneBlock._ob_len = _sceneryArchive1.readUint32LE(); uint32 i = 0; switch (overlayType) { case kOvlBoundary: - _sceneryArchive1.seek(sceneBlock.b_off, SEEK_SET); - i = sceneBlock.b_len; + _sceneryArchive1.seek(sceneBlock._b_off, SEEK_SET); + i = sceneBlock._b_len; break; case kOvlOverlay: - _sceneryArchive1.seek(sceneBlock.o_off, SEEK_SET); - i = sceneBlock.o_len; + _sceneryArchive1.seek(sceneBlock._o_off, SEEK_SET); + i = sceneBlock._o_len; break; case kOvlBase: - _sceneryArchive1.seek(sceneBlock.ob_off, SEEK_SET); - i = sceneBlock.ob_len; + _sceneryArchive1.seek(sceneBlock._ob_off, SEEK_SET); + i = sceneBlock._ob_len; break; default: error("Bad overlayType: %d", overlayType); -- cgit v1.2.3