Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-27 02:56:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update filepaths and var names from 'map_object' -> 'event_object'

Browse Source
This commit is contained in:
Marcus Huderle
2018-06-05 17:06:14 -05:00
parent a11365176c
commit 3ed27ba5d3
5 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
editor.h
View File

@@ -38,7 +38,7 @@ public:
void displayMetatiles();
void displayCollisionMetatiles();
void displayElevationMetatiles();
void displayMapObjects();
void displayMapEvents();
void displayMapConnections();
void displayMapBorder();
void displayMapGrid();
@@ -58,13 +58,13 @@ public:
void updateEmergeMap(QString mapName);
void setSelectedConnectionFromMap(QString mapName);
DraggablePixmapItem *addMapObject(Event *event);
void selectMapObject(DraggablePixmapItem *object);
void selectMapObject(DraggablePixmapItem *object, bool toggle);
DraggablePixmapItem *addMapEvent(Event *event);
void selectMapEvent(DraggablePixmapItem *object);
void selectMapEvent(DraggablePixmapItem *object, bool toggle);
DraggablePixmapItem *addNewEvent();
DraggablePixmapItem *addNewEvent(QString event_type);
void deleteEvent(Event *);
void updateSelectedObjects();
void updateSelectedEvents();
void redrawObject(DraggablePixmapItem *item);
QList<DraggablePixmapItem *> *getObjects();
@@ -74,7 +74,7 @@ public:
ConnectionPixmapItem* selected_connection_item = NULL;
QList<ConnectionPixmapItem*> connection_edit_items;
CollisionPixmapItem *collision_item = NULL;
QGraphicsItemGroup *objects_group = NULL;
QGraphicsItemGroup *events_group = NULL;
QList<QGraphicsPixmapItem*> borderItems;
QGraphicsScene *scene_metatiles = NULL;
@@ -161,7 +161,7 @@ public:
QList<Event*> objects;
objects.append(event);
event->pixmap = QPixmap();
editor->project->loadObjectPixmaps(objects);
editor->project->loadEventPixmaps(objects);
editor->redrawObject(this);
emit spriteChanged(event->pixmap);
}