libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 12:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TRECISION: Remove dead code related to characterSay() and someoneSay()

Browse Source 
The anim parameter was always 0 in someoneSay, so _talkingPersonAnimId
was always 0. The ME_CHARACTERSPEAK event is not used anywhere in the
code. Documented the usage of someoneSay()
This commit is contained in:
Filippos Karapetis 2021-05-24 23:46:49 +03:00 committed by SupSuper
parent 00278f1474
commit fb9d9e992a
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/trecision/anim.cpp
View File

@ -263,17 +263,20 @@ void AnimTypeManager::processAtFrame(ATFHandle *h, int type, int atf) {
break;
case ATFONESPEAK:
switch (index) {
case 1:
case 1: // Storekeeper's wife
if (_vm->_room[kRoom1D]._flag & kObjFlagExtra)
break;
_vm->_textMgr->someoneSay(307 + _oneSpeakDialogCount, oDONNA1D, 0);
// Quotes spoken by the storekeeper's wife while she is in the cellar
_vm->_textMgr->someoneSay(307 + _oneSpeakDialogCount, oDONNA1D);
if (_oneSpeakDialogCount < 6)
++_oneSpeakDialogCount;
break;
case 2:
_vm->_textMgr->someoneSay(1788, ocNEGOZIANTE1A, 0);
case 2: // Storekeeper
// Quote when you enter the liquor store: "Ah, it's you again... look round
// if you want, but don't disturb me, I've got a lot to do"
_vm->_textMgr->someoneSay(1788, ocNEGOZIANTE1A);
break;
default:
break;

1
engines/trecision/defines.h
View File

@ -2451,7 +2451,6 @@ Management of "Use with"
/* String names */
#define MC_STRING 4
#define ME_CHARACTERSPEAK 2 // (...)
#define ME_CHARACTERSPEAKING 3 // (someone,)
#define ME_SOMEONESPEAKING 5 // (...)
#define ME_SOMEONEWAIT2SPEAK 7

11
engines/trecision/text.cpp
View File

@ -37,7 +37,6 @@ TextManager::TextManager(TrecisionEngine *vm) : _vm(vm) {
_someoneSpeakTime = 0;
_subStringAgain = false;
_talkTime = 0;
_talkingPersonAnimId = 0;
for (int i = 0; i < MAXSUBSTRING; ++i) {
for (int j = 0; j < MAXLENSUBSTRING; ++j) {
_subString[i][j] = 0;
@ -221,9 +220,6 @@ void TextManager::someoneMute() {
void TextManager::doString() {
switch (_vm->_curMessage->_event) {
case ME_CHARACTERSPEAK:
characterSay(_vm->_curMessage->_u16Param1);
break;
case ME_CHARACTERSPEAKING:
if (_vm->_flagCharacterSpeak) {
@ -257,7 +253,7 @@ void TextManager::doString() {
if (_subStringAgain)
someoneContinueTalk();
else {
_vm->_scheduler->doEvent(MC_STRING, ME_SOMEONEWAIT2MUTE, MP_DEFAULT, _talkingPersonAnimId, 0, 0, 0);
_vm->_scheduler->doEvent(MC_STRING, ME_SOMEONEWAIT2MUTE, MP_DEFAULT, 0, 0, 0, 0);
}
} else
_vm->reEvent();
@ -349,8 +345,7 @@ void TextManager::showObjName(uint16 obj, bool show) {
}
}
void TextManager::someoneSay(uint16 sentence, uint16 person, uint16 anim) {
_talkingPersonAnimId = anim;
void TextManager::someoneSay(uint16 sentence, uint16 person) {
_talkingPersonId = person;
_vm->_flagSomeoneSpeaks = true;
_vm->_flagSkipTalk = false;
@ -362,7 +357,7 @@ void TextManager::someoneSay(uint16 sentence, uint16 person, uint16 anim) {
formattingSuperString();
_vm->_scheduler->doEvent(MC_STRING, ME_SOMEONEWAIT2SPEAK, MP_DEFAULT, _talkingPersonAnimId, 0, 0, 0);
_vm->_scheduler->doEvent(MC_STRING, ME_SOMEONEWAIT2SPEAK, MP_DEFAULT, 0, 0, 0, 0);
}
void TextManager::characterSay(uint16 i) {

3
engines/trecision/text.h
View File

@ -38,7 +38,6 @@ class TextManager {
uint32 _someoneSpeakTime;
bool _subStringAgain;
uint32 _talkTime;
uint16 _talkingPersonAnimId;
char _subString[MAXSUBSTRING][MAXLENSUBSTRING];
uint16 _subStringUsed;
Common::String _superString;
@ -67,7 +66,7 @@ public:
void doString();
void showObjName(uint16 obj, bool show);
void someoneSay(uint16 sentence, uint16 person, uint16 anim);
void someoneSay(uint16 sentence, uint16 person);
void characterSay(uint16 i);
void characterSayInAction(uint16 ss);