diff options
| author | Max Horn | 2006-10-18 14:01:06 +0000 |
|---|---|---|
| committer | Max Horn | 2006-10-18 14:01:06 +0000 |
| commit | f51e01a0aa1fa89e381044f04dd7b1e3483b35f5 (patch) | |
| tree | 7b9b5a4055b9d7d770f8373dccc46784db5db655 /engines/scumm | |
| parent | dd7e4ff3e79f3d1cc48637d4da96e27fd12fa2de (diff) | |
| download | scummvm-rg350-f51e01a0aa1fa89e381044f04dd7b1e3483b35f5.tar.gz scummvm-rg350-f51e01a0aa1fa89e381044f04dd7b1e3483b35f5.tar.bz2 scummvm-rg350-f51e01a0aa1fa89e381044f04dd7b1e3483b35f5.zip | |
SCUMM: Yet another minox walkbox cleanup
svn-id: r24366
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/boxes.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/boxes.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp index 97ed73ec79..269eaf5893 100644 --- a/engines/scumm/boxes.cpp +++ b/engines/scumm/boxes.cpp @@ -89,7 +89,7 @@ struct Box { /* Internal walkbox file format */ static bool compareSlope(int X1, int Y1, int X2, int Y2, int X3, int Y3); static Common::Point closestPtOnLine(const Common::Point &start, const Common::Point &end, int x, int y); static uint distanceFromPt(int x, int y, int ptx, int pty); - +static void getGates(const BoxCoords &box1, const BoxCoords &box2, Common::Point gateA[2], Common::Point gateB[2]); byte ScummEngine::getMaskFromBox(int box) { // WORKAROUND for bug #740244 and #755863. This appears to have been a diff --git a/engines/scumm/boxes.h b/engines/scumm/boxes.h index f504420961..9803ad60b7 100644 --- a/engines/scumm/boxes.h +++ b/engines/scumm/boxes.h @@ -50,7 +50,6 @@ struct BoxCoords { /* Box coordinates */ Common::Point lr; }; -void getGates(const BoxCoords &box1, const BoxCoords &box2, Common::Point gateA[2], Common::Point gateB[2]); bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold); int getClosestPtOnBox(const BoxCoords &box, int x, int y, int16& outX, int16& outY); |