atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Move event to core/

Browse source
This commit is contained in:
Marcus Huderle 2018-09-24 19:12:29 -05:00
parent 56499411b1
commit 0d33c3aa64
18 changed files with 380 additions and 380 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/block.cpp
View file

@ -1,4 +1,4 @@
#include "core/block.h" #include "block.h"
Block::Block() { Block::Block() {
} }

2
core/blockdata.cpp
View file

@ -1,4 +1,4 @@
#include "core/blockdata.h" #include "blockdata.h"
Blockdata::Blockdata(QObject *parent) : QObject(parent) Blockdata::Blockdata(QObject *parent) : QObject(parent)
{ {

520
event.cpp → core/event.cpp Executable file → Normal file
View file

@ -1,260 +1,260 @@
#include "event.h" #include "event.h"
#include "map.h" #include "map.h"
QString EventType::Object = "event_object"; QString EventType::Object = "event_object";
QString EventType::Warp = "event_warp"; QString EventType::Warp = "event_warp";
QString EventType::CoordScript = "event_trap"; QString EventType::CoordScript = "event_trap";
QString EventType::CoordWeather = "event_trap_weather"; QString EventType::CoordWeather = "event_trap_weather";
QString EventType::Sign = "event_sign"; QString EventType::Sign = "event_sign";
QString EventType::HiddenItem = "event_hidden_item"; QString EventType::HiddenItem = "event_hidden_item";
QString EventType::SecretBase = "event_secret_base"; QString EventType::SecretBase = "event_secret_base";
QString EventType::HealLocation = "event_heal_location"; QString EventType::HealLocation = "event_heal_location";
Event::Event() Event::Event()
{ {
this->spriteWidth = 16; this->spriteWidth = 16;
this->spriteHeight = 16; this->spriteHeight = 16;
} }
Event* Event::createNewEvent(QString event_type, QString map_name) Event* Event::createNewEvent(QString event_type, QString map_name)
{ {
Event *event = new Event; Event *event = new Event;
if (event_type == EventType::Object) { if (event_type == EventType::Object) {
event = createNewObjectEvent(); event = createNewObjectEvent();
} else if (event_type == EventType::Warp) { } else if (event_type == EventType::Warp) {
event = createNewWarpEvent(map_name); event = createNewWarpEvent(map_name);
} else if (event_type == EventType::HealLocation) { } else if (event_type == EventType::HealLocation) {
event = createNewHealLocationEvent(map_name); event = createNewHealLocationEvent(map_name);
} else if (event_type == EventType::CoordScript) { } else if (event_type == EventType::CoordScript) {
event = createNewCoordScriptEvent(); event = createNewCoordScriptEvent();
} else if (event_type == EventType::CoordWeather) { } else if (event_type == EventType::CoordWeather) {
event = createNewCoordWeatherEvent(); event = createNewCoordWeatherEvent();
} else if (event_type == EventType::Sign) { } else if (event_type == EventType::Sign) {
event = createNewSignEvent(); event = createNewSignEvent();
} else if (event_type == EventType::HiddenItem) { } else if (event_type == EventType::HiddenItem) {
event = createNewHiddenItemEvent(); event = createNewHiddenItemEvent();
} else if (event_type == EventType::SecretBase) { } else if (event_type == EventType::SecretBase) {
event = createNewSecretBaseEvent(); event = createNewSecretBaseEvent();
} }
event->setX(0); event->setX(0);
event->setY(0); event->setY(0);
event->put("elevation", 3); event->put("elevation", 3);
return event; return event;
} }
Event* Event::createNewObjectEvent() Event* Event::createNewObjectEvent()
{ {
Event *event = new Event; Event *event = new Event;
event->put("event_group_type", "object_event_group"); event->put("event_group_type", "object_event_group");
event->put("event_type", EventType::Object); event->put("event_type", EventType::Object);
event->put("sprite", "EVENT_OBJ_GFX_BOY_1"); event->put("sprite", "EVENT_OBJ_GFX_BOY_1");
event->put("movement_type", "MOVEMENT_TYPE_LOOK_AROUND"); event->put("movement_type", "MOVEMENT_TYPE_LOOK_AROUND");
event->put("radius_x", 0); event->put("radius_x", 0);
event->put("radius_y", 0); event->put("radius_y", 0);
event->put("script_label", "NULL"); event->put("script_label", "NULL");
event->put("event_flag", "0"); event->put("event_flag", "0");
event->put("replacement", "0"); event->put("replacement", "0");
event->put("is_trainer", "FALSE"); event->put("is_trainer", "FALSE");
event->put("sight_radius_tree_id", 0); event->put("sight_radius_tree_id", 0);
return event; return event;
} }
Event* Event::createNewWarpEvent(QString map_name) Event* Event::createNewWarpEvent(QString map_name)
{ {
Event *event = new Event; Event *event = new Event;
event->put("event_group_type", "warp_event_group"); event->put("event_group_type", "warp_event_group");
event->put("event_type", EventType::Warp); event->put("event_type", EventType::Warp);
event->put("destination_warp", 0); event->put("destination_warp", 0);
event->put("destination_map_name", map_name); event->put("destination_map_name", map_name);
return event; return event;
} }
Event* Event::createNewHealLocationEvent(QString map_name) Event* Event::createNewHealLocationEvent(QString map_name)
{ {
Event *event = new Event; Event *event = new Event;
event->put("event_group_type", "heal_event_group"); event->put("event_group_type", "heal_event_group");
event->put("event_type", EventType::HealLocation); event->put("event_type", EventType::HealLocation);
event->put("loc_name", QString(Map::mapConstantFromName(map_name)).remove(0,4)); event->put("loc_name", QString(Map::mapConstantFromName(map_name)).remove(0,4));
return event; return event;
} }
Event* Event::createNewCoordScriptEvent() Event* Event::createNewCoordScriptEvent()
{ {
Event *event = new Event; Event *event = new Event;
event->put("event_group_type", "coord_event_group"); event->put("event_group_type", "coord_event_group");
event->put("event_type", EventType::CoordScript); event->put("event_type", EventType::CoordScript);
event->put("script_label", "NULL"); event->put("script_label", "NULL");
event->put("script_var", "VAR_TEMP_0"); event->put("script_var", "VAR_TEMP_0");
event->put("script_var_value", "0"); event->put("script_var_value", "0");
return event; return event;
} }
Event* Event::createNewCoordWeatherEvent() Event* Event::createNewCoordWeatherEvent()
{ {
Event *event = new Event; Event *event = new Event;
event->put("event_group_type", "coord_event_group"); event->put("event_group_type", "coord_event_group");
event->put("event_type", EventType::CoordWeather); event->put("event_type", EventType::CoordWeather);
event->put("weather", "COORD_EVENT_WEATHER_SUNNY"); event->put("weather", "COORD_EVENT_WEATHER_SUNNY");
return event; return event;
} }
Event* Event::createNewSignEvent() Event* Event::createNewSignEvent()
{ {
Event *event = new Event; Event *event = new Event;
event->put("event_group_type", "bg_event_group"); event->put("event_group_type", "bg_event_group");
event->put("event_type", EventType::Sign); event->put("event_type", EventType::Sign);
event->put("player_facing_direction", "BG_EVENT_PLAYER_FACING_ANY"); event->put("player_facing_direction", "BG_EVENT_PLAYER_FACING_ANY");
event->put("script_label", "NULL"); event->put("script_label", "NULL");
return event; return event;
} }
Event* Event::createNewHiddenItemEvent() Event* Event::createNewHiddenItemEvent()
{ {
Event *event = new Event; Event *event = new Event;
event->put("event_group_type", "bg_event_group"); event->put("event_group_type", "bg_event_group");
event->put("event_type", EventType::HiddenItem); event->put("event_type", EventType::HiddenItem);
event->put("item", "ITEM_POTION"); event->put("item", "ITEM_POTION");
event->put("flag", "FLAG_HIDDEN_ITEM_0"); event->put("flag", "FLAG_HIDDEN_ITEM_0");
return event; return event;
} }
Event* Event::createNewSecretBaseEvent() Event* Event::createNewSecretBaseEvent()
{ {
Event *event = new Event; Event *event = new Event;
event->put("event_group_type", "bg_event_group"); event->put("event_group_type", "bg_event_group");
event->put("event_type", EventType::SecretBase); event->put("event_type", EventType::SecretBase);
event->put("secret_base_id", "SECRET_BASE_RED_CAVE2_1"); event->put("secret_base_id", "SECRET_BASE_RED_CAVE2_1");
return event; return event;
} }
int Event::getPixelX() int Event::getPixelX()
{ {
return (this->x() * 16) - qMax(0, (this->spriteWidth - 16) / 2); return (this->x() * 16) - qMax(0, (this->spriteWidth - 16) / 2);
} }
int Event::getPixelY() int Event::getPixelY()
{ {
return (this->y() * 16) - qMax(0, this->spriteHeight - 16); return (this->y() * 16) - qMax(0, this->spriteHeight - 16);
} }
QString Event::buildObjectEventMacro(int item_index) QString Event::buildObjectEventMacro(int item_index)
{ {
int radius_x = this->getInt("radius_x"); int radius_x = this->getInt("radius_x");
int radius_y = this->getInt("radius_y"); int radius_y = this->getInt("radius_y");
uint16_t x = this->getU16("x"); uint16_t x = this->getU16("x");
uint16_t y = this->getU16("y"); uint16_t y = this->getU16("y");
QString text = ""; QString text = "";
text += QString("\tobject_event %1").arg(item_index + 1); text += QString("\tobject_event %1").arg(item_index + 1);
text += QString(", %1").arg(this->get("sprite")); text += QString(", %1").arg(this->get("sprite"));
text += QString(", %1").arg(this->get("replacement")); text += QString(", %1").arg(this->get("replacement"));
text += QString(", %1").arg(x); text += QString(", %1").arg(x);
text += QString(", %1").arg(y); text += QString(", %1").arg(y);
text += QString(", %1").arg(this->get("elevation")); text += QString(", %1").arg(this->get("elevation"));
text += QString(", %1").arg(this->get("movement_type")); text += QString(", %1").arg(this->get("movement_type"));
text += QString(", %1").arg(radius_x); text += QString(", %1").arg(radius_x);
text += QString(", %1").arg(radius_y); text += QString(", %1").arg(radius_y);
text += QString(", %1").arg(this->get("is_trainer")); text += QString(", %1").arg(this->get("is_trainer"));
text += QString(", %1").arg(this->get("sight_radius_tree_id")); text += QString(", %1").arg(this->get("sight_radius_tree_id"));
text += QString(", %1").arg(this->get("script_label")); text += QString(", %1").arg(this->get("script_label"));
text += QString(", %1").arg(this->get("event_flag")); text += QString(", %1").arg(this->get("event_flag"));
text += "\n"; text += "\n";
return text; return text;
} }
QString Event::buildWarpEventMacro(QMap<QString, QString> *mapNamesToMapConstants) QString Event::buildWarpEventMacro(QMap<QString, QString> *mapNamesToMapConstants)
{ {
QString text = ""; QString text = "";
text += QString("\twarp_def %1").arg(this->get("x")); text += QString("\twarp_def %1").arg(this->get("x"));
text += QString(", %1").arg(this->get("y")); text += QString(", %1").arg(this->get("y"));
text += QString(", %1").arg(this->get("elevation")); text += QString(", %1").arg(this->get("elevation"));
text += QString(", %1").arg(this->get("destination_warp")); text += QString(", %1").arg(this->get("destination_warp"));
text += QString(", %1").arg(mapNamesToMapConstants->value(this->get("destination_map_name"))); text += QString(", %1").arg(mapNamesToMapConstants->value(this->get("destination_map_name")));
text += "\n"; text += "\n";
return text; return text;
} }
HealLocation Event::buildHealLocation() HealLocation Event::buildHealLocation()
{ {
HealLocation hl; HealLocation hl;
hl.name = this->get("loc_name"); hl.name = this->get("loc_name");
try { try {
hl.index = this->get("index").toInt(); hl.index = this->get("index").toInt();
} }
catch(...) { catch(...) {
hl.index = 0; hl.index = 0;
} }
hl.x = this->getU16("x"); hl.x = this->getU16("x");
hl.y = this->getU16("y"); hl.y = this->getU16("y");
return hl; return hl;
} }
QString Event::buildCoordScriptEventMacro() QString Event::buildCoordScriptEventMacro()
{ {
QString text = ""; QString text = "";
text += QString("\tcoord_event %1").arg(this->get("x")); text += QString("\tcoord_event %1").arg(this->get("x"));
text += QString(", %1").arg(this->get("y")); text += QString(", %1").arg(this->get("y"));
text += QString(", %1").arg(this->get("elevation")); text += QString(", %1").arg(this->get("elevation"));
text += QString(", %1").arg(this->get("script_var")); text += QString(", %1").arg(this->get("script_var"));
text += QString(", %1").arg(this->get("script_var_value")); text += QString(", %1").arg(this->get("script_var_value"));
text += QString(", %1").arg(this->get("script_label")); text += QString(", %1").arg(this->get("script_label"));
text += "\n"; text += "\n";
return text; return text;
} }
QString Event::buildCoordWeatherEventMacro() QString Event::buildCoordWeatherEventMacro()
{ {
QString text = ""; QString text = "";
text += QString("\tcoord_weather_event %1").arg(this->get("x")); text += QString("\tcoord_weather_event %1").arg(this->get("x"));
text += QString(", %1").arg(this->get("y")); text += QString(", %1").arg(this->get("y"));
text += QString(", %1").arg(this->get("elevation")); text += QString(", %1").arg(this->get("elevation"));
text += QString(", %1").arg(this->get("weather")); text += QString(", %1").arg(this->get("weather"));
text += "\n"; text += "\n";
return text; return text;
} }
QString Event::buildSignEventMacro() QString Event::buildSignEventMacro()
{ {
QString text = ""; QString text = "";
text += QString("\tbg_event %1").arg(this->get("x")); text += QString("\tbg_event %1").arg(this->get("x"));
text += QString(", %1").arg(this->get("y")); text += QString(", %1").arg(this->get("y"));
text += QString(", %1").arg(this->get("elevation")); text += QString(", %1").arg(this->get("elevation"));
text += QString(", %1").arg(this->get("player_facing_direction")); text += QString(", %1").arg(this->get("player_facing_direction"));
text += QString(", %1").arg(this->get("script_label")); text += QString(", %1").arg(this->get("script_label"));
text += "\n"; text += "\n";
return text; return text;
} }
QString Event::buildHiddenItemEventMacro() QString Event::buildHiddenItemEventMacro()
{ {
QString text = ""; QString text = "";
text += QString("\tbg_hidden_item_event %1").arg(this->get("x")); text += QString("\tbg_hidden_item_event %1").arg(this->get("x"));
text += QString(", %1").arg(this->get("y")); text += QString(", %1").arg(this->get("y"));
text += QString(", %1").arg(this->get("elevation")); text += QString(", %1").arg(this->get("elevation"));
text += QString(", %1").arg(this->get("item")); text += QString(", %1").arg(this->get("item"));
text += QString(", %1").arg(this->get("flag")); text += QString(", %1").arg(this->get("flag"));
text += "\n"; text += "\n";
return text; return text;
} }
QString Event::buildSecretBaseEventMacro() QString Event::buildSecretBaseEventMacro()
{ {
QString text = ""; QString text = "";
text += QString("\tbg_secret_base_event %1").arg(this->get("x")); text += QString("\tbg_secret_base_event %1").arg(this->get("x"));
text += QString(", %1").arg(this->get("y")); text += QString(", %1").arg(this->get("y"));
text += QString(", %1").arg(this->get("elevation")); text += QString(", %1").arg(this->get("elevation"));
text += QString(", %1").arg(this->get("secret_base_id")); text += QString(", %1").arg(this->get("secret_base_id"));
text += "\n"; text += "\n";
return text; return text;
} }
void Event::setPixmapFromSpritesheet(QImage spritesheet, int spriteWidth, int spriteHeight) void Event::setPixmapFromSpritesheet(QImage spritesheet, int spriteWidth, int spriteHeight)
{ {
// Set first palette color fully transparent. // Set first palette color fully transparent.
QImage img = spritesheet.copy(0, 0, spriteWidth, spriteHeight); QImage img = spritesheet.copy(0, 0, spriteWidth, spriteHeight);
img.setColor(0, qRgba(0, 0, 0, 0)); img.setColor(0, qRgba(0, 0, 0, 0));
pixmap = QPixmap::fromImage(img); pixmap = QPixmap::fromImage(img);
this->spriteWidth = spriteWidth; this->spriteWidth = spriteWidth;
this->spriteHeight = spriteHeight; this->spriteHeight = spriteHeight;
} }

174
event.h → core/event.h Executable file → Normal file
View file

@ -1,87 +1,87 @@
#ifndef EVENT_H #ifndef EVENT_H
#define EVENT_H #define EVENT_H
#include "core/heallocation.h" #include "heallocation.h"
#include <QString> #include <QString>
#include <QPixmap> #include <QPixmap>
#include <QMap> #include <QMap>
#include <QDebug> #include <QDebug>
class EventType class EventType
{ {
public: public:
static QString Object; static QString Object;
static QString Warp; static QString Warp;
static QString CoordScript; static QString CoordScript;
static QString CoordWeather; static QString CoordWeather;
static QString Sign; static QString Sign;
static QString HiddenItem; static QString HiddenItem;
static QString SecretBase; static QString SecretBase;
static QString HealLocation; static QString HealLocation;
}; };
class Event class Event
{ {
public: public:
Event(); Event();
public: public:
int x() { int x() {
return getInt("x"); return getInt("x");
} }
int y() { int y() {
return getInt("y"); return getInt("y");
} }
int elevation() { int elevation() {
return getInt("elevation"); return getInt("elevation");
} }
void setX(int x) { void setX(int x) {
put("x", x); put("x", x);
} }
void setY(int y) { void setY(int y) {
put("y", y); put("y", y);
} }
QString get(QString key) { QString get(QString key) {
return values.value(key); return values.value(key);
} }
int getInt(QString key) { int getInt(QString key) {
return values.value(key).toInt(nullptr, 0); return values.value(key).toInt(nullptr, 0);
} }
uint16_t getU16(QString key) { uint16_t getU16(QString key) {
return values.value(key).toUShort(nullptr, 0); return values.value(key).toUShort(nullptr, 0);
} }
void put(QString key, int value) { void put(QString key, int value) {
put(key, QString("%1").arg(value)); put(key, QString("%1").arg(value));
} }
void put(QString key, QString value) { void put(QString key, QString value) {
values.insert(key, value); values.insert(key, value);
} }
static Event* createNewEvent(QString, QString); static Event* createNewEvent(QString, QString);
static Event* createNewObjectEvent(); static Event* createNewObjectEvent();
static Event* createNewWarpEvent(QString); static Event* createNewWarpEvent(QString);
static Event* createNewHealLocationEvent(QString); static Event* createNewHealLocationEvent(QString);
static Event* createNewCoordScriptEvent(); static Event* createNewCoordScriptEvent();
static Event* createNewCoordWeatherEvent(); static Event* createNewCoordWeatherEvent();
static Event* createNewSignEvent(); static Event* createNewSignEvent();
static Event* createNewHiddenItemEvent(); static Event* createNewHiddenItemEvent();
static Event* createNewSecretBaseEvent(); static Event* createNewSecretBaseEvent();
QString buildObjectEventMacro(int); QString buildObjectEventMacro(int);
QString buildWarpEventMacro(QMap<QString, QString>*); QString buildWarpEventMacro(QMap<QString, QString>*);
HealLocation buildHealLocation(); HealLocation buildHealLocation();
QString buildCoordScriptEventMacro(); QString buildCoordScriptEventMacro();
QString buildCoordWeatherEventMacro(); QString buildCoordWeatherEventMacro();
QString buildSignEventMacro(); QString buildSignEventMacro();
QString buildHiddenItemEventMacro(); QString buildHiddenItemEventMacro();
QString buildSecretBaseEventMacro(); QString buildSecretBaseEventMacro();
void setPixmapFromSpritesheet(QImage, int, int); void setPixmapFromSpritesheet(QImage, int, int);
int getPixelX(); int getPixelX();
int getPixelY(); int getPixelY();
QMap<QString, QString> values; QMap<QString, QString> values;
QPixmap pixmap; QPixmap pixmap;
int spriteWidth; int spriteWidth;
int spriteHeight; int spriteHeight;
}; };
#endif // EVENT_H #endif // EVENT_H

4
core/metatile.cpp
View file

@ -1,6 +1,6 @@
#include "core/metatile.h" #include "metatile.h"
#include "tileset.h"
#include "project.h" #include "project.h"
#include "core/tileset.h"
Metatile::Metatile() Metatile::Metatile()
{ {

2
core/parseutil.h
View file

@ -1,7 +1,7 @@
#ifndef PARSEUTIL_H #ifndef PARSEUTIL_H
#define PARSEUTIL_H #define PARSEUTIL_H
#include "core/heallocation.h" #include "heallocation.h"
#include <QString> #include <QString>
#include <QList> #include <QList>

2
core/tile.cpp
View file

@ -1,4 +1,4 @@
#include "core/tile.h" #include "tile.h"
Tile::Tile() Tile::Tile()
{ {

4
core/tileset.cpp
View file

@ -1,5 +1,5 @@
#include "core/tileset.h" #include "tileset.h"
#include "core/metatile.h" #include "metatile.h"
#include "project.h" #include "project.h"
#include <QPainter> #include <QPainter>

4
core/tileset.h
View file

@ -1,8 +1,8 @@
#ifndef TILESET_H #ifndef TILESET_H
#define TILESET_H #define TILESET_H
#include "core/metatile.h" #include "metatile.h"
#include "core/tile.h" #include "tile.h"
#include <QImage> #include <QImage>
class Tileset class Tileset

2
editor.cpp
View file

@ -1,6 +1,6 @@
#include "editor.h" #include "editor.h"
#include "event.h" #include "event.h"
#include "core/mapconnection.h" #include "mapconnection.h"
#include <QCheckBox> #include <QCheckBox>
#include <QPainter> #include <QPainter>
#include <QMouseEvent> #include <QMouseEvent>

6
editor.h
View file

@ -9,9 +9,9 @@
#include <QCheckBox> #include <QCheckBox>
#include <QCursor> #include <QCursor>
#include "core/mapconnection.h" #include "mapconnection.h"
#include "ui/metatileselector.h" #include "metatileselector.h"
#include "ui/movementpermissionsselector.h" #include "movementpermissionsselector.h"
#include "project.h" #include "project.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"

2
mainwindow.cpp
View file

@ -2,7 +2,7 @@
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "project.h" #include "project.h"
#include "editor.h" #include "editor.h"
#include "ui/eventpropertiesframe.h" #include "eventpropertiesframe.h"
#include "ui_objectpropertiesframe.h" #include "ui_objectpropertiesframe.h"
#include <QDebug> #include <QDebug>

4
map.cpp
View file

@ -1,5 +1,5 @@
#include "core/history.h" #include "history.h"
#include "core/historyitem.h" #include "historyitem.h"
#include "map.h" #include "map.h"
#include "project.h" #include "project.h"

12
map.h
View file

@ -1,12 +1,12 @@
#ifndef MAP_H #ifndef MAP_H
#define MAP_H #define MAP_H
#include "core/blockdata.h" #include "blockdata.h"
#include "core/history.h" #include "history.h"
#include "core/historyitem.h" #include "historyitem.h"
#include "core/mapconnection.h" #include "mapconnection.h"
#include "core/maplayout.h" #include "maplayout.h"
#include "core/tileset.h" #include "tileset.h"
#include "event.h" #include "event.h"
#include <QPixmap> #include <QPixmap>

4
porymap.pro
View file

@ -16,6 +16,7 @@ ICON = resources/icons/porymap-icon-1.ico
SOURCES += core/block.cpp \ SOURCES += core/block.cpp \
core/blockdata.cpp \ core/blockdata.cpp \
core/event.cpp \
core/heallocation.cpp \ core/heallocation.cpp \
core/historyitem.cpp \ core/historyitem.cpp \
core/maplayout.cpp \ core/maplayout.cpp \
@ -31,7 +32,6 @@ SOURCES += core/block.cpp \
ui/noscrollspinbox.cpp \ ui/noscrollspinbox.cpp \
ui/selectablepixmapitem.cpp \ ui/selectablepixmapitem.cpp \
editor.cpp \ editor.cpp \
event.cpp \
graphicsview.cpp \ graphicsview.cpp \
main.cpp \ main.cpp \
mainwindow.cpp \ mainwindow.cpp \
@ -40,6 +40,7 @@ SOURCES += core/block.cpp \
HEADERS += core/block.h \ HEADERS += core/block.h \
core/blockdata.h \ core/blockdata.h \
core/event.h \
core/heallocation.h \ core/heallocation.h \
core/history.h \ core/history.h \
core/historyitem.h \ core/historyitem.h \
@ -57,7 +58,6 @@ HEADERS += core/block.h \
ui/noscrollspinbox.h \ ui/noscrollspinbox.h \
ui/selectablepixmapitem.h \ ui/selectablepixmapitem.h \
editor.h \ editor.h \
event.h \
graphicsview.h \ graphicsview.h \
mainwindow.h \ mainwindow.h \
map.h \ map.h \

10
project.cpp
View file

@ -1,9 +1,9 @@
#include "project.h" #include "project.h"
#include "core/history.h" #include "history.h"
#include "core/historyitem.h" #include "historyitem.h"
#include "core/parseutil.h" #include "parseutil.h"
#include "core/tile.h" #include "tile.h"
#include "core/tileset.h" #include "tileset.h"
#include "event.h" #include "event.h"
#include <QDebug> #include <QDebug>

4
project.h
View file

@ -2,8 +2,8 @@
#define PROJECT_H #define PROJECT_H
#include "map.h" #include "map.h"
#include "core/blockdata.h" #include "blockdata.h"
#include "core/heallocation.h" #include "heallocation.h"
#include <QStringList> #include <QStringList>
#include <QList> #include <QList>

2
ui/metatileselector.h
View file

@ -2,7 +2,7 @@
#define METATILESELECTOR_H #define METATILESELECTOR_H
#include "selectablepixmapitem.h" #include "selectablepixmapitem.h"
#include "core/tileset.h" #include "tileset.h"
class MetatileSelector: public SelectablePixmapItem { class MetatileSelector: public SelectablePixmapItem {
Q_OBJECT Q_OBJECT