[Scummvm-git-logs] scummvm master -> db484b273491d9b8cad63f1e857e9f98679100c4
bluegr
bluegr at gmail.com
Sun May 30 23:00:25 UTC 2021
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c78f0496a1 TRECISION: Make some AnimManager fields and functions private
db484b2734 TRECISION: Rename a variable
Commit: c78f0496a13c3fdf186774cd7bf987f789c24eff
https://github.com/scummvm/scummvm/commit/c78f0496a13c3fdf186774cd7bf987f789c24eff
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-05-31T01:59:15+03:00
Commit Message:
TRECISION: Make some AnimManager fields and functions private
Changed paths:
engines/trecision/graphics.cpp
engines/trecision/logic.cpp
engines/trecision/script.cpp
engines/trecision/text.cpp
engines/trecision/trecision.cpp
engines/trecision/video.h
diff --git a/engines/trecision/graphics.cpp b/engines/trecision/graphics.cpp
index 0780aa7fe5..05045fb4f6 100644
--- a/engines/trecision/graphics.cpp
+++ b/engines/trecision/graphics.cpp
@@ -677,7 +677,7 @@ void GraphicsManager::paintObjAnm(uint16 curBox) {
_vm->_renderer->drawCharacter(DRAWFACES);
} else if (_vm->_actorPos == curBox && !_vm->_flagDialogActive) {
- _vm->_animMgr->refreshSmkAnim(_vm->_animMgr->_playingAnims[kSmackerAction]);
+ _vm->_animMgr->refreshActionAnimation();
}
}
diff --git a/engines/trecision/logic.cpp b/engines/trecision/logic.cpp
index f66b775329..54835a4b23 100644
--- a/engines/trecision/logic.cpp
+++ b/engines/trecision/logic.cpp
@@ -3780,7 +3780,7 @@ void LogicManager::handleClickGameArea() {
}
void LogicManager::handleClickInventoryArea() {
- if (_vm->_animMgr->_playingAnims[kSmackerAction] || _vm->_flagDialogActive || _vm->_curRoom == kRoomControlPanel)
+ if (_vm->_animMgr->isActionActive() || _vm->_flagDialogActive || _vm->_curRoom == kRoomControlPanel)
return;
if (_vm->isIconArea(_vm->_mousePos) && _vm->whatIcon(_vm->_mousePos) && (_vm->_inventoryStatus == INV_INACTION)) {
@@ -3808,7 +3808,7 @@ void LogicManager::doMouseLeftRight() {
handleClickControlPanel(_vm->_curObj);
} else if (!_vm->_flagShowCharacter) {
handleClickCloseup();
- } else if (_vm->isGameArea(_vm->_mousePos) && !_vm->_animMgr->_playingAnims[kSmackerAction]) {
+ } else if (_vm->isGameArea(_vm->_mousePos) && !_vm->_animMgr->isActionActive()) {
if (_vm->_curRoom == kRoom52)
handleClickSnakeEscape();
diff --git a/engines/trecision/script.cpp b/engines/trecision/script.cpp
index afb743fca5..b8cecb80d4 100644
--- a/engines/trecision/script.cpp
+++ b/engines/trecision/script.cpp
@@ -225,7 +225,7 @@ void TrecisionEngine::processMouseMovement() {
return;
if ((_flagSomeoneSpeaks && !_flagCharacterSpeak) || _flagDialogMenuActive || _flagDialogActive)
return;
- if (_animMgr->_playingAnims[kSmackerAction])
+ if (_animMgr->isActionActive())
return;
if (_inventoryStatus == INV_OFF)
@@ -336,7 +336,7 @@ void TrecisionEngine::doCharacter() {
_flagShowCharacter = false;
_animTypeMgr->handler(kAnimTypeCharacter);
// If the animation is over
- if (!_animMgr->_playingAnims[kSmackerAction]) {
+ if (!_animMgr->isActionActive()) {
_graphicsMgr->showCursor();
_flagShowCharacter = true;
_pathFind->_characterInMovement = false;
diff --git a/engines/trecision/text.cpp b/engines/trecision/text.cpp
index 1aaff5d768..dccd35d53e 100644
--- a/engines/trecision/text.cpp
+++ b/engines/trecision/text.cpp
@@ -135,7 +135,7 @@ void TextManager::characterContinueTalk() {
_subStringAgain = (_curSubString < (_subStringUsed - 1));
- if (_vm->_flagShowCharacter || _vm->_animMgr->_playingAnims[kSmackerAction])
+ if (_vm->_flagShowCharacter || _vm->_animMgr->isActionActive())
pos = positionString(_vm->_actor->_lim[0], _vm->_actor->_lim[2], _subString[_curSubString], true);
else
pos = positionString(MAXX / 2, 30, _subString[_curSubString], false);
@@ -352,7 +352,7 @@ void TextManager::characterSay(uint16 i) {
_curSentenceId = i;
// if he took some action
- if (_vm->_sentence[i][0] == '*' && !_vm->_animMgr->_playingAnims[kSmackerAction])
+ if (_vm->_sentence[i][0] == '*' && !_vm->_animMgr->isActionActive())
_vm->startCharacterAction(hBOH, 0, 0, 0);
else
characterTalk(_vm->_sentence[i]);
diff --git a/engines/trecision/trecision.cpp b/engines/trecision/trecision.cpp
index 995aa3a376..3a5f2e0f62 100644
--- a/engines/trecision/trecision.cpp
+++ b/engines/trecision/trecision.cpp
@@ -336,7 +336,7 @@ bool TrecisionEngine::canPlayerInteract() {
(_actor->_curAction < hWALKIN) &&
!_flagUseWithStarted &&
_flagShowCharacter &&
- !_animMgr->_playingAnims[kSmackerAction]);
+ !_animMgr->isActionActive());
}
void TrecisionEngine::setObjectVisible(uint16 objectId, bool visible) {
diff --git a/engines/trecision/video.h b/engines/trecision/video.h
index 6a8fc36790..d414dc8044 100644
--- a/engines/trecision/video.h
+++ b/engines/trecision/video.h
@@ -70,6 +70,7 @@ private:
TrecisionEngine *_vm;
NightlongSmackerDecoder *_smkAnims[MAXSMACK];
+ uint16 _playingAnims[MAXSMACK];
FastFile _animFile[MAXSMACK]; // nlanim.cd1 / nlanim.cd2 / nlanim.cd3
int _curCD;
@@ -81,6 +82,7 @@ private:
void drawFrame(NightlongSmackerDecoder *smkDecoder, uint16 x, uint16 y, bool updateScreen);
void drawFrameSubtitles(Graphics::Surface *surface, int frameNum);
void setVideoRange(NightlongSmackerDecoder *smkDecoder, int &startFrame, int &endFrame);
+ void refreshSmkAnim(uint16 animation);
void handleEndOfVideo(int animation, int slot);
void drawSmkBackgroundFrame(int animation);
@@ -89,7 +91,6 @@ private:
void swapCD(int cd);
public:
- uint16 _playingAnims[MAXSMACK];
Common::Rect _animRect;
SAnim _animTab[MAXANIM];
@@ -98,13 +99,13 @@ public:
void smkToggleTrackAudio(int slot, int track, bool on);
int16 smkCurFrame(int slot);
void smkStop(uint16 slot);
-
+ void refreshActionAnimation() { refreshSmkAnim(_playingAnims[kSmackerAction]); }
+ bool isActionActive() const { return _playingAnims[kSmackerAction] != 0; }
void playMovie(const Common::String &filename, int startFrame = 0, int endFrame = -1);
void startFullMotion();
void stopFullMotion();
void refreshAnim(int box);
- void refreshSmkAnim(uint16 animation);
void startSmkAnim(uint16 animation);
void stopAllSmkAnims();
Commit: db484b273491d9b8cad63f1e857e9f98679100c4
https://github.com/scummvm/scummvm/commit/db484b273491d9b8cad63f1e857e9f98679100c4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-05-31T01:59:26+03:00
Commit Message:
TRECISION: Rename a variable
Changed paths:
engines/trecision/video.cpp
diff --git a/engines/trecision/video.cpp b/engines/trecision/video.cpp
index 597eedc8b3..55086b06c7 100644
--- a/engines/trecision/video.cpp
+++ b/engines/trecision/video.cpp
@@ -396,9 +396,9 @@ void AnimManager::stopFullMotion() {
}
void AnimManager::refreshAnim(int box) {
- for (int a = 0; a < MAXSMACK; a++) {
- if (_playingAnims[a] != 0 && box == BOX_BACKGROUND && a != kSmackerAction) {
- refreshSmkAnim(_playingAnims[a]);
+ for (int i = 0; i < MAXSMACK; i++) {
+ if (_playingAnims[i] != 0 && box == BOX_BACKGROUND && i != kSmackerAction) {
+ refreshSmkAnim(_playingAnims[i]);
}
}
}
More information about the Scummvm-git-logs
mailing list