diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-07-29 17:46:40 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-07-29 17:46:40 -0400 |
| commit | d18cb4c622fbb0172b9618d8594953a32ccb88b2 (patch) | |
| tree | 4ea6ef72c4682aff081d4ce2ead763e437efd2bd /public/assets/javascripts/rectangles/models/room.js | |
| parent | 4388c9ce2ae680862adb8abaf9d5b34088591a81 (diff) | |
fix wall clamping bug
Diffstat (limited to 'public/assets/javascripts/rectangles/models/room.js')
| -rw-r--r-- | public/assets/javascripts/rectangles/models/room.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js index e5f42fe..32549e9 100644 --- a/public/assets/javascripts/rectangles/models/room.js +++ b/public/assets/javascripts/rectangles/models/room.js @@ -14,6 +14,8 @@ sort = require('../util/sort') FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20 TOP = CEILING, BOTTOM = FLOOR + FRONT_BACK = FRONT | BACK + LEFT_RIGHT = LEFT | RIGHT function sidesToString(sides){ var s = "" if (sides & FRONT) s += "front " @@ -238,12 +240,12 @@ if (contains_x) { collision |= wall_collision & FRONT_BACK } - else if (contains_y) { + if (contains_y) { collision |= wall_collision & LEFT_RIGHT } - else if (bitcount(wall_collision) > 1) { - collision |= wall_collision - } +// if (bitcount(wall_collision) > 1) { +// collision |= wall_collision +// } }) return collision } |