Permalink
Browse files

Merge branch 'master' of git://github.com/ACM-Game-Jam-2012/STZ

  • Loading branch information...
2 parents 627df8c + f2c6df8 commit ead8c9b650741d819f4dd1a0a1f930d053994630 @ramielrowe ramielrowe committed Apr 8, 2012
Showing with 2 additions and 3 deletions.
  1. +1 −1 resources/maps/level8.tmx
  2. +1 −2 src/com/vulcastudios/states/TransitionState.java
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" width="64" height="48" tilewidth="16" tileheight="16">
<properties>
- <property name="par" value="1"/>
+ <property name="par" value="3"/>
</properties>
<tileset firstgid="1" name="tileset-blackvolution" tilewidth="16" tileheight="16">
<image source="tileset-blackvolution.png" width="128" height="1472"/>
@@ -26,6 +26,7 @@ public void init(GameContainer container, StateBasedGame game)
@Override
public void render(GameContainer container, StateBasedGame game, Graphics g)
throws SlickException {
+ ((TestGame)game).getCurrentLevel().render(container, game, g);
double seconds = finalTime / 1000.0;
g.drawString("Final Time: " + seconds + " seconds", 50, 50);
@@ -37,8 +38,6 @@ public void render(GameContainer container, StateBasedGame game, Graphics g)
else{
g.drawString("The Game Is Done!", 50, 150);
}
-
- ((TestGame)game).getCurrentLevel().render(container, game, g);
}
@Override

0 comments on commit ead8c9b

Please sign in to comment.