2975 static uint16 _cargo_source; |
2975 static uint16 _cargo_source; |
2976 static uint32 _cargo_source_xy; |
2976 static uint32 _cargo_source_xy; |
2977 static uint16 _cargo_days; |
2977 static uint16 _cargo_days; |
2978 static Money _cargo_feeder_share; |
2978 static Money _cargo_feeder_share; |
2979 |
2979 |
2980 static const SaveLoad _goods_desc[] = { |
|
2981 SLEG_CONDVAR( _waiting_acceptance, SLE_UINT16, 0, 67), |
|
2982 SLE_CONDVAR(GoodsEntry, acceptance_pickup, SLE_UINT8, 68, SL_MAX_VERSION), |
|
2983 SLE_CONDNULL(2, 51, 67), |
|
2984 SLE_VAR(GoodsEntry, days_since_pickup, SLE_UINT8), |
|
2985 SLE_VAR(GoodsEntry, rating, SLE_UINT8), |
|
2986 SLEG_CONDVAR( _cargo_source, SLE_FILE_U8 | SLE_VAR_U16, 0, 6), |
|
2987 SLEG_CONDVAR( _cargo_source, SLE_UINT16, 7, 67), |
|
2988 SLEG_CONDVAR( _cargo_source_xy, SLE_UINT32, 44, 67), |
|
2989 SLEG_CONDVAR( _cargo_days, SLE_UINT8, 0, 67), |
|
2990 SLE_VAR(GoodsEntry, last_speed, SLE_UINT8), |
|
2991 SLE_VAR(GoodsEntry, last_age, SLE_UINT8), |
|
2992 SLEG_CONDVAR( _cargo_feeder_share, SLE_FILE_U32 | SLE_VAR_I64, 14, 64), |
|
2993 SLEG_CONDVAR( _cargo_feeder_share, SLE_INT64, 65, 67), |
|
2994 SLE_CONDLST(GoodsEntry, cargo, REF_CARGO_PACKET, 68, SL_MAX_VERSION), |
|
2995 |
|
2996 SLE_END() |
|
2997 }; |
|
2998 |
|
2999 static const SaveLoad _station_speclist_desc[] = { |
2980 static const SaveLoad _station_speclist_desc[] = { |
3000 SLE_CONDVAR(StationSpecList, grfid, SLE_UINT32, 27, SL_MAX_VERSION), |
2981 SLE_CONDVAR(StationSpecList, grfid, SLE_UINT32, 27, SL_MAX_VERSION), |
3001 SLE_CONDVAR(StationSpecList, localidx, SLE_UINT8, 27, SL_MAX_VERSION), |
2982 SLE_CONDVAR(StationSpecList, localidx, SLE_UINT8, 27, SL_MAX_VERSION), |
3002 |
2983 |
3003 SLE_END() |
2984 SLE_END() |
3004 }; |
2985 }; |
3005 |
2986 |
3006 |
2987 |
3007 static void SaveLoad_STNS(Station *st) |
2988 void SaveLoad_STNS(Station *st) |
3008 { |
2989 { |
|
2990 static const SaveLoad _goods_desc[] = { |
|
2991 SLEG_CONDVAR( _waiting_acceptance, SLE_UINT16, 0, 67), |
|
2992 SLE_CONDVAR(GoodsEntry, acceptance_pickup, SLE_UINT8, 68, SL_MAX_VERSION), |
|
2993 SLE_CONDNULL(2, 51, 67), |
|
2994 SLE_VAR(GoodsEntry, days_since_pickup, SLE_UINT8), |
|
2995 SLE_VAR(GoodsEntry, rating, SLE_UINT8), |
|
2996 SLEG_CONDVAR( _cargo_source, SLE_FILE_U8 | SLE_VAR_U16, 0, 6), |
|
2997 SLEG_CONDVAR( _cargo_source, SLE_UINT16, 7, 67), |
|
2998 SLEG_CONDVAR( _cargo_source_xy, SLE_UINT32, 44, 67), |
|
2999 SLEG_CONDVAR( _cargo_days, SLE_UINT8, 0, 67), |
|
3000 SLE_VAR(GoodsEntry, last_speed, SLE_UINT8), |
|
3001 SLE_VAR(GoodsEntry, last_age, SLE_UINT8), |
|
3002 SLEG_CONDVAR( _cargo_feeder_share, SLE_FILE_U32 | SLE_VAR_I64, 14, 64), |
|
3003 SLEG_CONDVAR( _cargo_feeder_share, SLE_INT64, 65, 67), |
|
3004 SLE_CONDLST(GoodsEntry, cargo.packets, REF_CARGO_PACKET, 68, SL_MAX_VERSION), |
|
3005 |
|
3006 SLE_END() |
|
3007 }; |
|
3008 |
|
3009 |
3009 SlObject(st, _station_desc); |
3010 SlObject(st, _station_desc); |
3010 |
3011 |
3011 _waiting_acceptance = 0; |
3012 _waiting_acceptance = 0; |
3012 |
3013 |
3013 uint num_cargo = CheckSavegameVersion(55) ? 12 : NUM_CARGO; |
3014 uint num_cargo = CheckSavegameVersion(55) ? 12 : NUM_CARGO; |