Merging 1.7.5 Source: actors/buffs changes

2015-01-30 17:16:05 -05:00
parent d50c566579
commit 9e79aab869
8 changed files with 82 additions and 38 deletions
@@ -18,9 +18,28 @@
 package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;

 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.utils.Bundle;

+//TODO: consider refactoring this
 public class SnipersMark extends FlavourBuff {
-	
+
+	public int object = 0;
+
+	private static final String OBJECT    = "object";
+
+	@Override
+	public void storeInBundle( Bundle bundle ) {
+		super.storeInBundle( bundle );
+		bundle.put( OBJECT, object );
+
+	}
+
+	@Override
+	public void restoreFromBundle( Bundle bundle ) {
+		super.restoreFromBundle( bundle );
+		object = bundle.getInt( OBJECT );
+	}
+
 	@Override
 	public int icon() {
 		return BuffIndicator.MARK;
@@ -28,6 +47,6 @@ public class SnipersMark extends FlavourBuff {
 	
 	@Override
 	public String toString() {
-		return "Sniper's mark";
+		return "Zeroed in";
 	}
 }