diff options
| author | Max Horn | 2004-09-26 07:30:29 +0000 |
|---|---|---|
| committer | Max Horn | 2004-09-26 07:30:29 +0000 |
| commit | cc7ca9ce4bb071a6d220b945b08a971249e6e892 (patch) | |
| tree | 57d1117ea6ce81abf426a6a53d761e4e53b8f2b6 /scumm/verbs.cpp | |
| parent | a53d6ebcf09842466e88465fde22383deb55a5b9 (diff) | |
| download | scummvm-rg350-cc7ca9ce4bb071a6d220b945b08a971249e6e892.tar.gz scummvm-rg350-cc7ca9ce4bb071a6d220b945b08a971249e6e892.tar.bz2 scummvm-rg350-cc7ca9ce4bb071a6d220b945b08a971249e6e892.zip | |
some more pointless cleanup / moving around of stuff :-)
svn-id: r15284
Diffstat (limited to 'scumm/verbs.cpp')
| -rw-r--r-- | scumm/verbs.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp index d65dc2e46e..91b0d7438b 100644 --- a/scumm/verbs.cpp +++ b/scumm/verbs.cpp @@ -22,6 +22,7 @@ #include "stdafx.h" #include "scumm/charset.h" +#include "scumm/intern.h" #include "scumm/object.h" #include "scumm/resource.h" #include "scumm/scumm.h" @@ -35,7 +36,7 @@ enum { kSentenceLine = 6 }; -void ScummEngine::initV2MouseOver() { +void ScummEngine_v2::initV2MouseOver() { int i; int arrow_color, color, hi_color; @@ -266,7 +267,7 @@ void ScummEngine::redrawVerbs() { int i, verb = 0; if (_cursor.state > 0) - verb = checkMouseOver(_mouse.x, _mouse.y); + verb = findVerbAtPos(_mouse.x, _mouse.y); for (i = _numVerbs-1; i >= 0; i--) { if (i == verb && _verbs[verb].hicolor) @@ -308,7 +309,7 @@ void ScummEngine::checkExecVerbs() { // Click into V2 inventory checkV2Inventory(_mouse.x, _mouse.y); } else { - over = checkMouseOver(_mouse.x, _mouse.y); + over = findVerbAtPos(_mouse.x, _mouse.y); if (over != 0) { // Verb was clicked runInputScript(1, _verbs[over].verbid, code); @@ -342,7 +343,7 @@ void ScummEngine::verbMouseOver(int verb) { } } -int ScummEngine::checkMouseOver(int x, int y) const { +int ScummEngine::findVerbAtPos(int x, int y) const { if (!_numVerbs) return 0; |