Fixed merge conflicts

2018-03-08 01:02:22 +01:00
parent 6dea376195 858b4dfbc2
commit 2e50452a22
10 changed files with 240 additions and 36 deletions
--- a/src/inf101/v18/rogue101/game/Game.java
+++ b/src/inf101/v18/rogue101/game/Game.java
@@ -85,7 +85,7 @@ public class Game implements IGame {

 	public Game(String mapString) {
 		printer = new Printer(1280, 720);
-		painter = new TurtlePainter(1280, 720, null);
+		painter = new TurtlePainter(1280, 720);

 		addFactory();