HUGO: Some more renaming

This commit is contained in:
Strangerke 2012-06-13 11:50:49 +02:00
parent 9bc0591825
commit 998448128c
7 changed files with 159 additions and 159 deletions

View file

@ -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);