junglejourney

changeset 240:42c8701f4bc7 1.1.4

find changesets by author, revision, files, or words in the commit message
Fixed an error in a collision detection mask, as reported by Kees.
author David Boddie <david@boddie.org.uk>
date Thu Oct 11 19:58:04 2012 +0200
parents 7d86294c2ad1
children 2fbbf90956db
files documents/collisions.txt mapcode.oph
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line diff
     1.1 --- a/documents/collisions.txt	Thu Oct 11 19:53:34 2012 +0200
     1.2 +++ b/documents/collisions.txt	Thu Oct 11 19:58:04 2012 +0200
     1.3 @@ -58,7 +58,7 @@
     1.4  above:                  above:                  above:
     1.5  dy: 0   11100000 $e0    dy: 0   1111?000 $f8    dy: 0   11111111 $ff
     1.6      1   00111000 $38        1   0011111? $3f        1   00111111 $3f
     1.7 -    2   00001110 $e0        2   00001111 $0f        2   00001111 $0f
     1.8 +    2   00001110 $0e        2   00001111 $0f        2   00001111 $0f
     1.9      3   00000011 $03        3   00000011 $03        3   00000011 $03
    1.10  
    1.11  below:                  below:

     2.1 --- a/mapcode.oph	Thu Oct 11 19:53:34 2012 +0200
     2.2 +++ b/mapcode.oph	Thu Oct 11 19:58:04 2012 +0200
     2.3 @@ -4074,7 +4074,7 @@
     2.4  ; Player and enemy share the same tile or player is on the tile below.
     2.5  player_collision_mask_below:  .byte $ff, $3f, $0f, $03
     2.6  
     2.7 -projectile_collision_mask_below: .byte $e0, $38, $e0, $03
     2.8 +projectile_collision_mask_below: .byte $e0, $38, $0e, $03
     2.9  
    2.10  ; Player is above or on the same tile, enemy is below, checking the overlap in
    2.11  ; the lower tile.