thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TRECISION: Remove the setRoom() wrapper

Browse source
This commit is contained in:
Filippos Karapetis 2021-05-20 00:34:15 +03:00 • committed by SupSuper
parent e1ad7c1318
commit 8931782996
6 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/trecision/anim.cpp
View file

@ -21,6 +21,8 @@
*/
#include "trecision/anim.h"
#include "logic.h"
#include "trecision/3d.h"
#include "trecision/dialog.h"
#include "trecision/scheduler.h"
@ -232,10 +234,10 @@ void AnimTypeManager::processAtFrame(ATFHandle *h, int type, int atf) {
_vm->setObjectVisible(h->_curAnim->_atFrame[atf]._index, !_vm->isObjectVisible(h->_curAnim->_atFrame[atf]._index));
break;
case ATFSETROOMT:
_vm->setRoom(h->_curAnim->_atFrame[atf]._index, true);
_vm->_logicMgr->setupAltRoom(h->_curAnim->_atFrame[atf]._index, true);
break;
case ATFSETROOMF:
_vm->setRoom(h->_curAnim->_atFrame[atf]._index, false);
_vm->_logicMgr->setupAltRoom(h->_curAnim->_atFrame[atf]._index, false);
break;
case ATFREADBOX:
switch (h->_curAnim->_atFrame[atf]._index) {

5
engines/trecision/dialog.cpp
View file

@ -24,6 +24,7 @@
#include "trecision/actor.h"
#include "trecision/defines.h"
#include "trecision/dialog.h"
#include "trecision/logic.h"
#include "trecision/scheduler.h"
#include "trecision/graphics.h"
#include "trecision/text.h"
@ -207,12 +208,12 @@ void DialogManager::afterChoice() {
break;
case dF213B:
case dF213:
_vm->setRoom(kRoom21, true);
_vm->_logicMgr->setupAltRoom(kRoom21, true);
break;
case dF212B:
case dF212:
_vm->setRoom(kRoom21, false);
_vm->_logicMgr->setupAltRoom(kRoom21, false);
break;
case dF321:

28
engines/trecision/logic.cpp
View file

@ -2083,7 +2083,7 @@ bool LogicManager::useScreenWithScreen() {
case oRAMPINO21:
if (_vm->_useWith[WITH] == oTUBO21) {
_vm->_dialogMgr->playDialog(dF211);
_vm->setRoom(kRoom21, true);
_vm->_logicMgr->setupAltRoom(kRoom21, true);
_vm->_animMgr->_animTab[aBKG21]._flag &= ~SMKANIM_OFF1;
_vm->setObjectVisible(oRAMPINO21, false);
_vm->setObjectVisible(oTUBO21, false);
@ -2752,11 +2752,11 @@ bool LogicManager::mouseOperate(uint16 curObj) {
case oPASSAGE24:
if (_vm->_room[kRoom24]._flag & kObjFlagExtra) {
_vm->_scheduler->doEvent(MC_CHARACTER, ME_CHARACTERACTION, MP_DEFAULT, a244, 0, 14, curObj);
_vm->setRoom(kRoom24, false);
_vm->_logicMgr->setupAltRoom(kRoom24, false);
retVal = false;
} else {
_vm->_scheduler->doEvent(MC_CHARACTER, ME_CHARACTERACTION, MP_DEFAULT, a243, 0, 13, curObj);
_vm->setRoom(kRoom24, true);
_vm->_logicMgr->setupAltRoom(kRoom24, true);
retVal = false;
}
break;
@ -4091,16 +4091,16 @@ void LogicManager::doSystemChangeRoom() {
if (_vm->_room[_vm->_oldRoom]._flag & kObjFlagExtra) {
switch (_vm->_curObj) {
case od2ETO2C:
_vm->setRoom(kRoom2E, false);
_vm->_logicMgr->setupAltRoom(kRoom2E, false);
break;
case od24TO23:
_vm->setRoom(kRoom24, false);
_vm->_logicMgr->setupAltRoom(kRoom24, false);
break;
case od21TO22:
_vm->setRoom(kRoom21, false);
_vm->_logicMgr->setupAltRoom(kRoom21, false);
break;
case od2GVTO26:
_vm->setRoom(kRoom2GV, false);
_vm->_logicMgr->setupAltRoom(kRoom2GV, false);
break;
default:
break;
@ -4108,13 +4108,13 @@ void LogicManager::doSystemChangeRoom() {
} else {
switch (_vm->_curObj) {
case oENTRANCE2E:
_vm->setRoom(kRoom2E, true);
_vm->_logicMgr->setupAltRoom(kRoom2E, true);
break;
case od24TO26:
_vm->setRoom(kRoom24, true);
_vm->_logicMgr->setupAltRoom(kRoom24, true);
break;
case od21TO23:
_vm->setRoom(kRoom21, true);
_vm->_logicMgr->setupAltRoom(kRoom21, true);
break;
default:
break;
@ -4132,13 +4132,13 @@ void LogicManager::doSystemChangeRoom() {
_vm->_graphicsMgr->showCursor();
if (_vm->_curRoom == kRoom21) {
_vm->setRoom(kRoom21, _vm->_oldRoom == kRoom23A || _vm->_oldRoom == kRoom23B);
_vm->_logicMgr->setupAltRoom(kRoom21, _vm->_oldRoom == kRoom23A || _vm->_oldRoom == kRoom23B);
} else if (_vm->_curRoom == kRoom24) {
_vm->setRoom(kRoom24, _vm->_oldRoom == kRoom26);
_vm->_logicMgr->setupAltRoom(kRoom24, _vm->_oldRoom == kRoom26);
} else if (_vm->_curRoom == kRoom2A) {
_vm->setRoom(kRoom2A, _vm->_oldRoom == kRoom25);
_vm->_logicMgr->setupAltRoom(kRoom2A, _vm->_oldRoom == kRoom25);
} else if (_vm->_curRoom == kRoom2B) {
_vm->setRoom(kRoom2B, _vm->_oldRoom == kRoom28);
_vm->_logicMgr->setupAltRoom(kRoom2B, _vm->_oldRoom == kRoom28);
}
// for save/load
else if (_vm->_room[_vm->_curRoom]._flag & kObjFlagExtra) {

1
engines/trecision/logic.h
View file

@ -24,6 +24,7 @@
#define TRECISION_LOGIC_H
#include "common/scummsys.h"
#include "common/serializer.h"
namespace Trecision {
class TrecisionEngine;

1
engines/trecision/trecision.h
View file

@ -179,7 +179,6 @@ public:
void doMouseTalk(uint16 curObj);
// Utils
void setRoom(uint16 r, bool b);
uint16 textLength(const Common::String &text, uint16 begin = 0, uint16 end = 0);
Common::KeyCode waitKey();
void waitDelay(uint32 val);

4
engines/trecision/utils.cpp
View file

@ -45,10 +45,6 @@ char *TrecisionEngine::getNextSentence() {
return _textPtr;
}
void TrecisionEngine::setRoom(uint16 r, bool b) {
_logicMgr->setupAltRoom(r, b);
}
/*-------------------------------------------------
* Compute string length from character begin to end
*-------------------------------------------------*/