Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-13 12:26:05 -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

6
mainwindow.cpp
View File

@@ -509,7 +509,7 @@ void MainWindow::on_toolButton_newObject_clicked()
DraggablePixmapItem *object = editor->addNewEvent();
if (object) {
//if (editor->selected_events->length()) {
editor->selectMapObject(object, true);
editor->selectMapEvent(object, true);
//}
}
updateSelectedObjects();
@@ -526,7 +526,7 @@ void MainWindow::updateSelectedObjects() {
events = editor->selected_events;
}
QMap<QString, int> map_obj_gfx_constants = editor->project->getMapObjGfxConstants();
QMap<QString, int> event_obj_gfx_constants = editor->project->getEventObjGfxConstants();
QList<ObjectPropertiesFrame *> frames;
@@ -593,7 +593,7 @@ void MainWindow::updateSelectedObjects() {
if (event_type == "object") {
frame->ui->sprite->setVisible(true);
frame->ui->comboBox_sprite->addItems(map_obj_gfx_constants.keys());
frame->ui->comboBox_sprite->addItems(event_obj_gfx_constants.keys());
frame->ui->comboBox_sprite->setCurrentText(item->event->get("sprite"));
connect(frame->ui->comboBox_sprite, SIGNAL(activated(QString)), item, SLOT(set_sprite(QString)));