#include "../common/Ikari.h"
#include "../common/Item.h"
#include "../common/Spell.h"
+#include "../common/Stats.h"
#include "../common/TargetingMode.h"
#include "../graphics/ComplexAnimation.h"
#include "../graphics/Font.h"
using battle::Hero;
using battle::Monster;
using battle::PartyLayout;
-using battle::Stats;
using common::Ikari;
using common::Item;
using common::Spell;
+using common::Stats;
using common::TargetingMode;
using graphics::Animation;
using graphics::Color;
using graphics::Sprite;
using geometry::Vector;
using std::make_pair;
-using std::map;
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 (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);
}
}
+const Interpreter::ParsedDefinition &Interpreter::GetDefinition(const string &identifier) const {
+ 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));
}
}
} else {
- Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId());
+ 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 {
return v.IsLiteral() || source.IsDefined(v.GetIdentifier());
}
-void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType) {
+void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType, bool inlined) {
char *str(new char[identifier.size() + 1]);
std::memcpy(str, identifier.c_str(), identifier.size());
str[identifier.size()] = '\0';
- postponedDefinitions.push_back(PostponedDefinition(type, id, offset, str, linkedType));
+ postponedDefinitions.push_back(PostponedDefinition(type, id, offset, str, linkedType, inlined));
}