From afb0ada00a2c50ea541ba6dc93058ccdb0286cdd Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Tue, 3 May 2016 08:49:01 -0400
Subject: ortho snapping, reset option

---
 src/mob.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/mob.cpp')

diff --git a/src/mob.cpp b/src/mob.cpp
index 1829240..6ce46ab 100644
--- a/src/mob.cpp
+++ b/src/mob.cpp
@@ -310,6 +310,8 @@ Mob::~Mob()
 }
 
 extern World *currentWorld;
+extern Arena *arena;
+
 void Mob::wander(void)
 {
 	static bool YAYA = false;
@@ -320,16 +322,12 @@ void Mob::wander(void)
     if (aggressive && !YAYA && isInside(vec2 {player->loc.x + width / 2, player->loc.y + height / 4})) {
 		if (!ui::dialogBoxExists) {
             std::thread([&](void){
-			    auto *a = new Arena(currentWorld, player, this);
-			    a->setStyle("");
-			    a->setBackground(WorldBGType::Forest);
-			    a->setBGM("assets/music/embark.wav");
-
+			    arena->fight(currentWorld, player, this);
 			    ui::toggleWhiteFast();
 			    YAYA = true;
 			    ui::waitForCover();
 			    YAYA = false;
-			    currentWorld = a;
+			    currentWorld = arena;
 			    ui::toggleWhiteFast();
             }).detach();
 		}
-- 
cgit v1.2.3