diff options
| author | Max Horn | 2003-05-09 22:26:00 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-09 22:26:00 +0000 |
| commit | 54a9ad3204140aba204474d186058db627b2584d (patch) | |
| tree | a4adfac9417bfa76f68c3a01348da93eb46979e7 | |
| parent | 18e1c5a80ad4f653fb597f948235ea8bfd77bb4f (diff) | |
| download | scummvm-rg350-54a9ad3204140aba204474d186058db627b2584d.tar.gz scummvm-rg350-54a9ad3204140aba204474d186058db627b2584d.tar.bz2 scummvm-rg350-54a9ad3204140aba204474d186058db627b2584d.zip | |
super hackish mouse click support for Zak (doesn't do anything useful in MM yet; and in Zak, all clicks are for the scene, i.e. no verb clicks etc.)
svn-id: r7408
| -rw-r--r-- | scumm/charset.cpp | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 8 | ||||
| -rw-r--r-- | scumm/verbs.cpp | 8 |
3 files changed, 16 insertions, 2 deletions
diff --git a/scumm/charset.cpp b/scumm/charset.cpp index 0099031dd3..487ce33fd5 100644 --- a/scumm/charset.cpp +++ b/scumm/charset.cpp @@ -324,8 +324,6 @@ static byte charsetDataV2[] = { }; void CharsetRendererV2::setCurID(byte id) { - printf("CharsetRendererV2::setCurID(%d)\n", id); - _nbChars = charsetDataV2[6]; _widthTable = charsetDataV2 + 8; _fontPtr = charsetDataV2 + 8 + _nbChars; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 79ba18550f..9e41275a23 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1029,6 +1029,14 @@ load_game: clearClickedStatus(); } +#if 1 + // FIXME - MM / Zak hack + if ((_features & GF_AFTER_V2) && (_mouseButStat & MBS_LEFT_CLICK)) { + _scummVars[32] = 2; + printf("mouse click\n"); + } +#endif + if (!_verbRedraw && _cursor.state > 0) { verbMouseOver(checkMouseOver(mouse.x, mouse.y)); } diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp index 067874eec6..53b217903f 100644 --- a/scumm/verbs.cpp +++ b/scumm/verbs.cpp @@ -43,6 +43,14 @@ 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; |