summaryrefslogtreecommitdiff
path: root/src/actorspritemanager.h
AgeCommit message (Collapse)AuthorFilesLines
2010-09-25Merge branch '1.0'Thorbjørn Lindeijer1-2/+10
Conflicts: src/actorspritemanager.h src/beingmanager.cpp src/game.cpp src/gui/beingpopup.cpp src/gui/chat.cpp src/gui/chat.h src/gui/inventorywindow.h src/gui/itempopup.cpp src/gui/socialwindow.cpp src/gui/statuswindow.cpp src/gui/widgets/chattab.cpp src/gui/widgets/chattab.h src/net/tmwa/inventoryhandler.cpp src/net/tmwa/partyhandler.cpp src/party.cpp src/sound.cpp src/utils/stringutils.cpp src/utils/stringutils.h
2010-06-20Fix ActorSprite double deletionAndrei Karas1-1/+1
Also replaces std::list to std::set in actorspritemanager. Reviewed-by: Chuck Miller <shadowmil@gmail.com>
2010-06-10Merge BeingManager and FloorItemManager as ActorSpriteManagerJared Adams1-0/+163
No need for two different classes to manage ActorSprites. Reviewed-by: Chuck Miller