added textual type/field descriptions and wiki mode

[l2e.git] / src / loader / Interpreter.cpp

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 28e9b39335d2f13c13ecc7c0226d1ecf69589c6e..a3d382ceba7618f9f1782bf718c1cf49293753be 100644 (file)
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -47,7 +47,6 @@ using graphics::SimpleAnimation;
 using graphics::Sprite;
 using geometry::Vector;
 using std::make_pair;
-using std::map;
 using std::set;
 using std::string;
 using std::vector;
@@ -58,11 +57,11 @@ Interpreter::~Interpreter() {
        for (vector<PostponedDefinition>::const_iterator i(postponedDefinitions.begin()), end(postponedDefinitions.end()); i != end; ++i) {
                delete i->identifier;
        }
-       for (map<string, SDL_Surface *>::const_iterator i(imageCache.begin()), end(imageCache.end()); i != end; ++i) {
+       for (std::map<string, SDL_Surface *>::const_iterator i(imageCache.begin()), end(imageCache.end()); i != end; ++i) {
                SDL_FreeSurface(i->second);
        }
        // TODO: maybe need to reverse the array deletion check if most objects turn out to be arrays (of char)
-       for (map<int, vector<void *> >::const_iterator i(values.begin()), end(values.end()); i != end; ++i) {
+       for (std::map<int, vector<void *> >::const_iterator i(values.begin()), end(values.end()); i != end; ++i) {
                for (vector<void *>::const_iterator j(i->second.begin()), end(i->second.end()); j != end; ++j) {
                        delete[] reinterpret_cast<char *>(*j);
                }
@@ -71,16 +70,12 @@ Interpreter::~Interpreter() {
 
 
 const Interpreter::ParsedDefinition &Interpreter::GetDefinition(const string &identifier) const {
-       try {
-               return parsedDefinitions.at(identifier);
-       } catch (...) {
-               throw std::runtime_error("cannot find definition for " + identifier);
-       }
+       return parsedDefinitions.at(identifier);
 }
 
 
 void *Interpreter::GetObject(int typeId, const std::string &name) {
-       map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+       std::map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
        if (i != parsedDefinitions.end()) {
                const TypeDescription &requested(TypeDescription::Get(typeId));
                const TypeDescription &actual(TypeDescription::Get(i->second.type));
@@ -324,11 +319,12 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
                        Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced());
                }
        }
+       td.Load(object);
 }
 
 
 SDL_Surface *Interpreter::GetImage(const string &path) {
-       map<string, SDL_Surface *>::const_iterator result(imageCache.find(path));
+       std::map<string, SDL_Surface *>::const_iterator result(imageCache.find(path));
        if (result != imageCache.end()) {
                return result->second;
        } else {
@@ -354,32 +350,42 @@ void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::s
 void Interpreter::CreateTypeDescriptions() {
        {
                TypeDescription &td(TypeDescription::CreateOrGet("Boolean"));
+               td.SetDescription("Logical value which can be either true or false.");
                td.SetSize(sizeof(bool));
        }
        {
                TypeDescription &td(TypeDescription::CreateOrGet("Color"));
+               td.SetDescription(
+                               "A color in RGB format with an optional alpha channel.\n"
+                               "Components range from 0 to 255.\n"
+                               "Alpha defaults to 255 if omitted.");
                td.SetSize(sizeof(Color));
        }
        {
                TypeDescription &td(TypeDescription::CreateOrGet("Image"));
+               td.SetDescription("Path to a PNG file with image data.");
                td.SetSize(sizeof(SDL_Surface));
        }
        {
                TypeDescription &td(TypeDescription::CreateOrGet("Number"));
+               td.SetDescription("A signed integer.");
                td.SetSize(sizeof(int));
        }
        {
                int stringId(TypeDescription::GetTypeId("String"));
                TypeDescription &td(TypeDescription::CreateOrGet("Path"));
+               td.SetDescription("A path in the filesystem which is interpreted relative to the source file's location.");
                td.SetSize(1);
                td.AddSupertype(stringId, 0);
        }
        {
                TypeDescription &td(TypeDescription::CreateOrGet("String"));
+               td.SetDescription("Some characters.");
                td.SetSize(1);
        }
        {
                TypeDescription &td(TypeDescription::CreateOrGet("Vector"));
+               td.SetDescription("A pair of numbers usually describing a 2D translation or offset.");
                td.SetSize(sizeof(Vector<int>));
        }
 }