Navigation Menu

Skip to content

Commit

Permalink
Add another entity to try to reproduce a zordering bug I noticed earl…
Browse files Browse the repository at this point in the history
…ier.
  • Loading branch information
grickit committed Jul 7, 2012
1 parent 5147dba commit b23242e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 1 addition & 2 deletions source/functions.js
Expand Up @@ -15,7 +15,7 @@ function manhattanDistance(x, y, x2, y2) {
return Math.abs(x2 - x) + Math.abs(y2 - y);
}

function tileTransitionSet(tileSet,code,clipto,clipfrom,overlays,imageURL) {
function tileTransitionSet(tileSet,code,imageURL) {
tileSet.add({code: code+'-conv-tl',sprite: new Sprite({imageURL: imageURL,x: 17,y: 0})});
tileSet.add({code: code+'-conv-tr',sprite: new Sprite({imageURL: imageURL,x: 34,y: 0})});
tileSet.add({code: code+'-conv-bl',sprite: new Sprite({imageURL: imageURL,x: 17,y: 17})});
Expand Down Expand Up @@ -86,7 +86,6 @@ function ajaxGetRequest(url) {
}

function characterSheet(imageURL, x, y, width, height) {
imageURL = imageURL;
x = (x == undefined)? 0 : x;
y = (y == undefined)? 0 : y;
width = (width == undefined)? 64 : width;
Expand Down
1 change: 1 addition & 0 deletions source/main.js
Expand Up @@ -60,6 +60,7 @@ function start() {
game.currentMap = mapone;

testEnt = new EntityLiving({ name: 'testEnt', x: 5, y: 5, sprites: characterSheet('characters/kantopokemon',780,1032)});
gengar = new EntityLiving({ name: 'gengar', x: 5, y: 4, sprites: characterSheet('characters/kantopokemon',325,774)});
game.viewport.tracking = testEnt;

game.on_tick.subscribe(function(){
Expand Down

0 comments on commit b23242e

Please sign in to comment.