aboutsummaryrefslogtreecommitdiff
path: root/engines/illusions/resources
diff options
context:
space:
mode:
Diffstat (limited to 'engines/illusions/resources')
-rw-r--r--engines/illusions/resources/actorresource.cpp10
-rw-r--r--engines/illusions/resources/actorresource.h2
-rw-r--r--engines/illusions/resources/backgroundresource.cpp14
-rw-r--r--engines/illusions/resources/backgroundresource.h8
-rw-r--r--engines/illusions/resources/scriptresource.cpp20
5 files changed, 27 insertions, 27 deletions
diff --git a/engines/illusions/resources/actorresource.cpp b/engines/illusions/resources/actorresource.cpp
index 42124573b8..13c8abc481 100644
--- a/engines/illusions/resources/actorresource.cpp
+++ b/engines/illusions/resources/actorresource.cpp
@@ -111,7 +111,7 @@ void ActorResource::load(Resource *resource) {
_totalSize = stream.readUint32LE();
- // Load actor types
+ // Load actor types
stream.seek(0x06);
uint actorTypesCount = stream.readUint16LE();
stream.seek(0x10);
@@ -137,7 +137,7 @@ void ActorResource::load(Resource *resource) {
_sequences.push_back(sequence);
}
- // Load frames
+ // Load frames
stream.seek(0x0A);
uint framesCount = stream.readUint16LE();
stream.seek(0x18);
@@ -149,7 +149,7 @@ void ActorResource::load(Resource *resource) {
frame.load(data, stream);
_frames.push_back(frame);
}
-
+
// Load named points
if (resource->_gameId == kGameIdBBDOU) {
// The count isn't stored explicitly so calculate it
@@ -157,7 +157,7 @@ void ActorResource::load(Resource *resource) {
stream.seek(0x20);
_namedPoints.load(namedPointsCount, stream);
}
-
+
debug(1, "ActorResource(%08X) framesCount: %d", resource->_resId, framesCount);
}
@@ -240,7 +240,7 @@ void ActorInstance::registerResources() {
Sequence *sequence = &_actorResource->_sequences[i];
_vm->_dict->addSequence(sequence->_sequenceId, sequence);
}
-}
+}
void ActorInstance::unregisterResources() {
for (uint i = 0; i < _actorResource->_actorTypes.size(); ++i)
diff --git a/engines/illusions/resources/actorresource.h b/engines/illusions/resources/actorresource.h
index 34b4702023..d4f798be79 100644
--- a/engines/illusions/resources/actorresource.h
+++ b/engines/illusions/resources/actorresource.h
@@ -107,7 +107,7 @@ public:
protected:
void initActorTypes(int gameId);
void registerResources();
- void unregisterResources();
+ void unregisterResources();
};
class ActorInstanceList {
diff --git a/engines/illusions/resources/backgroundresource.cpp b/engines/illusions/resources/backgroundresource.cpp
index a35f06e20f..27d73a70b9 100644
--- a/engines/illusions/resources/backgroundresource.cpp
+++ b/engines/illusions/resources/backgroundresource.cpp
@@ -223,10 +223,10 @@ BackgroundResource::~BackgroundResource() {
void BackgroundResource::load(byte *data, uint32 dataSize) {
Common::MemoryReadStream stream(data, dataSize, DisposeAfterUse::NO);
-
+
stream.seek(8);
_paletteIndex = stream.readUint16LE();
-
+
// Load background pixels
stream.seek(0x0A);
_bgInfosCount = stream.readUint16LE();
@@ -295,7 +295,7 @@ void BackgroundResource::load(byte *data, uint32 dataSize) {
stream.seek(backgroundObjectsOffs + i * 12);
_backgroundObjects[i].load(data, stream);
}
-
+
// Load path walk points
stream.seek(0x0E);
_pathWalkPointsCount = stream.readUint16LE();
@@ -392,11 +392,11 @@ void BackgroundInstance::load(Resource *resource) {
_bgRes = backgroundResource;
_sceneId = resource->_sceneId;
initSurface();
-
+
// Insert background objects
for (uint i = 0; i < backgroundResource->_backgroundObjectsCount; ++i)
_vm->_controls->placeBackgroundObject(&backgroundResource->_backgroundObjects[i]);
-
+
registerResources();
// TODO camera_fadeClear();
@@ -451,13 +451,13 @@ void BackgroundInstance::registerResources() {
_vm->_dict->addSequence(sequence->_sequenceId, sequence);
}
}
-
+
void BackgroundInstance::unregisterResources() {
for (uint i = 0; i < _bgRes->_regionSequencesCount; ++i) {
Sequence *sequence = &_bgRes->_regionSequences[i];
_vm->_dict->removeSequence(sequence->_sequenceId);
}
-}
+}
void BackgroundInstance::initSurface() {
for (uint i = 0; i < kMaxBackgroundItemSurfaces; ++i)
diff --git a/engines/illusions/resources/backgroundresource.h b/engines/illusions/resources/backgroundresource.h
index d0c0c76233..fba2e7ecfe 100644
--- a/engines/illusions/resources/backgroundresource.h
+++ b/engines/illusions/resources/backgroundresource.h
@@ -150,7 +150,7 @@ public:
uint _bgInfosCount;
BgInfo *_bgInfos;
-
+
uint _priorityLayersCount;
PriorityLayer *_priorityLayers;
@@ -173,7 +173,7 @@ public:
PathWalkRects *_pathWalkRects;
NamedPoints _namedPoints;
-
+
uint _palettesCount;
Palette *_palettes;
@@ -197,8 +197,8 @@ public:
Graphics::Surface *_surfaces[kMaxBackgroundItemSurfaces];
CameraState _savedCameraState;
byte *_savedPalette;
- void registerResources();
- void unregisterResources();
+ void registerResources();
+ void unregisterResources();
void initSurface();
void freeSurface();
void drawTiles(Graphics::Surface *surface, TileMap &tileMap, byte *tilePixels);
diff --git a/engines/illusions/resources/scriptresource.cpp b/engines/illusions/resources/scriptresource.cpp
index e2108a65c2..08433fe71c 100644
--- a/engines/illusions/resources/scriptresource.cpp
+++ b/engines/illusions/resources/scriptresource.cpp
@@ -155,7 +155,7 @@ void TriggerCause::load(Common::SeekableReadStream &stream) {
_verbId = stream.readUint32LE();
_objectId2 = stream.readUint32LE();
_codeOffs = stream.readUint32LE();
-
+
debug(2, "TriggerCause::load() _verbId: %08X; _objectId2: %08X; _codeOffs: %08X",
_verbId, _objectId2, _codeOffs);
}
@@ -283,10 +283,10 @@ void ScriptResource::load(Resource *resource) {
_dataSize = resource->_dataSize;
Common::MemoryReadStream stream(_data, _dataSize, DisposeAfterUse::NO);
-
+
uint32 objectMapOffs = 0, sceneInfosOffs = 0;
_objectMapCount = 0;
-
+
if (resource->_gameId == kGameIdBBDOU) {
sceneInfosOffs = 0x18;
} else if (resource->_gameId == kGameIdDuckman) {
@@ -294,7 +294,7 @@ void ScriptResource::load(Resource *resource) {
_soundIds[i] = stream.readUint32LE();
sceneInfosOffs = 0x8C;
}
-
+
stream.skip(4); // Skip unused
// Read item counts
@@ -313,17 +313,17 @@ void ScriptResource::load(Resource *resource) {
if (resource->_gameId == kGameIdDuckman)
objectMapOffs = stream.readUint32LE(); //TODO Is this needed for BBDOU?
uint32 codeTblOffs = stream.readUint32LE();
-
+
debug(2, "ScriptResource::load() propertiesCount: %d; blockCountersCount: %d; _codeCount: %d; _sceneInfosCount: %d; _objectMapCount: %d",
propertiesCount, blockCountersCount, _codeCount, _sceneInfosCount, _objectMapCount);
debug(2, "ScriptResource::load() propertiesOffs: %08X; blockCountersOffs: %08X; codeTblOffs: %08X; objectMapOffs: %08X",
propertiesOffs, blockCountersOffs, codeTblOffs, objectMapOffs);
// Init properties
_properties.init(propertiesCount, _data + propertiesOffs);
-
+
// Init blockcounters
_blockCounters.init(blockCountersCount, _data + blockCountersOffs);
-
+
_codeOffsets = new uint32[_codeCount];
stream.seek(codeTblOffs);
for (uint i = 0; i < _codeCount; ++i)
@@ -336,7 +336,7 @@ void ScriptResource::load(Resource *resource) {
stream.seek(sceneInfoOffs);
_sceneInfos[i].load(_data, stream);
}
-
+
if (_objectMapCount > 0) {
_objectMap = new uint32[_objectMapCount];
stream.seek(objectMapOffs);
@@ -345,7 +345,7 @@ void ScriptResource::load(Resource *resource) {
stream.skip(4);
}
}
-
+
if (resource->_gameId == kGameIdDuckman) {
stream.seek(0x6C);
_mainActorObjectId = stream.readUint32LE();
@@ -353,7 +353,7 @@ void ScriptResource::load(Resource *resource) {
stream.seek(0);
_mainActorObjectId = stream.readUint32LE();
}
-
+
if (resource->_gameId == kGameIdDuckman)
fixupSceneInfosDuckman();