equal
deleted
inserted
replaced
505 for (er = GetEngineRenew(0); er != NULL; er = (er->index + 1U < GetEngineRenewPoolSize()) ? GetEngineRenew(er->index + 1U) : NULL) { |
505 for (er = GetEngineRenew(0); er != NULL; er = (er->index + 1U < GetEngineRenewPoolSize()) ? GetEngineRenew(er->index + 1U) : NULL) { |
506 if (IsValidEngineRenew(er)) continue; |
506 if (IsValidEngineRenew(er)) continue; |
507 |
507 |
508 er->to = INVALID_ENGINE; |
508 er->to = INVALID_ENGINE; |
509 er->next = NULL; |
509 er->next = NULL; |
510 er->group_id = DEFAULT_GROUP; |
510 er->group_id = ALL_GROUP; |
511 return er; |
511 return er; |
512 } |
512 } |
513 |
513 |
514 /* Check if we can add a block to the pool */ |
514 /* Check if we can add a block to the pool */ |
515 if (AddBlockToPool(&_EngineRenew_pool)) return AllocateEngineRenew(); |
515 if (AddBlockToPool(&_EngineRenew_pool)) return AllocateEngineRenew(); |
634 error("EngineRenews: failed loading savegame: too many EngineRenews"); |
634 error("EngineRenews: failed loading savegame: too many EngineRenews"); |
635 |
635 |
636 er = GetEngineRenew(index); |
636 er = GetEngineRenew(index); |
637 SlObject(er, _engine_renew_desc); |
637 SlObject(er, _engine_renew_desc); |
638 |
638 |
639 /* Advanced vehicle lists got added */ |
639 /* Advanced vehicle lists, ungrouped vehicles got added */ |
640 if (CheckSavegameVersion(60)) er->group_id = DEFAULT_GROUP; |
640 if (CheckSavegameVersion(60)) { |
|
641 er->group_id = ALL_GROUP; |
|
642 } else if (CheckSavegameVersion(71)) { |
|
643 if (er->group_id == DEFAULT_GROUP) er->group_id = ALL_GROUP; |
|
644 } |
641 } |
645 } |
642 } |
646 } |
643 |
647 |
644 static const SaveLoad _engine_desc[] = { |
648 static const SaveLoad _engine_desc[] = { |
645 SLE_CONDVAR(Engine, intro_date, SLE_FILE_U16 | SLE_VAR_I32, 0, 30), |
649 SLE_CONDVAR(Engine, intro_date, SLE_FILE_U16 | SLE_VAR_I32, 0, 30), |