cpp/openttd-patchpack/source Changeset - r24275:85a5f5ce34b6

Changeset - r24275:85a5f5ce34b6

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Jonathan G Rennison - 4 years ago 2020-06-21 22:47:45
j.g.rennison@gmail.com

Fix 63ccb36e: Incorrect string type for OrderBackup::name save/load

In 63ccb36e BaseConsist::name was changed from a malloced char*
to a std::string.
OrderBackup inherits from BaseConsist.
The saveload of OrderBackup::name was not updated.

1 file changed with 1 insertions and 1 deletions:

src/saveload/order_sl.cpp

0 comments (0 inline, 0 general)

src/saveload/order_sl.cpp

➞

Show inline comments

@@ @@ -241,7 +241,7 @@ const SaveLoad *GetOrderBackupDescriptio @@
 		     SLE_VAR(OrderBackup, group,                    SLE_UINT16),
 		 SLE_CONDVAR(OrderBackup, service_interval,         SLE_FILE_U32 | SLE_VAR_U16,  SL_MIN_VERSION, SLV_192),
 		 SLE_CONDVAR(OrderBackup, service_interval,         SLE_UINT16,                SLV_192, SL_MAX_VERSION),
-		     SLE_STR(OrderBackup, name,                     SLE_STR, 0),
+		    SLE_SSTR(OrderBackup, name,                     SLE_STR),
 		SLE_CONDNULL(2,                                                                  SL_MIN_VERSION, SLV_192), // clone (2 bytes of pointer, i.e. garbage)
 		 SLE_CONDREF(OrderBackup, clone,                    REF_VEHICLE,               SLV_192, SL_MAX_VERSION),
 		     SLE_VAR(OrderBackup, cur_real_order_index,     SLE_UINT8),

0 comments (0 inline, 0 general)