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

Update grid tooltip and update object event filepaths

Browse source
This commit is contained in:
Marcus Huderle 2020-02-12 18:13:33 -06:00
parent 8f0bade8f7
commit f2844c2ec0
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
forms/mainwindow.ui
View file

@ -478,7 +478,7 @@
<item>
<widget class="QCheckBox" name="checkBox_ToggleGrid">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Toggles a grid over the map's metatile boundaries.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Toggles a grid over the map's metatile boundaries.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Ctrl + G&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="styleSheet">
<string notr="true"/>
@ -561,8 +561,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>545</width>
<height>587</height>
<width>469</width>
<height>608</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_8">
@ -876,8 +876,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>256</width>
<height>74</height>
<width>324</width>
<height>77</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7">
@ -1064,10 +1064,10 @@
</property>
<property name="geometry">
<rect>
<x>8</x>
<x>0</x>
<y>0</y>
<width>221</width>
<height>328</height>
<width>307</width>
<height>362</height>
</rect>
</property>
<property name="sizePolicy">
@ -1344,8 +1344,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>371</width>
<height>643</height>
<width>381</width>
<height>657</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_7">
@ -1618,7 +1618,7 @@
<x>0</x>
<y>0</y>
<width>430</width>
<height>534</height>
<height>568</height>
</rect>
</property>
<property name="sizePolicy">
@ -2531,8 +2531,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>818</width>
<height>539</height>
<width>826</width>
<height>557</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_14">
@ -2796,7 +2796,7 @@
<x>0</x>
<y>0</y>
<width>1117</width>
<height>22</height>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">

8
src/project.cpp
View file

@ -2029,7 +2029,7 @@ void Project::loadEventPixmaps(QList<Event*> objects) {
QMap<QString, int> constants = getEventObjGfxConstants();
QMap<QString, QString> pointerHash = parser.readNamedIndexCArray("src/data/object_event/event_object_graphics_info_pointers.h", "gObjectEventGraphicsInfoPointers");
QMap<QString, QString> pointerHash = parser.readNamedIndexCArray("src/data/object_events/object_event_graphics_info_pointers.h", "gObjectEventGraphicsInfoPointers");
for (Event *object : objects) {
if (!object->pixmap.isNull()) {
@ -2054,13 +2054,13 @@ void Project::loadEventPixmaps(QList<Event*> objects) {
if (event_type == EventType::Object) {
QString info_label = pointerHash[object->get("sprite")].replace("&", "");
QStringList gfx_info = parser.readCArray("src/data/object_event/event_object_graphics_info.h", info_label);
QStringList gfx_info = parser.readCArray("src/data/object_events/object_event_graphics_info.h", info_label);
QString pic_label = gfx_info.value(14);
QString dimensions_label = gfx_info.value(11);
QString subsprites_label = gfx_info.value(12);
QString gfx_label = parser.readCArray("src/data/object_event/event_object_pic_tables.h", pic_label).value(0);
QString gfx_label = parser.readCArray("src/data/object_events/object_event_pic_tables.h", pic_label).value(0);
gfx_label = gfx_label.section(QRegExp("[\\(\\)]"), 1, 1);
QString path = parser.readCIncbin("src/data/object_event/event_object_graphics.h", gfx_label);
QString path = parser.readCIncbin("src/data/object_events/object_event_graphics.h", gfx_label);
if (!path.isNull()) {
path = fixGraphicPath(path);