459 changes: 0 additions & 459 deletions data/data/pingus-player1.res

This file was deleted.

363 changes: 0 additions & 363 deletions data/data/pingus-player1.xml

This file was deleted.

459 changes: 0 additions & 459 deletions data/data/pingus-player2.res

This file was deleted.

363 changes: 0 additions & 363 deletions data/data/pingus-player2.xml

This file was deleted.

459 changes: 0 additions & 459 deletions data/data/pingus-player3.res

This file was deleted.

363 changes: 0 additions & 363 deletions data/data/pingus-player3.xml

This file was deleted.

33 changes: 0 additions & 33 deletions data/data/special.res

This file was deleted.

78 changes: 0 additions & 78 deletions data/data/story.res

This file was deleted.

60 changes: 0 additions & 60 deletions data/data/story.xml

This file was deleted.

172 changes: 0 additions & 172 deletions data/data/textures.res

This file was deleted.

124 changes: 0 additions & 124 deletions data/data/textures.xml

This file was deleted.

89 changes: 0 additions & 89 deletions data/data/traps.res

This file was deleted.

74 changes: 0 additions & 74 deletions data/data/traps.xml

This file was deleted.

36 changes: 0 additions & 36 deletions data/data/worldmaps.res

This file was deleted.

34 changes: 0 additions & 34 deletions data/data/worldmaps.xml

This file was deleted.

92 changes: 0 additions & 92 deletions data/data/worldobjs.res

This file was deleted.

64 changes: 0 additions & 64 deletions data/data/worldobjs.xml

This file was deleted.

28 changes: 0 additions & 28 deletions extra/aliases2sed.cpp

This file was deleted.

144 changes: 0 additions & 144 deletions extra/resource-convert.cpp

This file was deleted.

28 changes: 1 addition & 27 deletions src/engine/display/sprite_description.hpp
Expand Up @@ -46,6 +46,7 @@ class SpriteDescription
Vector2i frame_pos;
Size frame_size;

public:
SpriteDescription() :
filename(),
offset(),
Expand All @@ -57,33 +58,6 @@ class SpriteDescription
frame_size(-1, -1)
{}

SpriteDescription(const FileReader& reader) :
filename(),
offset(),
origin(origin_top_left),
loop(true),
speed(100),
array(1, 1),
frame_pos(),
frame_size(-1, -1)
{
reader.read_int ("speed", speed);
reader.read_bool ("loop", loop);
reader.read_vector2i("offset", offset);

reader.read_enum("origin", origin, string2origin);

if (!reader.read_path("image-file", filename))
{
log_error(reader.get_name() << " 'image-file' missing");
}

filename = Pathname("data/" + filename.get_raw_path(), filename.get_type()); // FIXME: Hack
reader.read_size("image-array", array);
reader.read_vector2i("image-pos", frame_pos);
reader.read_size("image-size", frame_size);
}

~SpriteDescription()
{
}
Expand Down
30 changes: 0 additions & 30 deletions src/pingus/resource.cpp
Expand Up @@ -28,39 +28,9 @@ ResourceManager Resource::resmgr;
void
Resource::init(bool load_obsolete)
{
if (load_obsolete)
{
resmgr.add_resources(g_path_manager.complete("data/core.res"));
resmgr.add_resources(g_path_manager.complete("data/entrances.res"));
resmgr.add_resources(g_path_manager.complete("data/exits.res"));
resmgr.add_resources(g_path_manager.complete("data/game.res"));
resmgr.add_resources(g_path_manager.complete("data/special.res"));
resmgr.add_resources(g_path_manager.complete("data/groundpieces-bridge.res"));
resmgr.add_resources(g_path_manager.complete("data/groundpieces-ground.res"));
resmgr.add_resources(g_path_manager.complete("data/groundpieces-remove.res"));
resmgr.add_resources(g_path_manager.complete("data/groundpieces-solid.res"));
resmgr.add_resources(g_path_manager.complete("data/groundpieces-transparent.res"));
resmgr.add_resources(g_path_manager.complete("data/hotspots.res"));
resmgr.add_resources(g_path_manager.complete("data/liquids.res"));
resmgr.add_resources(g_path_manager.complete("data/pingus-player0.res"));
resmgr.add_resources(g_path_manager.complete("data/pingus-player1.res"));
resmgr.add_resources(g_path_manager.complete("data/pingus-player2.res"));
resmgr.add_resources(g_path_manager.complete("data/pingus-player3.res"));
resmgr.add_resources(g_path_manager.complete("data/pingus-common.res"));
resmgr.add_resources(g_path_manager.complete("data/particles.res"));
resmgr.add_resources(g_path_manager.complete("data/story.res"));
resmgr.add_resources(g_path_manager.complete("data/textures.res"));
resmgr.add_resources(g_path_manager.complete("data/traps.res"));
resmgr.add_resources(g_path_manager.complete("data/worldmaps.res"));
resmgr.add_resources(g_path_manager.complete("data/worldobjs.res"));
}

resmgr.add_resources_from_directory(Pathname("images", Pathname::DATA_PATH));
resmgr.add_resources(g_path_manager.complete("data/alias.res"));
}

