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

Fix crash when painting an event when no existing events exist for the map

Browse source
This commit is contained in:
Marcus Huderle 2020-05-18 17:24:37 -05:00 committed by huderlem
parent c7495c24a3
commit 93661bbe1b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/editor.cpp
View file

@ -1070,11 +1070,15 @@ void Editor::mouseEvent_map(QGraphicsSceneMouseEvent *event, MapPixmapItem *item
// Left-clicking while in paint mode will add a new event of the // Left-clicking while in paint mode will add a new event of the
// type of the first currently selected events. // type of the first currently selected events.
// Disallow adding heal locations, deleting them is not possible yet // Disallow adding heal locations, deleting them is not possible yet
QString eventType = this->selected_events->first()->event->get("event_type"); QString eventType = EventType::Object;
if (eventType != "event_heal_location") { if (this->selected_events->size() > 0)
eventType = this->selected_events->first()->event->get("event_type");
if (eventType != EventType::HealLocation) {
DraggablePixmapItem * newEvent = addNewEvent(eventType); DraggablePixmapItem * newEvent = addNewEvent(eventType);
if (newEvent) { if (newEvent) {
newEvent->move(x, y); newEvent->move(x, y);
emit objectsChanged();
selectMapEvent(newEvent, false); selectMapEvent(newEvent, false);
} }
} }
@ -1872,7 +1876,7 @@ DraggablePixmapItem* Editor::addNewEvent(QString event_type) {
if (project && map && !event_type.isEmpty()) { if (project && map && !event_type.isEmpty()) {
Event *event = Event::createNewEvent(event_type, map->name, project); Event *event = Event::createNewEvent(event_type, map->name, project);
event->put("map_name", map->name); event->put("map_name", map->name);
if (event_type == "event_heal_location") { if (event_type == EventType::HealLocation) {
HealLocation hl = HealLocation::fromEvent(event); HealLocation hl = HealLocation::fromEvent(event);
project->healLocations.append(hl); project->healLocations.append(hl);
event->put("index", project->healLocations.length()); event->put("index", project->healLocations.length());