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

Merge branch 'master' into ruler-tool

Browse Source
This commit is contained in:
BigBahss
2020-10-24 03:28:29 -04:00
parent 273dbaa94f 530ff4ce88
commit 40a155329e
24 changed files with 1025 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/editor.h
View File

@@ -65,6 +65,7 @@ public:
void displayMapBorder();
void displayMapGrid();
void displayWildMonTables();
void maskNonVisibleConnectionTiles();
void updateMapBorder();
void updateMapConnections();
@@ -110,6 +111,7 @@ public:
ConnectionPixmapItem* selected_connection_item = nullptr;
QList<QGraphicsPixmapItem*> connection_items;
QList<ConnectionPixmapItem*> connection_edit_items;
QGraphicsPathItem *connection_mask = nullptr;
CollisionPixmapItem *collision_item = nullptr;
QGraphicsItemGroup *events_group = nullptr;
QList<QGraphicsPixmapItem*> borderItems;
@@ -150,6 +152,7 @@ public:
bool selectingEvent = false;
void shouldReselectEvents();
void scaleMapView(int);
private:
void setConnectionItemsVisible(bool);
@@ -200,6 +203,7 @@ private slots:
void onHoveredMapMovementPermissionChanged(int, int);
void onHoveredMapMovementPermissionCleared();
void onSelectedMetatilesChanged();
void onWheelZoom(int);
signals:
void objectsChanged();
@@ -208,7 +212,6 @@ signals:
void wildMonDataChanged();
void warpEventDoubleClicked(QString mapName, QString warpNum);
void currentMetatilesSelectionChanged();
void wheelZoom(int delta);
};
#endif // EDITOR_H