[Scummvm-git-logs] scummvm master -> ede8abfd5d943d82aebbedf1b1b82386b33ec1da
bluegr
noreply at scummvm.org
Tue Jan 25 08:36:32 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ede8abfd5d TRECISION: Rename _lim to _area
Commit: ede8abfd5d943d82aebbedf1b1b82386b33ec1da
https://github.com/scummvm/scummvm/commit/ede8abfd5d943d82aebbedf1b1b82386b33ec1da
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-01-25T10:36:08+02:00
Commit Message:
TRECISION: Rename _lim to _area
Changed paths:
engines/trecision/actor.cpp
engines/trecision/actor.h
engines/trecision/animmanager.cpp
engines/trecision/dialog.cpp
engines/trecision/logic.cpp
engines/trecision/renderer3d.cpp
engines/trecision/struct.cpp
engines/trecision/struct.h
engines/trecision/text.cpp
engines/trecision/utils.cpp
diff --git a/engines/trecision/actor.cpp b/engines/trecision/actor.cpp
index 9b7a8814472..4d09f7c70a8 100644
--- a/engines/trecision/actor.cpp
+++ b/engines/trecision/actor.cpp
@@ -46,7 +46,7 @@ Actor::Actor(TrecisionEngine *vm) : _vm(vm) {
_theta = 0.0f;
for (uint8 i = 0; i < 6; ++i)
- _lim[i] = 0;
+ _area[i] = 0;
_curFrame = 0;
_curAction = 0;
@@ -96,7 +96,7 @@ void Actor::initTextures() {
}
void Actor::updateStepSound() {
- _vm->_soundMgr->soundStep((_lim[1] + _lim[0]) / 2, (_lim[5] + _lim[4]) / 2, _curAction, _curFrame);
+ _vm->_soundMgr->soundStep((_area[1] + _area[0]) / 2, (_area[5] + _area[4]) / 2, _curAction, _curFrame);
}
static const float _vertsCorr[104][3] = {
@@ -471,11 +471,11 @@ float Actor::frameCenter(SVertex *v) {
}
bool Actor::actorRectIsValid() const {
- return _lim[0] < _lim[1] && _lim[2] < _lim[3];
+ return _area[0] < _area[1] && _area[2] < _area[3];
}
Common::Rect Actor::getActorRect() const {
- return Common::Rect(_lim[0], _lim[2], _lim[1], _lim[3]);
+ return Common::Rect(_area[0], _area[2], _area[1], _area[3]);
}
} // End of namespace Trecision
diff --git a/engines/trecision/actor.h b/engines/trecision/actor.h
index cb721bc5927..ad3798391c5 100644
--- a/engines/trecision/actor.h
+++ b/engines/trecision/actor.h
@@ -66,7 +66,7 @@ public:
float _dx, _dz;
float _theta;
- int _lim[6];
+ int _area[6];
int _curFrame;
int _curAction;
diff --git a/engines/trecision/animmanager.cpp b/engines/trecision/animmanager.cpp
index 6007d492b6e..a01284bb62b 100644
--- a/engines/trecision/animmanager.cpp
+++ b/engines/trecision/animmanager.cpp
@@ -368,8 +368,8 @@ void AnimManager::refreshSmkAnim(uint16 animation) {
}
for (int32 i = 0; i < MAXAREA; i++) {
- if (_animTab[animation].isAnimAreaShown(i + 1) && _animTab[animation]._lim[i].bottom != 0) {
- _vm->_graphicsMgr->addDirtyRect(_animTab[animation]._lim[i], true);
+ if (_animTab[animation].isAnimAreaShown(i + 1) && _animTab[animation]._area[i].bottom != 0) {
+ _vm->_graphicsMgr->addDirtyRect(_animTab[animation]._area[i], true);
}
}
}
@@ -400,7 +400,7 @@ static bool rectsIntersect(Common::Rect r1, Common::Rect r2) {
bool AnimManager::shouldShowAnim(int animation, Common::Rect curRect) {
for (int32 i = 0; i < MAXAREA; i++) {
- const bool intersect = rectsIntersect(_animTab[animation]._lim[i], curRect);
+ const bool intersect = rectsIntersect(_animTab[animation]._area[i], curRect);
if (intersect && !_animTab[animation].isAnimAreaShown(i + 1))
return false;
}
@@ -495,10 +495,10 @@ void AnimManager::syncGameStream(Common::Serializer &ser) {
ser.syncBytes((byte *)cur->_name, 14);
ser.syncAsUint16LE(cur->_flag);
for (uint8 j = 0; j < MAXAREA; ++j) {
- ser.syncAsUint16LE(cur->_lim[j].left);
- ser.syncAsUint16LE(cur->_lim[j].top);
- ser.syncAsUint16LE(cur->_lim[j].right);
- ser.syncAsUint16LE(cur->_lim[j].bottom);
+ ser.syncAsUint16LE(cur->_area[j].left);
+ ser.syncAsUint16LE(cur->_area[j].top);
+ ser.syncAsUint16LE(cur->_area[j].right);
+ ser.syncAsUint16LE(cur->_area[j].bottom);
}
ser.syncAsByte(cur->_nbox);
ser.skip(1, SAVE_VERSION_ORIGINAL_MIN, SAVE_VERSION_ORIGINAL_MAX);
@@ -520,10 +520,10 @@ void AnimManager::loadAnimTab(Common::SeekableReadStreamEndian *stream) {
_animTab[i]._flag = stream->readUint16();
for (uint8 j = 0; j < MAXAREA; ++j) {
- _animTab[i]._lim[j].left = stream->readUint16();
- _animTab[i]._lim[j].top = stream->readUint16();
- _animTab[i]._lim[j].right = stream->readUint16();
- _animTab[i]._lim[j].bottom = stream->readUint16();
+ _animTab[i]._area[j].left = stream->readUint16();
+ _animTab[i]._area[j].top = stream->readUint16();
+ _animTab[i]._area[j].right = stream->readUint16();
+ _animTab[i]._area[j].bottom = stream->readUint16();
}
_animTab[i]._nbox = stream->readByte();
@@ -541,8 +541,8 @@ void AnimManager::loadAnimTab(Common::SeekableReadStreamEndian *stream) {
}
void AnimManager::patchAnimTab() {
- _animTab[aBKG28]._lim[3].left = 308; // Patch the brazier animation rect in kRoom28 - bug #12628
- _animTab[aBKG35]._lim[0].right = 200; // Patch the terrorist animation rect in kRoom35
+ _animTab[aBKG28]._area[3].left = 308; // Patch the brazier animation rect in kRoom28 - bug #12628
+ _animTab[aBKG35]._area[0].right = 200; // Patch the terrorist animation rect in kRoom35
}
} // End of namespace Trecision
diff --git a/engines/trecision/dialog.cpp b/engines/trecision/dialog.cpp
index d548e9d062e..fbddcb893b4 100644
--- a/engines/trecision/dialog.cpp
+++ b/engines/trecision/dialog.cpp
@@ -421,7 +421,7 @@ void DialogManager::afterChoice() {
break;
case dF331:
- _vm->_obj[oTUBET33]._lim = Common::Rect(0, 0, 0, 0);
+ _vm->_obj[oTUBET33]._area = Common::Rect(0, 0, 0, 0);
_vm->_textMgr->characterSay(kSentenceSecretPassage);
break;
diff --git a/engines/trecision/logic.cpp b/engines/trecision/logic.cpp
index e2f87ae6971..062c11b208a 100644
--- a/engines/trecision/logic.cpp
+++ b/engines/trecision/logic.cpp
@@ -304,8 +304,8 @@ void LogicManager::startCharacterAnimations() {
} else if (_vm->_curRoom == kRoom1D && _vm->_oldRoom == kRoom1B) {
const uint16 cellarAction = _vm->isObjectVisible(oDONNA1D) ? a1D1SCENDESCALE : a1D12SCENDESCALA;
_vm->startCharacterAction(cellarAction, 0, 1, 0);
- _vm->_actor->_lim[0] = 60;
- _vm->_actor->_lim[2] = 240;
+ _vm->_actor->_area[0] = 60;
+ _vm->_actor->_area[2] = 240;
} else if (_vm->_curRoom == kRoom1B && _vm->_oldRoom == kRoom18 && _vm->_animMgr->_animTab[aBKG1B].isAnimAreaShown(1))
_vm->startCharacterAction(a1B12SCAPPATOPO, 0, 0, 0);
else if (_vm->_curRoom == kRoom2B && _vm->_oldRoom == kRoom2A)
@@ -1169,7 +1169,7 @@ void LogicManager::useInventoryWithScreen() {
break;
case kItemRatOnSkate:
- if ((_vm->_useWith[WITH] == oDONNA1D) && (_vm->_mousePos.x >= _vm->_obj[oDONNA1D]._lim.left && (_vm->_mousePos.x >= _vm->_obj[oDONNA1D]._lim.top + TOP) && (_vm->_mousePos.x <= _vm->_obj[oDONNA1D]._lim.right) && (_vm->_mousePos.y <= _vm->_obj[oDONNA1D]._lim.bottom + TOP))) {
+ if ((_vm->_useWith[WITH] == oDONNA1D) && (_vm->_mousePos.x >= _vm->_obj[oDONNA1D]._area.left && (_vm->_mousePos.x >= _vm->_obj[oDONNA1D]._area.top + TOP) && (_vm->_mousePos.x <= _vm->_obj[oDONNA1D]._area.right) && (_vm->_mousePos.y <= _vm->_obj[oDONNA1D]._area.bottom + TOP))) {
_vm->_animMgr->_animTab[aBKG1D].toggleAnimArea(1, false);
_vm->_dialogMgr->playDialog(dF1D1);
updateInventory = false;
@@ -1649,7 +1649,7 @@ void LogicManager::useInventoryWithScreen() {
case kItemMatchInPacket:
if (_vm->_useWith[WITH] == oTORCHS48) {
_vm->_scheduler->doEvent(MC_CHARACTER, ME_CHARACTERACTION, MP_DEFAULT, a4812, 0, 0, _vm->_useWith[WITH]);
- _vm->_obj[oTORCHS48]._lim = Common::Rect(0, 0, 0, 0);
+ _vm->_obj[oTORCHS48]._area = Common::Rect(0, 0, 0, 0);
printSentence = false;
}
break;
@@ -3717,9 +3717,9 @@ void LogicManager::handleClickGameArea() {
int pmousey = _vm->_curMessage->_u16Param2;
if (!_vm->_logicMgr->mouseClick(_vm->_curObj)) {
if (_vm->checkMask(_vm->_mousePos)) {
- if ((_vm->_obj[_vm->_curObj]._lim.right - _vm->_obj[_vm->_curObj]._lim.left) < MAXX / 7) {
- pmousex = (_vm->_obj[_vm->_curObj]._lim.left + _vm->_obj[_vm->_curObj]._lim.right) / 2;
- pmousey = ((_vm->_obj[_vm->_curObj]._lim.top + _vm->_obj[_vm->_curObj]._lim.bottom) / 2) + TOP;
+ if ((_vm->_obj[_vm->_curObj]._area.right - _vm->_obj[_vm->_curObj]._area.left) < MAXX / 7) {
+ pmousex = (_vm->_obj[_vm->_curObj]._area.left + _vm->_obj[_vm->_curObj]._area.right) / 2;
+ pmousey = ((_vm->_obj[_vm->_curObj]._area.top + _vm->_obj[_vm->_curObj]._area.bottom) / 2) + TOP;
}
}
_vm->_pathFind->whereIs(pmousex, pmousey);
diff --git a/engines/trecision/renderer3d.cpp b/engines/trecision/renderer3d.cpp
index fcff0f594e6..892b13a65ec 100644
--- a/engines/trecision/renderer3d.cpp
+++ b/engines/trecision/renderer3d.cpp
@@ -495,12 +495,12 @@ void Renderer3D::calcCharacterPoints() {
float l1 = 0.0f;
float l2 = 0.0f;
- actor->_lim[0] = 32000;
- actor->_lim[1] = -32000;
- actor->_lim[2] = 32000;
- actor->_lim[3] = -32000;
- actor->_lim[4] = 32000;
- actor->_lim[5] = -32000;
+ actor->_area[0] = 32000;
+ actor->_area[1] = -32000;
+ actor->_area[2] = 32000;
+ actor->_area[3] = -32000;
+ actor->_area[4] = 32000;
+ actor->_area[5] = -32000;
float t = (actor->_theta * PI2) / 360.0;
float cost = cos(t);
@@ -662,49 +662,49 @@ void Renderer3D::calcCharacterPoints() {
_vVertex[i]._y = y2d;
_vVertex[i]._z = (int32)((dist - l2) * 128.0);
- actor->_lim[0] = MIN(x2d, actor->_lim[0]);
- actor->_lim[1] = MAX(x2d, actor->_lim[1]);
- actor->_lim[2] = MIN(y2d, actor->_lim[2]);
- actor->_lim[3] = MAX(y2d, actor->_lim[3]);
+ actor->_area[0] = MIN(x2d, actor->_area[0]);
+ actor->_area[1] = MAX(x2d, actor->_area[1]);
+ actor->_area[2] = MIN(y2d, actor->_area[2]);
+ actor->_area[3] = MAX(y2d, actor->_area[3]);
- actor->_lim[4] = MIN<int32>(_vVertex[i]._z, actor->_lim[4]);
- actor->_lim[5] = MAX<int32>(_vVertex[i]._z, actor->_lim[5]);
+ actor->_area[4] = MIN<int32>(_vVertex[i]._z, actor->_area[4]);
+ actor->_area[5] = MAX<int32>(_vVertex[i]._z, actor->_area[5]);
++curVertex;
}
- actor->_lim[4] = (int)dist;
- actor->_lim[5] = (int)dist;
+ actor->_area[4] = (int)dist;
+ actor->_area[5] = (int)dist;
// vertex clipping
- if (actor->_lim[0] <= _minXClip + 1) {
- actor->_lim[0] = _minXClip;
+ if (actor->_area[0] <= _minXClip + 1) {
+ actor->_area[0] = _minXClip;
} else {
- --actor->_lim[0];
+ --actor->_area[0];
}
- if (actor->_lim[1] >= _maxXClip - 1) {
- actor->_lim[1] = _maxXClip;
+ if (actor->_area[1] >= _maxXClip - 1) {
+ actor->_area[1] = _maxXClip;
} else {
- ++actor->_lim[1];
+ ++actor->_area[1];
}
- if (actor->_lim[2] <= _minYClip + 1) {
- actor->_lim[2] = _minYClip;
+ if (actor->_area[2] <= _minYClip + 1) {
+ actor->_area[2] = _minYClip;
} else {
- --actor->_lim[2];
+ --actor->_area[2];
}
- if (actor->_lim[3] >= _maxYClip - 1) {
- actor->_lim[3] = _maxYClip;
+ if (actor->_area[3] >= _maxYClip - 1) {
+ actor->_area[3] = _maxYClip;
} else {
- ++actor->_lim[3];
+ ++actor->_area[3];
}
if (actor->_curAction == hLAST) // exit displacer
- actor->_lim[2] = actor->_lim[3] - (((actor->_lim[3] - actor->_lim[2]) * actor->_curFrame) / defActionLen[hLAST]);
+ actor->_area[2] = actor->_area[3] - (((actor->_area[3] - actor->_area[2]) * actor->_curFrame) / defActionLen[hLAST]);
// set zbuffer vars
- setZBufferRegion(actor->_lim[0], actor->_lim[2], actor->_lim[1] - actor->_lim[0]);
+ setZBufferRegion(actor->_area[0], actor->_area[2], actor->_area[1] - actor->_area[0]);
}
void Renderer3D::drawCharacterFaces() {
@@ -714,7 +714,7 @@ void Renderer3D::drawCharacterFaces() {
int vertexNum = actor->_vertexNum;
if (actor->_curAction == hLAST)
- setClipping(0, actor->_lim[2], MAXX, actor->_lim[3]);
+ setClipping(0, actor->_area[2], MAXX, actor->_area[3]);
for (int i = 0; i < _shadowLightNum; ++i) {
for (int j = 0; j < SHADOWFACESNUM; ++j) {
@@ -759,7 +759,7 @@ void Renderer3D::drawCharacterFaces() {
}
int p0 = 0;
- for (int i = _zBufStartY; i < actor->_lim[3]; ++i) {
+ for (int i = _zBufStartY; i < actor->_area[3]; ++i) {
for (int j = 1; j < _zBufWid; ++j) {
int py1 = (_zBuffer[p0] >= 0x7FF0) * 0x8000;
int py2 = (_zBuffer[p0 + 1] >= 0x7FF0) * 0x8000;
diff --git a/engines/trecision/struct.cpp b/engines/trecision/struct.cpp
index 5ed0da3593e..ab2f769452a 100644
--- a/engines/trecision/struct.cpp
+++ b/engines/trecision/struct.cpp
@@ -54,10 +54,10 @@ void SObject::readRect(Common::SeekableReadStream *stream) {
}
void SObject::syncGameStream(Common::Serializer &ser) {
- ser.syncAsUint16LE(_lim.left);
- ser.syncAsUint16LE(_lim.top);
- ser.syncAsUint16LE(_lim.right);
- ser.syncAsUint16LE(_lim.bottom);
+ ser.syncAsUint16LE(_area.left);
+ ser.syncAsUint16LE(_area.top);
+ ser.syncAsUint16LE(_area.right);
+ ser.syncAsUint16LE(_area.bottom);
ser.syncAsUint16LE(_name);
ser.syncAsUint16LE(_examine);
ser.syncAsUint16LE(_action);
@@ -78,10 +78,10 @@ void SObject::loadObj(Common::SeekableReadStreamEndian *stream) {
_rect.setWidth(w);
_rect.setHeight(h);
- _lim.left = stream->readUint16();
- _lim.top = stream->readUint16();
- _lim.right = stream->readUint16();
- _lim.bottom = stream->readUint16();
+ _area.left = stream->readUint16();
+ _area.top = stream->readUint16();
+ _area.right = stream->readUint16();
+ _area.bottom = stream->readUint16();
_position = stream->readSByte();
stream->readByte(); // Padding
diff --git a/engines/trecision/struct.h b/engines/trecision/struct.h
index 3bfc96029fd..4ff090eef4e 100644
--- a/engines/trecision/struct.h
+++ b/engines/trecision/struct.h
@@ -52,7 +52,7 @@ private:
struct SObject {
Common::Rect _rect;
- Common::Rect _lim;
+ Common::Rect _area;
int8 _position; // -1 if no position
uint16 _name;
uint16 _examine;
@@ -131,7 +131,7 @@ struct SAtFrame {
struct SAnim {
char _name[14];
uint16 _flag; // 1- background 2- icon 3- action 4- active - 4bits per child
- Common::Rect _lim[MAXAREA];
+ Common::Rect _area[MAXAREA];
uint8 _nbox;
SAtFrame _atFrame[MAXATFRAME];
diff --git a/engines/trecision/text.cpp b/engines/trecision/text.cpp
index 6682cc04824..5372b88ee08 100644
--- a/engines/trecision/text.cpp
+++ b/engines/trecision/text.cpp
@@ -136,7 +136,7 @@ void TextManager::characterContinueTalk() {
_subStringAgain = (_curSubString < (_subStringUsed - 1));
if (_vm->_flagShowCharacter || _vm->_animMgr->isActionActive())
- pos = positionString(_vm->_actor->_lim[0], _vm->_actor->_lim[2], _subString[_curSubString], true);
+ pos = positionString(_vm->_actor->_area[0], _vm->_actor->_area[2], _subString[_curSubString], true);
else
pos = positionString(MAXX / 2, 30, _subString[_curSubString], false);
@@ -185,9 +185,9 @@ void TextManager::someoneContinueTalk() {
Common::Point pos;
if (_talkingPersonId)
- pos = positionString(_vm->_obj[_talkingPersonId]._lim.left, _vm->_obj[_talkingPersonId]._lim.top, _subString[_curSubString], false);
+ pos = positionString(_vm->_obj[_talkingPersonId]._area.left, _vm->_obj[_talkingPersonId]._area.top, _subString[_curSubString], false);
else
- pos = positionString(_vm->_actor->_lim[0], _vm->_actor->_lim[2], _subString[_curSubString], true);
+ pos = positionString(_vm->_actor->_area[0], _vm->_actor->_area[2], _subString[_curSubString], true);
clearLastText();
if (ConfMan.getBool("subtitles"))
@@ -323,8 +323,8 @@ void TextManager::showObjName(uint16 obj, bool show) {
else
desc = _vm->_objName[_vm->_obj[obj]._name];
- const uint16 x = (_vm->_obj[obj]._lim.left + _vm->_obj[obj]._lim.right) / 2;
- const uint16 y = (obj == oWHEELS2C) ? 187 : _vm->_obj[obj]._lim.top;
+ const uint16 x = (_vm->_obj[obj]._area.left + _vm->_obj[obj]._area.right) / 2;
+ const uint16 y = (obj == oWHEELS2C) ? 187 : _vm->_obj[obj]._area.top;
Common::Point pos = positionString(x, y, desc.c_str(), false);
if (_vm->_lastObj)
diff --git a/engines/trecision/utils.cpp b/engines/trecision/utils.cpp
index 5aafa83d35a..9ad268f27f2 100644
--- a/engines/trecision/utils.cpp
+++ b/engines/trecision/utils.cpp
@@ -115,7 +115,7 @@ uint32 TrecisionEngine::readTime() {
bool TrecisionEngine::checkMask(Common::Point pos) {
for (int8 i = MAXOBJINROOM - 1; i >= 0; --i) {
uint16 checkedObj = _room[_curRoom]._object[i];
- Common::Rect lim = _obj[checkedObj]._lim;
+ Common::Rect lim = _obj[checkedObj]._area;
lim.translate(0, TOP);
// Trecision includes the bottom and right coordinates
++lim.right;
More information about the Scummvm-git-logs
mailing list