Merge remote-tracking branch 'origin/jimboy' into refactoring

Conflicts: src/MockGui.java - fixed!
djas · Apr 17, 2015 · 5fe7d33 · 5fe7d33
2 parents 02fb847 + 1cf4b22
commit 5fe7d33
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/MockGui.java b/src/MockGui.java
@@ -180,10 +180,10 @@ public void drawMinion(int x, int y, int health, Graphics g) {
 	public void drawMinion(MinionMock m, Graphics g)
 	{
 		g.drawImage(m.getSprite(), m.getX(), m.getY(), null);
-		String healthBar = String.format("[%s/%s]", m.getHealth(), m.getMaxHealth());
+		String h = String.format("[%s/%s]", m.getHealth(), m.getMaxHealth());
 		g.setColor(Color.RED);
-		g.drawString(healthBar, m.getX()-15, m.getY()-10);
-		//g.drawString(m.getName(), m.getX()-15, m.getY()+45);
+		g.drawString(h, m.getX()-15, m.getY()-10);
+		g.drawString(m.getName(), m.getX()-15, m.getY()+45);
 		//g.drawString(("V: " + m.getValue() + "\nD: " + m.getAttackDamage()), m.getX(), m.getY()+46);
 	}