summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6163306)
this can be used if additional setup is needed after raw data loading is complete
using graphics::Sprite;
using geometry::Vector;
using std::make_pair;
using graphics::Sprite;
using geometry::Vector;
using std::make_pair;
using std::set;
using std::string;
using std::vector;
using std::set;
using std::string;
using std::vector;
for (vector<PostponedDefinition>::const_iterator i(postponedDefinitions.begin()), end(postponedDefinitions.end()); i != end; ++i) {
delete i->identifier;
}
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)
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);
}
for (vector<void *>::const_iterator j(i->second.begin()), end(i->second.end()); j != end; ++j) {
delete[] reinterpret_cast<char *>(*j);
}
const Interpreter::ParsedDefinition &Interpreter::GetDefinition(const string &identifier) const {
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) {
}
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));
if (i != parsedDefinitions.end()) {
const TypeDescription &requested(TypeDescription::Get(typeId));
const TypeDescription &actual(TypeDescription::Get(i->second.type));
Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced());
}
}
Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced());
}
}
}
SDL_Surface *Interpreter::GetImage(const string &path) {
}
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 {
if (result != imageCache.end()) {
return result->second;
} else {
+void TypeDescription::Load(void *data) const {
+ if (loader) {
+ (*loader)(data);
+ }
+}
+
void TypeDescription::AddSupertype(int id, std::ptrdiff_t offset) {
supertypes[id] = offset;
void TypeDescription::AddSupertype(int id, std::ptrdiff_t offset) {
supertypes[id] = offset;
bool HasField(const std::string &name) const;
const FieldDescription &GetField(const std::string &name) const;
void Construct(void *) const;
bool HasField(const std::string &name) const;
const FieldDescription &GetField(const std::string &name) const;
void Construct(void *) const;
+ void Load(void *) const;
void SetConstructor(void (*ctor)(void *)) { constructor = ctor; }
void SetConstructor(void (*ctor)(void *)) { constructor = ctor; }
+ void SetLoader(void (*ld)(void *)) { loader = ld; }
void AddSupertype(int id, std::ptrdiff_t offset);
bool IsSubtypeOf(int id) const;
bool IsSubtypeOf(const TypeDescription &other) const { return IsSubtypeOf(other.TypeId()); }
void AddSupertype(int id, std::ptrdiff_t offset);
bool IsSubtypeOf(int id) const;
bool IsSubtypeOf(const TypeDescription &other) const { return IsSubtypeOf(other.TypeId()); }
static const TypeDescription &Get(int id);
private:
static const TypeDescription &Get(int id);
private:
- TypeDescription(int id, const std::string &name) : constructor(0), name(name), id(id), size(0) { }
+ TypeDescription(int id, const std::string &name) : constructor(0), loader(0), name(name), id(id), size(0) { }
private:
void (*constructor)(void *);
private:
void (*constructor)(void *);
+ void (*loader)(void *);
std::string name;
std::map<std::string, FieldDescription> fields;
std::map<int, std::ptrdiff_t> supertypes;
std::string name;
std::map<std::string, FieldDescription> fields;
std::map<int, std::ptrdiff_t> supertypes;