Files
@ r17167:68f47a8db1b5
Branch filter:
Location: cpp/openttd-patchpack/source/src/saveload/economy_sl.cpp - annotation
r17167:68f47a8db1b5
3.7 KiB
text/x-c
(svn r21916) -Fix [FS#4442]: the minimum speed needed for (realistic) acceleration to work properly can sometimes be more than the (temporary) maximum speed causing Clamp to "fail". Make sure that the minimum speed always overrules the maximum speed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | r10571:99cb9a95b4cf r10571:99cb9a95b4cf r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r12269:f94731e7dc53 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r12930:ae0ddab1903d r12930:ae0ddab1903d r10571:99cb9a95b4cf r13479:b39a51084392 r16546:a3376e2d6467 r13479:b39a51084392 r13479:b39a51084392 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r12930:ae0ddab1903d r12930:ae0ddab1903d r10571:99cb9a95b4cf r16546:a3376e2d6467 r16546:a3376e2d6467 r12930:ae0ddab1903d r12930:ae0ddab1903d r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r12930:ae0ddab1903d r15636:256e5bcfbe12 r12930:ae0ddab1903d r12930:ae0ddab1903d r12930:ae0ddab1903d r12930:ae0ddab1903d r12930:ae0ddab1903d r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r10571:99cb9a95b4cf r16546:a3376e2d6467 r10571:99cb9a95b4cf r10571:99cb9a95b4cf r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r12269:f94731e7dc53 r10571:99cb9a95b4cf r15322:29a1524c8399 r15322:29a1524c8399 r15322:29a1524c8399 r15322:29a1524c8399 r10571:99cb9a95b4cf | /* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file economy_sl.cpp Code handling saving and loading of economy data */
#include "../stdafx.h"
#include "../economy_func.h"
#include "../economy_base.h"
#include "saveload.h"
/** Prices in pre 126 savegames */
static void Load_PRIC()
{
/* Old games store 49 base prices, very old games store them as int32 */
int vt = IsSavegameVersionBefore(65) ? SLE_FILE_I32 : SLE_FILE_I64;
SlArray(NULL, 49, vt | SLE_VAR_NULL);
SlArray(NULL, 49, SLE_FILE_U16 | SLE_VAR_NULL);
}
/** Cargo payment rates in pre 126 savegames */
static void Load_CAPR()
{
uint num_cargo = IsSavegameVersionBefore(55) ? 12 : NUM_CARGO;
int vt = IsSavegameVersionBefore(65) ? SLE_FILE_I32 : SLE_FILE_I64;
SlArray(NULL, num_cargo, vt | SLE_VAR_NULL);
SlArray(NULL, num_cargo, SLE_FILE_U16 | SLE_VAR_NULL);
}
static const SaveLoad _economy_desc[] = {
SLE_CONDNULL(4, 0, 64), // max_loan
SLE_CONDNULL(8, 65, 143), // max_loan
SLE_CONDVAR(Economy, old_max_loan_unround, SLE_FILE_I32 | SLE_VAR_I64, 0, 64),
SLE_CONDVAR(Economy, old_max_loan_unround, SLE_INT64, 65, 125),
SLE_CONDVAR(Economy, old_max_loan_unround_fract, SLE_UINT16, 70, 125),
SLE_CONDVAR(Economy, inflation_prices, SLE_UINT64, 126, SL_MAX_VERSION),
SLE_CONDVAR(Economy, inflation_payment, SLE_UINT64, 126, SL_MAX_VERSION),
SLE_VAR(Economy, fluct, SLE_INT16),
SLE_VAR(Economy, interest_rate, SLE_UINT8),
SLE_VAR(Economy, infl_amount, SLE_UINT8),
SLE_VAR(Economy, infl_amount_pr, SLE_UINT8),
SLE_CONDVAR(Economy, industry_daily_change_counter, SLE_UINT32, 102, SL_MAX_VERSION),
SLE_END()
};
/** Economy variables */
static void Save_ECMY()
{
SlObject(&_economy, _economy_desc);
}
/** Economy variables */
static void Load_ECMY()
{
SlObject(&_economy, _economy_desc);
StartupIndustryDailyChanges(IsSavegameVersionBefore(102)); // old savegames will need to be initialized
}
static const SaveLoad _cargopayment_desc[] = {
SLE_REF(CargoPayment, front, REF_VEHICLE),
SLE_VAR(CargoPayment, route_profit, SLE_INT64),
SLE_VAR(CargoPayment, visual_profit, SLE_INT64),
SLE_END()
};
static void Save_CAPY()
{
CargoPayment *cp;
FOR_ALL_CARGO_PAYMENTS(cp) {
SlSetArrayIndex(cp->index);
SlObject(cp, _cargopayment_desc);
}
}
static void Load_CAPY()
{
int index;
while ((index = SlIterateArray()) != -1) {
CargoPayment *cp = new (index) CargoPayment();
SlObject(cp, _cargopayment_desc);
}
}
static void Ptrs_CAPY()
{
CargoPayment *cp;
FOR_ALL_CARGO_PAYMENTS(cp) {
SlObject(cp, _cargopayment_desc);
}
}
extern const ChunkHandler _economy_chunk_handlers[] = {
{ 'CAPY', Save_CAPY, Load_CAPY, Ptrs_CAPY, NULL, CH_ARRAY},
{ 'PRIC', NULL, Load_PRIC, NULL, NULL, CH_RIFF | CH_AUTO_LENGTH},
{ 'CAPR', NULL, Load_CAPR, NULL, NULL, CH_RIFF | CH_AUTO_LENGTH},
{ 'ECMY', Save_ECMY, Load_ECMY, NULL, NULL, CH_RIFF | CH_LAST},
};
|