#include "../common/Ikari.h"
#include "../common/Item.h"
#include "../common/Spell.h"
#include "../common/Ikari.h"
#include "../common/Item.h"
#include "../common/Spell.h"
#include "../common/TargetingMode.h"
#include "../graphics/ComplexAnimation.h"
#include "../graphics/Font.h"
#include "../common/TargetingMode.h"
#include "../graphics/ComplexAnimation.h"
#include "../graphics/Font.h"
- 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);
}
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());
+ Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced());
-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';
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));
}
void Interpreter::CreateTypeDescriptions() {
{
TypeDescription &td(TypeDescription::CreateOrGet("Boolean"));
}
void Interpreter::CreateTypeDescriptions() {
{
TypeDescription &td(TypeDescription::CreateOrGet("Boolean"));
td.SetSize(sizeof(int));
}
{
int stringId(TypeDescription::GetTypeId("String"));
TypeDescription &td(TypeDescription::CreateOrGet("Path"));
td.SetSize(sizeof(int));
}
{
int stringId(TypeDescription::GetTypeId("String"));
TypeDescription &td(TypeDescription::CreateOrGet("Path"));
td.SetSize(1);
td.AddSupertype(stringId, 0);
}
{
TypeDescription &td(TypeDescription::CreateOrGet("String"));
td.SetSize(1);
td.AddSupertype(stringId, 0);
}
{
TypeDescription &td(TypeDescription::CreateOrGet("String"));