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

Optimize displayMapEvents()

Browse source
This commit is contained in:
Marcus Huderle 2020-05-21 19:11:37 -05:00
parent 81cd43933b
commit 2f533a86b2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/event.cpp
View file

@ -31,6 +31,7 @@ Event* Event::createNewEvent(QString event_type, QString map_name, Project *proj
Event *event = new Event; Event *event = new Event;
if (event_type == EventType::Object) { if (event_type == EventType::Object) {
event = createNewObjectEvent(project); event = createNewObjectEvent(project);
event->setFrameFromMovement(event->get("movement_type"));
} 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) {

6
src/editor.cpp
View file

@ -1332,6 +1332,9 @@ void Editor::displayMapEvents() {
scene->addItem(events_group); scene->addItem(events_group);
QList<Event *> events = map->getAllEvents(); QList<Event *> events = map->getAllEvents();
for (Event *event : events) {
event->setFrameFromMovement(project->facingDirections.value(event->get("movement_type")));
}
project->loadEventPixmaps(events); project->loadEventPixmaps(events);
for (Event *event : events) { for (Event *event : events) {
addMapEvent(event); addMapEvent(event);
@ -1344,8 +1347,7 @@ void Editor::displayMapEvents() {
DraggablePixmapItem *Editor::addMapEvent(Event *event) { DraggablePixmapItem *Editor::addMapEvent(Event *event) {
DraggablePixmapItem *object = new DraggablePixmapItem(event, this); DraggablePixmapItem *object = new DraggablePixmapItem(event, this);
event->setFrameFromMovement(project->facingDirections.value(event->get("movement_type"))); this->redrawObject(object);
object->updatePixmap();
if (!event->usingSprite) { if (!event->usingSprite) {
object->setOpacity(0.7); object->setOpacity(0.7);
} }