ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

MUTATIONOFJB: Improve documentation, rename cryptic variables.

Browse Source
This commit is contained in:
Miroslav Remák
2018-08-25 23:12:01 +02:00
committed by Eugene Sandulenko
parent cda1f0dd3a
commit 578a6794de
7 changed files with 258 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/mutationofjb/room.cpp
+7 -7
View File
@@ -71,12 +71,12 @@ void RoomAnimationDecoderCallback::onFrame(int frameNo, Graphics::Surface &surfa
const uint8 noObjects = scene->getNoObjects();
for (int i = 0; i < noObjects; ++i) {
Object &object = scene->_objects[i];
const uint16 startFrame = (object._WY << 8) + object._FS;
if (frameNo1 >= startFrame && frameNo1 < startFrame + object._NA) {
const uint16 startFrame = (object._roomFrameMSB << 8) + object._roomFrameLSB;
if (frameNo1 >= startFrame && frameNo1 < startFrame + object._numFrames) {
const int x = object._x;
const int y = object._y;
const int w = (object._XL + 3) / 4 * 4; // Original code uses this to round up width to a multiple of 4.
const int h = object._YL;
const int w = (object._width + 3) / 4 * 4; // Original code uses this to round up width to a multiple of 4.
const int h = object._height;
Common::Rect rect(x, y, x + w, y + h);
const Graphics::Surface sharedSurface = surface.getSubArea(rect);
@@ -100,11 +100,11 @@ bool Room::load(uint8 roomNumber, bool roomB) {
for (int i = 0; i < noObjects; ++i) {
uint8 firstIndex = 0;
if (i != 0) {
firstIndex = _objectsStart[i - 1] + scene->_objects[i - 1]._NA;
firstIndex = _objectsStart[i - 1] + scene->_objects[i - 1]._numFrames;
}
_objectsStart.push_back(firstIndex);
uint8 numAnims = scene->_objects[i]._NA;
uint8 numAnims = scene->_objects[i]._numFrames;
while (numAnims--) {
_surfaces.push_back(Graphics::Surface());
}
@@ -142,7 +142,7 @@ void Room::redraw() {
Scene *const currentScene = _game->getGameData().getCurrentScene();
for (int i = 0; i < currentScene->getNoObjects(); ++i) {
Object *const obj = currentScene->getObject(i + 1);
if (obj->_AC) {
if (obj->_active) {
drawObjectAnimation(i + 1, 0);
}
}