Skip to content

Commit

Permalink
Merge branch 'master' of github.com:basicallydan/skifree.js into gh-p…
Browse files Browse the repository at this point in the history
…ages
  • Loading branch information
basicallydan committed Feb 14, 2013
2 parents 921d058 + 1bbc524 commit 8392f48
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,11 @@ function drawScene (images) {
}
});

/* staticObjects.onPush(function (obj) {
staticObjects.onPush(function (obj) {
if (obj.data.hitBehaviour.monster) {
obj.onHitting(newMonster, obj.data.hitBehaviour.monster);
}
});*/
});

monsters.push(newMonster);
}
Expand Down

0 comments on commit 8392f48

Please sign in to comment.