Commit 40f19650 authored by Myriam Begel's avatar Myriam Begel
parents 7fe0badc 6537ac12
......@@ -26,8 +26,6 @@ public class GameOverPanel extends MenuPanel {
setTitlePanel("Game Over");
addToCentralColumn(sorryLabel,1,1);
addToCentralColumn(ButtonMaker.makeButton("Return to main menu", returnButtonActionListener),1,1);
GraphicsMasterAbstraction.getInstance().changeGUIStateTo(GraphicsMasterAbstraction.GUIStates.GAME_OVER);
}
private ActionListener returnButtonActionListener = new ActionListener() {
......
......@@ -42,7 +42,7 @@ public class GroundTileSprite extends TileSprite
animationSpriteTable[1][j] = new Sprite(sprite.getSubimage((4 * k + 1 + 2 * (i % 2) - (i / 2)) * TileSpriteWidth(), (6*j+2 + (i % 2) + 2 * (i / 2)) * TileSpriteHeight(), TileSpriteWidth(), TileSpriteHeight()));
animationSpriteTable[2][j] =new Sprite(sprite.getSubimage((4 * k + 2 * (i % 2) + (i / 2)) * TileSpriteWidth(), (6*j+3 - (i % 2) + 2 * (i / 2)) * TileSpriteHeight(), TileSpriteWidth(), TileSpriteHeight()));
animationSpriteTable[3][j] = new Sprite(sprite.getSubimage((4 * k + 2 + i % 2) * TileSpriteWidth(), (6*j+i / 2) * TileSpriteHeight(), TileSpriteWidth(), TileSpriteHeight()));
animationSpriteTable[4][j] = new Sprite(sprite.getSubimage((4 * k + 1 + i % 2) * TileSpriteWidth(), (6*j+3 + i / 2) * TileSpriteHeight(), TileSpriteWidth(), TileSpriteHeight()));
animationSpriteTable[4][j] = new Sprite(sprite.getSubimage((4 * k + 1 + (i+1) % 2) * TileSpriteWidth(), (6*j+ 4 - i / 2) * TileSpriteHeight(), TileSpriteWidth(), TileSpriteHeight()));
}
spriteTable[k][i] = new Animation(animationSpriteTable[0],animationDelay);
spriteTable[k][4+i] = new Animation(animationSpriteTable[1],animationDelay);
......@@ -62,7 +62,7 @@ public class GroundTileSprite extends TileSprite
spriteTable[k][4 + i] = new Sprite(sprite.getSubimage((4 * k + 1 + 2 * (i % 2) - (i / 2)) * TileSpriteWidth(), (2 + (i % 2) + 2 * (i / 2)) * TileSpriteHeight(), TileSpriteWidth(), TileSpriteHeight()));
spriteTable[k][8 + i] = new Sprite(sprite.getSubimage((4 * k + 2 * (i % 2) + (i / 2)) * TileSpriteWidth(), (3 - (i % 2) + 2 * (i / 2)) * TileSpriteHeight(), TileSpriteWidth(), TileSpriteHeight()));
spriteTable[k][12 + i] = new Sprite(sprite.getSubimage((4 * k + 2 + i % 2) * TileSpriteWidth(), (i / 2) * TileSpriteHeight(), TileSpriteWidth(), TileSpriteHeight()));
spriteTable[k][16 + i] = new Sprite(sprite.getSubimage((4 * k + 1 + i % 2) * TileSpriteWidth(), (3 + i / 2) * TileSpriteHeight(), TileSpriteWidth(), TileSpriteHeight()));
spriteTable[k][16 + i] = new Sprite(sprite.getSubimage((4 * k + 1 + (i+1) % 2) * TileSpriteWidth(), (4 - i / 2) * TileSpriteHeight(), TileSpriteWidth(), TileSpriteHeight()));
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment