diff options
| author | Max Horn | 2003-05-20 20:42:28 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-20 20:42:28 +0000 |
| commit | 1a394aa3c764c8a50def5bb9d8aa1342d962fbdd (patch) | |
| tree | fc456ba99a56a6b594cc4817807a59531af2ecd2 /scumm/boxes.cpp | |
| parent | 410f8b48264ed9fd02f0d18d462d74a67688f9fa (diff) | |
| download | scummvm-rg350-1a394aa3c764c8a50def5bb9d8aa1342d962fbdd.tar.gz scummvm-rg350-1a394aa3c764c8a50def5bb9d8aa1342d962fbdd.tar.bz2 scummvm-rg350-1a394aa3c764c8a50def5bb9d8aa1342d962fbdd.zip | |
added enum's for the known actor/object claasses; extended putClass/getClass to translate the X/Y flip classes; made code use the new enum's; some other cleanup
svn-id: r7753
Diffstat (limited to 'scumm/boxes.cpp')
| -rw-r--r-- | scumm/boxes.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp index 30cf6e9f98..a7acd0c139 100644 --- a/scumm/boxes.cpp +++ b/scumm/boxes.cpp @@ -280,7 +280,7 @@ int Scumm::getSpecialBox(int x, int y) { bool Scumm::checkXYInBoxBounds(int b, int x, int y) { BoxCoords box; - if (b < 0 || b == Actor::INVALID_BOX) + if (b < 0 || b == Actor::kInvalidBox) return false; getBoxCoordinates(b, &box); @@ -571,10 +571,10 @@ int Scumm::getPathToDestBox(byte from, byte to) { if (from == to) return to; - if (to == Actor::INVALID_BOX) + if (to == Actor::kInvalidBox) return -1; - if (from == Actor::INVALID_BOX) + if (from == Actor::kInvalidBox) return to; assert(from < numOfBoxes); |