libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 18:06:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

SCUMM: improve verb and sentence handling

Browse Source 
- execute sentence if verb was clicked twice
- reuse the first object if a new verb is selected (but no preposition is used yet)
This commit is contained in:
Tobias Gunkel 2012-01-10 23:17:40 +01:00
parent 8392d23e6b
commit e14bc5fd6d
2 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/scumm/scumm_v0.h
View File

@ -97,6 +97,7 @@ protected:
virtual void runSentenceScript(); virtual void runSentenceScript();
virtual void checkAndRunSentenceScript(); virtual void checkAndRunSentenceScript();
bool checkSentenceComplete();
virtual void checkExecVerbs(); virtual void checkExecVerbs();
virtual void handleMouseOver(bool updateInventory); virtual void handleMouseOver(bool updateInventory);
int verbPrepIdType(int verbid); int verbPrepIdType(int verbid);

52
engines/scumm/verbs.cpp
View File

@ -731,6 +731,14 @@ void ScummEngine_v0::verbExec() {
a->startWalkActor(VAR(6), VAR(7), -1); a->startWalkActor(VAR(6), VAR(7), -1);
} }
bool ScummEngine_v0::checkSentenceComplete() {
if (_activeVerb && _activeVerb != kVerbWalkTo && _activeVerb != kVerbWhatIs) {
if (_activeObjectNr && (!activeVerbPrep() || _activeObject2Nr))
return true;
}
return false;
}
void ScummEngine_v0::checkExecVerbs() { void ScummEngine_v0::checkExecVerbs() {
ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "checkExecVerbs"); ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "checkExecVerbs");
VirtScreen *zone = findVirtScreen(_mouse.y); VirtScreen *zone = findVirtScreen(_mouse.y);
@ -738,21 +746,28 @@ void ScummEngine_v0::checkExecVerbs() {
int sentenceLineChanged = false; int sentenceLineChanged = false;
bool execute = false; bool execute = false;
/* //if (_userPut <= 0)
if (_userPut <= 0 || _mouseAndKeyboardStat == 0) // return;
return;
*/
// Check if mouse click
if (_mouseAndKeyboardStat & MBS_MOUSE_MASK) { if (_mouseAndKeyboardStat & MBS_MOUSE_MASK) {
int over = findVerbAtPos(_mouse.x, _mouse.y); int over = findVerbAtPos(_mouse.x, _mouse.y);
if (over && _activeVerb != over) { // click region: verbs
_activeVerb = over; if (over) {
_activeObjectNr = 0; if (_activeVerb != over) { // new verb
_activeObjectType = 0; // keep first object if no preposition is used yet
_activeObject2Nr = 0; if (activeVerbPrep()) {
_activeObject2Type = 0; _activeObjectNr = 0;
sentenceLineChanged = true; _activeObjectType = 0;
}
_activeObject2Nr = 0;
_activeObject2Type = 0;
_activeVerb = over;
sentenceLineChanged = true;
} else {
// execute sentence if complete
if (checkSentenceComplete())
execute = true;
}
} }
} }
@ -770,6 +785,7 @@ void ScummEngine_v0::checkExecVerbs() {
if (_mouseAndKeyboardStat < MBS_MAX_KEY) { if (_mouseAndKeyboardStat < MBS_MAX_KEY) {
// TODO: check keypresses // TODO: check keypresses
} else if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK) || _activeVerb == kVerbWhatIs) { } else if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK) || _activeVerb == kVerbWhatIs) {
// click region: sentence line
if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) { if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
if (_activeVerb == kVerbNewKid) { if (_activeVerb == kVerbNewKid) {
if (_currentMode == kModeNormal) { if (_currentMode == kModeNormal) {
@ -787,13 +803,18 @@ void ScummEngine_v0::checkExecVerbs() {
} }
_activeVerb = kVerbWalkTo; _activeVerb = kVerbWalkTo;
return; return;
} else if (_activeVerb && _activeVerb != kVerbWalkTo && _activeVerb != kVerbWhatIs) { } else {
if (_activeObjectNr && (!activeVerbPrep() || _activeObject2Nr)) // execute sentence if complete
if (checkSentenceComplete())
execute = true; execute = true;
} }
} else { // click region: inventory or main screen
} else if ((zone->number == kVerbVirtScreen && _mouse.y > zone->topline + 32) ||
(zone->number == kMainVirtScreen))
{
int obj = 0; int obj = 0;
// click region: inventory
if (zone->number == kVerbVirtScreen && _mouse.y > zone->topline + 32) { if (zone->number == kVerbVirtScreen && _mouse.y > zone->topline + 32) {
// click into inventory // click into inventory
int invOff = _inventoryOffset; int invOff = _inventoryOffset;
@ -802,6 +823,7 @@ void ScummEngine_v0::checkExecVerbs() {
// inventory position changed (arrows pressed, do nothing) // inventory position changed (arrows pressed, do nothing)
return; return;
} }
// click region: main screen
} else if (zone->number == kMainVirtScreen) { } else if (zone->number == kMainVirtScreen) {
// click into main screen // click into main screen
if (_activeVerb == kVerbGive && _activeObjectNr) { if (_activeVerb == kVerbGive && _activeObjectNr) {