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

Cleanup

Browse source 
svn-id: r7598
This commit is contained in:
James Brown 2003-05-17 06:14:08 +00:00
parent 99b26a5684
commit 2813d48e92
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/scumm.h
View file

@ -1149,6 +1149,8 @@ public:
byte VAR_CUSTOMSCALETABLE;
byte VAR_V6_SOUNDMODE;
byte VAR_CLICK_AREA;
};
// This is a constant lookup table of reverse bit masks

8
scumm/scummvm.cpp
View file

@ -1853,9 +1853,7 @@ int Scumm::getKeyInput() {
VAR(VAR_MOUSE_HOLD) += 2;
}
} else if (_features & GF_AFTER_V7) {
// VAR(VAR_LEFTBTN_DOWN) = (_leftBtnPressed&msClicked) != 0;
VAR(VAR_LEFTBTN_HOLD) = (_leftBtnPressed & msDown) != 0;
// VAR(VAR_RIGHTBTN_DOWN) = (_rightBtnPressed&msClicked) != 0;
VAR(VAR_RIGHTBTN_HOLD) = (_rightBtnPressed & msDown) != 0;
} else if (_features & GF_AFTER_V2) {
// Store the input type. So far we can't distinguise
@ -1867,12 +1865,12 @@ int Scumm::getKeyInput() {
VirtScreen *zone = findVirtScreen(_mouse.y);
if (zone->number == 0) // Clicked in scene
_scummVars[32] = 2;
_scummVars[VAR_CLICK_AREA] = 2;
else if (zone->number == 2) // Clicked in verb/sentence
_scummVars[32] = 1;
_scummVars[VAR_CLICK_AREA] = 1;
} else if (_lastKeyHit) // Key Input
_scummVars[32] = 4;
_scummVars[VAR_CLICK_AREA] = 4;
}
_leftBtnPressed &= ~msClicked;

1
scumm/vars.cpp
View file

@ -123,6 +123,7 @@ void Scumm_v2::setupScummVars() {
VAR_SENTENCE_OBJECT2 = 28;
VAR_VIRT_MOUSE_X = 30;
VAR_VIRT_MOUSE_Y = 31;
VAR_CLICK_AREA = 32;
VAR_ROOM_RESOURCE = 36;
VAR_LAST_SOUND = 37;
VAR_KEYPRESS = 39;

17
scumm/verbs.cpp
View file

@ -43,14 +43,6 @@ void Scumm::checkExecVerbs() {
int i, over;
VerbSlot *vs;
#if 1
// FIXME - MM / Zak hack
if ((_features & GF_AFTER_V2) && (_mouseButStat & MBS_LEFT_CLICK)) {
printf("Running script 4\n");
runScript(4, 0, 0, 0);
}
#endif
if (_userPut <= 0 || _mouseButStat == 0)
return;
@ -86,6 +78,15 @@ void Scumm::checkExecVerbs() {
runInputScript(1, over != 0 ? _verbs[over].verbid : 0, code);
}
}
#if 1
// FIXME - MM / Zak hack
if ((_features & GF_AFTER_V2) && (_mouseButStat & MBS_LEFT_CLICK)) {
printf("Running script 4\n");
runScript(4, 0, 0, 0);
}
#endif
}
void Scumm::verbMouseOver(int verb) {