Feature: orderlist Importing / Exporting. #679
Conversation
…splay station names in output json
|
the system is now fully operational, imporing and exporting should work. |
| } | ||
|
|
||
| //delete all orders before setting the new orders | ||
| DoCommandP(v->tile, v->index, v->GetNumOrders(), CMD_DELETE_ORDER | CMD_MSG(STR_ERROR_CAN_T_DELETE_THIS_ORDER)); |
There was a problem hiding this comment.
Edit: Actually, never mind that comment
There was a problem hiding this comment.
The command scope should really be moved one level upwards because these commands are liable to create problems in multiplayer. Really importing should be atomic with respect to the command scope.
| @@ -672,6 +793,8 @@ struct SaveLoadWindow : public Window { | |||
| break; | |||
|
|
|||
| case WID_SL_DRIVES_DIRECTORIES_LIST: { // Click the listbox | |||
| printf("test"); | |||
There was a problem hiding this comment.
Things like these can probably be taken out
|
|
||
| new_order.AllocExtraInfo(); | ||
|
|
||
| if (extraJson.contains("cargo-type-flags") && extraJson["cargo-type-flags"].is_array()) |
There was a problem hiding this comment.
It'd be better to stick to the OpenTTD code style (braces, etc) where practical.
| auto& headJson = json["head"]; | ||
| for (unsigned int i = 0; auto &SD : SD_data) { | ||
|
|
||
| headJson["scheduled-dispatch"][i++] = nlohmann::json::parse(SD.ToJSONString()); |
There was a problem hiding this comment.
Serialising a JSON string and then immediately parsing it suggests that a string is not really the right return type?
There was a problem hiding this comment.
I was trying to avoid having to include the json library in the headers, but I guess you are right.
Should it be changed to just use a json object then?
There was a problem hiding this comment.
That would likely be better, I agree that including the JSON library everywhere is not ideal, but I can resolve that later on
src/order_gui.cpp
Outdated
| @@ -1628,7 +1632,7 @@ struct OrdersWindow : public GeneralVehicleWindow { | |||
|
|
|||
| bool InsertNewOrder(uint64_t order_pack) | |||
| { | |||
| return DoCommandPEx(this->vehicle->tile, this->vehicle->index, this->OrderGetSel(), order_pack, CMD_INSERT_ORDER | CMD_MSG(STR_ERROR_CAN_T_INSERT_NEW_ORDER), nullptr, nullptr, 0); | |||
| return DoCommandPEx(this->vehicle->tile, this->vehicle->index, 0, order_pack, CMD_INSERT_ORDER | CMD_MSG(STR_ERROR_CAN_T_INSERT_NEW_ORDER), nullptr, nullptr, 0); | |||
There was a problem hiding this comment.
Is there a reason for this? Normal order inserts still need to work.
There was a problem hiding this comment.
yeah this was just an oversight fixing now
| if (extraJson.contains("dispatch-index")) | ||
| extraJson["dispatch-index"].get_to(new_order.extra->dispatch_index); | ||
|
|
||
| if (extraJson.contains("xdata")) |
There was a problem hiding this comment.
These bypass all the order flag and value validation, so likely some changes are needed here. Something for me to look into later probably.
|
|
||
| #include "table/strings.h" | ||
|
|
||
| #include "3rdparty/robin_hood/robin_hood.h" | ||
|
|
||
| #include <3rdparty/nlohmann/json.hpp> |
There was a problem hiding this comment.
This include is duplicated, and in general system header syntax should not be used for local includes.
| @@ -367,9 +474,9 @@ struct SaveLoadWindow : public Window { | |||
| this->querystrings[WID_SL_FILTER] = &this->filter_editbox; | |||
| this->filter_editbox.cancel_button = QueryString::ACTION_CLEAR; | |||
|
|
|||
| /* pause is only used in single-player, non-editor mode, non-menu mode. It | |||
| /* pause is only used in single-player, non-editor mode, non-menu mode, when not operationg on orderlists. It | |||
There was a problem hiding this comment.
There are quite a lot of spelling errors like this
| ds.UpdateScheduledDispatch(nullptr); | ||
| SetTimetableWindowsDirty(v, STWDF_SCHEDULED_DISPATCH); | ||
| if (scheduleJson == nullptr) { | ||
| if (p2 == 0) return CMD_ERROR; |
There was a problem hiding this comment.
This check shouldn't be within DC_EXEC because text and exec runs should return the same command result (except where flagged otherwise).
No description provided.