Fixed bug with resetting player's location.

gal11002 · Apr 11, 2015 · 01a8d5a · 01a8d5a
1 parent 11f465d
commit 01a8d5a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/MerchantRPGCSE2102/src/controller/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java
@@ -275,11 +275,10 @@ public static void main(String[] args) throws InterruptedException
 		ArrayList<String> playerInventory = _rpg.getMerchantInventoryList(1);
 		playerInventory.addAll(_rpg.getMerchantInventoryList(2));
 		playerInventory.addAll(_rpg.getMerchantInventoryList(3));
-		_rpg.buildPlayer("test", 500, playerInventory);
-		_rpg.getPlayer().getItem("armor").increaseQuantity(15);
+		_rpg.buildPlayer("test", 500, playerInventory);
 
 
-	// SETTING UP PLAYER AND MERCHANT
+			// SETTING UP PLAYER AND MERCHANT
 			Player player = new Player("Player", 0, null);
 			Merchant merch1 = new Merchant("Bill", 0, null); 
 			Merchant merch2 = new Merchant("Joe", 0, null); 

diff --git a/MerchantRPGCSE2102/src/sprites/PlayerSprite.java b/MerchantRPGCSE2102/src/sprites/PlayerSprite.java
@@ -177,6 +177,9 @@ public void move() {
 	public void resetLocation() {
 		x = initialX;
 		y = initialY;
+		changeInX = 15;
+		changeInY = 15;
+
 	}
 
 	/**