From 7962fbec19d49e717bd25c195d0e06240b017dc3 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Sat, 27 Aug 2011 21:07:38 -0300 Subject: [PATCH] change some deque to vectors --- src/framework/ui/declarations.h | 1 - src/otclient/core/map.cpp | 2 +- src/otclient/core/tile.h | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/framework/ui/declarations.h b/src/framework/ui/declarations.h index 5730e00a..ee5808a0 100644 --- a/src/framework/ui/declarations.h +++ b/src/framework/ui/declarations.h @@ -26,6 +26,5 @@ typedef std::shared_ptr UIVerticalLayoutPtr; typedef std::shared_ptr UIAnchorLayoutPtr; typedef std::deque UIWidgetList; -typedef std::deque UIWeakWidgetList; #endif diff --git a/src/otclient/core/map.cpp b/src/otclient/core/map.cpp index 2f21c6ff..d78458e1 100644 --- a/src/otclient/core/map.cpp +++ b/src/otclient/core/map.cpp @@ -86,7 +86,7 @@ void Map::draw(const Rect& rect) for(int iy = -5; iy <= 5; ++iy) { Position itemPos = Position(playerPos.x + ix, playerPos.y + iy, playerPos.z); if(const TilePtr& tile = m_tiles[itemPos]) { - std::deque creatures = tile->getCreatures(); + std::vector creatures = tile->getCreatures(); for(auto it = creatures.rbegin(), end = creatures.rend(); it != end; ++it) { const ThingPtr& thing = *it; const CreaturePtr& creature = thing->asCreature(); diff --git a/src/otclient/core/tile.h b/src/otclient/core/tile.h index b76d73d0..e42687b5 100644 --- a/src/otclient/core/tile.h +++ b/src/otclient/core/tile.h @@ -22,15 +22,15 @@ public: int getStackSize(int stop); - std::deque getCreatures() { return m_creatures; } + std::vector getCreatures() { return m_creatures; } int getDrawNextOffset() { return m_drawNextOffset; } private: ThingPtr m_ground; - std::deque m_itemsBottom; - std::deque m_creatures; - std::deque m_itemsTop; - std::deque m_effects; + std::vector m_itemsBottom; + std::vector m_creatures; + std::vector m_itemsTop; + std::vector m_effects; int m_drawNextOffset; };