// Returns all resources in the given section

void
Resource::deinit()
{
Expand Down
106 changes: 2 additions & 104 deletions src/pingus/resource_manager.cpp
Expand Up @@ -28,8 +28,7 @@

ResourceManager::ResourceManager() :
m_cache(),
m_resources(),
m_aliases()
m_resources()
{
}

Expand All @@ -40,15 +39,7 @@ ResourceManager::~ResourceManager()
std::vector<std::string>
ResourceManager::get_section(const std::string& name)
{
// FIXME: completely wrong!!
std::vector<std::string> lst;
for (auto i = m_cache.begin(); i != m_cache.end(); ++i)
{
if (StringUtil::has_prefix(i->first, name))
{
lst.push_back(i->first);
}
}

for (auto i = m_resources.begin(); i != m_resources.end(); ++i)
{
Expand All @@ -61,37 +52,6 @@ ResourceManager::get_section(const std::string& name)
return lst;
}

void
ResourceManager::add_resources(const std::string& filename)
{
log_info(filename);

std::shared_ptr<lisp::Lisp> sexpr = lisp::Parser::parse(filename);
if (sexpr)
{
SExprFileReader reader(sexpr->get_list_elem(0));

if (reader.get_name() == "pingus-resources")
{
std::vector<FileReader> sections = reader.get_sections();
for(std::vector<FileReader>::iterator i = sections.begin(); i != sections.end(); ++i)
{
//log_info("Section: " << i->get_name());
parse("", *i);
}
}
else
{
log_error("couldn't find section 'pingus-resources' section in file " << filename
<< "\ngot " << reader.get_name());
}
}
else
{
log_info("ResourceManager: File not found " << filename);
}
}

void
ResourceManager::add_resources_from_directory(const Pathname& path)
{
Expand All @@ -111,59 +71,6 @@ ResourceManager::add_resources_from_directory(const Pathname& path)
}
}

void
ResourceManager::parse(const std::string& section, FileReader& reader)
{
if (reader.get_name() == "section")
{
parse_section(section, reader);
}
else if (reader.get_name() == "sprite")
{
std::string name;
reader.read_string("name", name);
if (!section.empty())
name = section + "/" + name;

m_cache[name].reset(new SpriteDescription(reader));
}
else if (reader.get_name() == "alias")
{
std::string name;
std::string link;
if (reader.read_string("name", name) &&
reader.read_string("link", link))
{
//log_info("alias: " << name << " -> " << link);
m_aliases[name] = link;
}
}
else if (reader.get_name() == "name")
{
// ignore (ugly)
}
else
{
log_info("ResourceManager: unknown token: '" << reader.get_name() << "'");
}
}

void
ResourceManager::parse_section(const std::string& section, FileReader& reader)
{
std::string name;
reader.read_string("name", name);

std::vector<FileReader> sections = reader.get_sections();
for(std::vector<FileReader>::iterator i = sections.begin(); i != sections.end(); ++i)
{
if (section.empty())
parse(name, *i);
else
parse(section + "/" + name, *i);
}
}

std::shared_ptr<SpriteDescription>
ResourceManager::get_sprite_description_from_file(const std::string& resname)
{
Expand Down Expand Up @@ -230,16 +137,7 @@ ResourceManager::get_sprite_description(const std::string& name)
}
else
{
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);
}
else
{
return 0;
}
return 0;
}
}
}
Expand Down
10 changes: 0 additions & 10 deletions src/pingus/resource_manager.hpp
Expand Up @@ -31,18 +31,15 @@ class ResourceManager
{
public:
typedef std::map<std::string, std::shared_ptr<SpriteDescription> > Resources;
typedef std::map<std::string, std::string> Aliases;

private:
Resources m_cache;
std::set<std::string> m_resources;
Aliases m_aliases;

public:
ResourceManager();
~ResourceManager();

void add_resources(const std::string& filename);
void add_resources_from_directory(const Pathname& path);

/** Returns a pointer to the requested SpriteDescription or 0 if it's not found */
Expand All @@ -51,14 +48,7 @@ class ResourceManager

std::vector<std::string> get_section(const std::string& name);

// 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&);
void parse_section(const std::string& section, FileReader&);

ResourceManager (const ResourceManager&);
ResourceManager& operator= (const ResourceManager&);
};
Expand Down