libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: Clean up resetSentence

Browse Source
This commit is contained in:
Willem Jan Palenstijn 2012-02-13 20:26:43 +01:00
parent 7da29858e7
commit 3f5aaa0ca5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/scumm/script_v2.cpp
View File

@ -873,7 +873,7 @@ void ScummEngine_v2::o2_doSentence() {
return;
}
if (a == 0xFB) {
resetSentence(false);
resetSentence();
return;
}
@ -1411,7 +1411,7 @@ void ScummEngine_v2::o2_loadRoomWithEgo() {
_fullRedraw = true;
resetSentence(false);
resetSentence();
if (x >= 0 && y >= 0) {
a->startWalkActor(x, y, -1);
@ -1492,7 +1492,7 @@ void ScummEngine_v2::o2_cutscene() {
_sentenceNum = 0;
stopScript(SENTENCE_SCRIPT);
resetSentence(false);
resetSentence();
vm.cutScenePtr[0] = 0;
}
@ -1640,7 +1640,7 @@ void ScummEngine_v2::o2_switchCostumeSet() {
o2_dummy();
}
void ScummEngine_v2::resetSentence(bool walking) {
void ScummEngine_v2::resetSentence() {
VAR(VAR_SENTENCE_VERB) = VAR(VAR_BACKUP_VERB);
VAR(VAR_SENTENCE_OBJECT1) = 0;
VAR(VAR_SENTENCE_OBJECT2) = 0;

2
engines/scumm/scumm_v2.h
View File

@ -87,7 +87,7 @@ protected:
void clearStateCommon(byte type);
void stopScriptCommon(int script);
virtual void resetSentence(bool walking);
void resetSentence();
void setUserState(byte state);
virtual void handleMouseOver(bool updateInventory);