From ccafb75577f9ea8f86243d26e80fb60e56af12d1 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 9 Jun 2010 18:13:06 -0600
Subject: Merge BeingManager and FloorItemManager as ActorSpriteManager

No need for two different classes to manage ActorSprites.

Reviewed-by: Chuck Miller
---
 src/gui/popupmenu.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/gui/popupmenu.cpp')

diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 0dae4f4b..76569d38 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -21,8 +21,8 @@
 
 #include "gui/popupmenu.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "flooritem.h"
 #include "graphics.h"
 #include "item.h"
@@ -199,7 +199,7 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
 
 void PopupMenu::handleLink(const std::string &link)
 {
-    Being *being = beingManager->findBeing(mBeingId);
+    Being *being = actorSpriteManager->findBeing(mBeingId);
 
     // Talk To action
     if (link == "talk" && being && being->canTalk())
-- 
cgit v1.2.3-70-g09d2