TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Simplify D1 Countdown_timer reload

Browse source
This commit is contained in:
Kp 2017-07-08 18:17:49 +00:00
parent f16c4def1d
commit 75476e0b1d
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
similar/main/state.cpp
View file

@ -1738,6 +1738,7 @@ int state_restore_all_sub(const char *filename, const secret_restore secret)
Control_center_destroyed = PHYSFSX_readSXE32(fp, swap);
#if defined(DXX_BUILD_DESCENT_I)
Countdown_seconds_left = PHYSFSX_readSXE32(fp, swap);
Countdown_timer = 0;
#elif defined(DXX_BUILD_DESCENT_II)
Countdown_timer = PHYSFSX_readSXE32(fp, swap);
#endif
@ -1751,16 +1752,14 @@ int state_restore_all_sub(const char *filename, const secret_restore secret)
control_center_triggers_read(&ControlCenterTriggers, fp);
Num_fuelcenters = PHYSFSX_readSXE32(fp, swap);
range_for (auto &s, partial_range(Station, Num_fuelcenters))
{
fuelcen_read(fp, s);
#if defined(DXX_BUILD_DESCENT_I)
Countdown_timer = 0;
range_for (auto &i, partial_range(Station, Num_fuelcenters))
{
// NOTE: Usually Descent1 handles countdown by Timer value of the Reactor Station. Since we now use Descent2 code to handle countdown (which we do in case there IS NO Reactor Station which causes potential trouble in Multiplayer), let's find the Reactor here and read the timer from it.
if (i.Type == SEGMENT_IS_CONTROLCEN)
Countdown_timer = i.Timer;
}
if (s.Type == SEGMENT_IS_CONTROLCEN)
Countdown_timer = s.Timer;
#endif
}
// Restore the control cen info
Control_center_been_hit = PHYSFSX_readSXE32(fp, swap);