[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] [pingus] push by address@hidden - Minor name cleanup on 201
From: |
pingus |
Subject: |
[Pingus-CVS] [pingus] push by address@hidden - Minor name cleanup on 2011-09-09 15:20 GMT |
Date: |
Fri, 09 Sep 2011 15:37:41 +0000 |
Revision: caa97f236401
Author: Ingo Ruhnke <address@hidden>
Date: Fri Sep 9 08:20:46 2011
Log: Minor name cleanup
http://code.google.com/p/pingus/source/detail?r=caa97f236401
Modified:
/src/pingus/resource_manager.cpp
/src/pingus/resource_manager.hpp
=======================================
--- /src/pingus/resource_manager.cpp Fri Sep 9 08:12:52 2011
+++ /src/pingus/resource_manager.cpp Fri Sep 9 08:20:46 2011
@@ -27,9 +27,9 @@
#include "util/system.hpp"
ResourceManager::ResourceManager() :
- resources(),
+ m_cache(),
m_resources(),
- aliases()
+ m_aliases()
{
}
@@ -41,7 +41,7 @@
ResourceManager::get_section(const std::string& name)
{
std::vector<std::string> lst;
- for (auto i = resources.begin(); i != resources.end(); ++i)
+ for (auto i = m_cache.begin(); i != m_cache.end(); ++i)
{
if (StringUtil::has_prefix(i->first, name))
{
@@ -124,7 +124,7 @@
if (!section.empty())
name = section + "/" + name;
- resources[name].reset(new SpriteDescription(reader));
+ m_cache[name].reset(new SpriteDescription(reader));
}
else if (reader.get_name() == "alias")
{
@@ -134,7 +134,7 @@
reader.read_string("link", link))
{
//log_info("alias: " << name << " -> " << link);
- aliases[name] = link;
+ m_aliases[name] = link;
}
}
else if (reader.get_name() == "name")
@@ -214,8 +214,8 @@
SpriteDescription*
ResourceManager::get_sprite_description(const std::string& name)
{
- Resources::const_iterator i = resources.find(name);
- if (i != resources.end())
+ auto i = m_cache.find(name);
+ if (i != m_cache.end())
{
return i->second.get();
}
@@ -224,13 +224,13 @@
SpriteDescriptionPtr desc = get_sprite_description_from_file(name);
if (desc)
{
- resources[name] = desc;
+ m_cache[name] = desc;
return desc.get();
}
else
{
- Aliases::const_iterator j = aliases.find(name);
- if (j != aliases.end())
+ auto j = m_aliases.find(name);
+ if (j != m_aliases.end())
{
log_warn("using alias \"" << j->first << "\" -> \"" << j->second
<< "\"");
return get_sprite_description(j->second);
=======================================
--- /src/pingus/resource_manager.hpp Fri Sep 9 08:12:52 2011
+++ /src/pingus/resource_manager.hpp Fri Sep 9 08:20:46 2011
@@ -34,9 +34,9 @@
typedef std::map<std::string, std::string> Aliases;
private:
- Resources resources;
+ Resources m_cache;
std::set<std::string> m_resources;
- Aliases aliases;
+ Aliases m_aliases;
public:
ResourceManager();
@@ -51,8 +51,9 @@
std::vector<std::string> get_section(const std::string& name);
- const Resources& get_resources() const { return resources; }
- const Aliases& get_aliases() const { return aliases; }
+ // FIXME: used by extra/resource-convert, obsolete now
+ const Resources& get_resources() const { return m_cache; }
+ const Aliases& get_aliases() const { return m_aliases; }
private:
void parse(const std::string& section, FileReader&);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] [pingus] push by address@hidden - Minor name cleanup on 2011-09-09 15:20 GMT,
pingus <=