From 971e421fa1de245ecd564106c43e2e298ed22af9 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Fri, 26 Apr 2019 16:48:50 -0400
Subject: [PATCH] v0.7.2d: moved the base halo class to SPD-classes

---
 .../src/main/java/com/watabou/noosa}/Halo.java            | 8 ++------
 .../shatteredpixeldungeon/effects/ShieldHalo.java         | 1 +
 .../shatteredpixeldungeon/effects/TorchHalo.java          | 1 +
 .../shatteredpixeldungeon/levels/PrisonLevel.java         | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename {core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects => SPD-classes/src/main/java/com/watabou/noosa}/Halo.java (87%)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java b/SPD-classes/src/main/java/com/watabou/noosa/Halo.java
similarity index 87%
rename from core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java
rename to SPD-classes/src/main/java/com/watabou/noosa/Halo.java
index 0170d07b7..5ee89882d 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Halo.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/Halo.java
@@ -8,7 +8,7 @@
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *  (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,18 +19,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-package com.shatteredpixel.shatteredpixeldungeon.effects;
+package com.watabou.noosa;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 
-import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
 import com.watabou.gltextures.SmartTexture;
 import com.watabou.gltextures.TextureCache;
-import com.watabou.noosa.Image;
 
-//TODO externalize bitmap stuff to SPD-classes
 public class Halo extends Image {
 	
 	private static final Object CACHE_KEY = Halo.class;
@@ -69,7 +66,6 @@ public class Halo extends Image {
 	public Halo point( float x, float y ) {
 		this.x = x - (width()/2f);
 		this.y = y - (height()/2f);
-		PixelScene.align(this);
 		return this;
 	}
 	
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/ShieldHalo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/ShieldHalo.java
index 473bf3feb..251c3925f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/ShieldHalo.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/ShieldHalo.java
@@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.effects;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.watabou.glwrap.Blending;
 import com.watabou.noosa.Game;
+import com.watabou.noosa.Halo;
 import com.watabou.utils.PointF;
 
 public class ShieldHalo extends Halo {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java
index 81697b960..bc3621ed1 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/TorchHalo.java
@@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.effects;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.watabou.glwrap.Blending;
 import com.watabou.noosa.Game;
+import com.watabou.noosa.Halo;
 
 public class TorchHalo extends Halo {
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java
index f3d3763e7..f86fd22ae 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java
@@ -24,7 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker;
-import com.shatteredpixel.shatteredpixeldungeon.effects.Halo;
+import com.watabou.noosa.Halo;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle;
 import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
 import com.shatteredpixel.shatteredpixeldungeon.levels.painters.PrisonPainter;