Merge branch 'master' of https://github.com/OpenDunga/gloomy

Author: tohhy

.gitignore

@@ -1,6 +1,7 @@
 !.classpath
 !.project
 *.jar
+*.ser
 bin/
 lib/
 *.ser

src/ggjsap2013/models/Stage.java

@@ -46,6 +46,7 @@ public void setLevel(int level) {
         MapModel levelMap = MapBuilder.create(this, levelInfoList.get(level));
         map.clear();
         map.mergeMap(levelMap.getArray());
+        snake.setDefaultMoveWait(levelInfoList.get(level).getGameSpeed());
     }
 
     public MapModel getMap() {

src/ggjsap2013/models/snake/SnakeModel.java

@@ -208,6 +208,7 @@ public int getDefaultMoveWait()
     public void setDefaultMoveWait(int defaultMoveWait)
 	{
 		this.defaultMoveWait = defaultMoveWait;
+		this.moveWait = defaultMoveWait;
 	}
 
     public int getMoveWait() {