Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-28 11:36:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

More map connection bug fixes

Browse Source
This commit is contained in:
GriffinR
2024-07-18 13:30:56 -04:00
parent 96b5fb1617
commit 9ca5f6bc15
4 changed files with 34 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/editor.h
View File

@@ -175,9 +175,9 @@ private:
void createConnectionItem(MapConnection* connection);
void addConnectionToList(ConnectionPixmapItem* connection);
void updateDiveEmergeMap(QString mapName, QString direction);
MapConnectionMirror getMirroredConnection(const MapConnection&);
void addMirroredConnection(const MapConnection&);
void removeMirroredConnection(const MapConnection&);
MapConnectionMirror getMirroredConnection(MapConnection*);
void addMirroredConnection(MapConnection*);
void removeMirroredConnection(MapConnection*);
void updateEncounterFields(EncounterFields newFields);
QString getMovementPermissionText(uint16_t collision, uint16_t elevation);
QString getMetatileDisplayMessage(uint16_t metatileId);

8
include/ui/connectionpixmapitem.h
View File

@@ -8,7 +8,7 @@
class ConnectionPixmapItem : public QObject, public QGraphicsPixmapItem {
Q_OBJECT
public:
ConnectionPixmapItem(QPixmap pixmap, MapConnection* connection, int x, int y, int baseMapWidth, int baseMapHeight)
ConnectionPixmapItem(QPixmap pixmap, MapConnection* connection, int x, int y)
: QGraphicsPixmapItem(pixmap),
connection(connection)
{
@@ -18,16 +18,14 @@ public:
this->initialX = x;
this->initialY = y;
this->initialOffset = connection->offset;
this->baseMapWidth = baseMapWidth;
this->baseMapHeight = baseMapHeight;
this->setX(x);
this->setY(y);
}
QPixmap basePixmap;
MapConnection* const connection;
int initialX;
int initialY;
int initialOffset;
int baseMapWidth;
int baseMapHeight;
void setEditable(bool editable);
bool getEditable();