Dead_controlcen_object_num should be set when a new level starts in debug build, too; Setting Total_countdown_time when loading a savestate so SEF-DESTRUCT SEQUENCE ACTIVATED sample will not play soon as timer reaches 0
This commit is contained in:
parent
c8f4008878
commit
d55bc253f1
|
@ -1,5 +1,9 @@
|
||||||
D1X-Rebirth Changelog
|
D1X-Rebirth Changelog
|
||||||
|
|
||||||
|
20110329
|
||||||
|
--------
|
||||||
|
main/cntrlcen.c, main/cntrlcen.h, main/state.c: Dead_controlcen_object_num should be set when a new level starts in debug build, too; Setting Total_countdown_time when loading a savestate so SEF-DESTRUCT SEQUENCE ACTIVATED sample will not play soon as timer reaches 0
|
||||||
|
|
||||||
20110328
|
20110328
|
||||||
--------
|
--------
|
||||||
main/endlevel.c, main/newdemo.c: Properly record the event of reset_rear_view() while switching levels to make it work right when rewinding as well; Properly record Countdown seconds for each newdemo frame instead of second change to get display showing up right while playback and still preserving backwards compability
|
main/endlevel.c, main/newdemo.c: Properly record the event of reset_rear_view() while switching levels to make it work right when rewinding as well; Properly record Countdown seconds for each newdemo frame instead of second change to get display showing up right while playback and still preserving backwards compability
|
||||||
|
|
|
@ -376,6 +376,7 @@ void init_controlcen_for_level(void)
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
if (cntrlcen_objnum == -1) {
|
if (cntrlcen_objnum == -1) {
|
||||||
|
Dead_controlcen_object_num = -1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ extern void do_controlcen_destroyed_stuff(object *objp);
|
||||||
extern void do_controlcen_dead_frame(void);
|
extern void do_controlcen_dead_frame(void);
|
||||||
|
|
||||||
extern fix Countdown_timer;
|
extern fix Countdown_timer;
|
||||||
extern int Control_center_destroyed, Countdown_seconds_left;
|
extern int Control_center_destroyed, Countdown_seconds_left, Total_countdown_time;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* reads n control_center_triggers structs from a CFILE
|
* reads n control_center_triggers structs from a CFILE
|
||||||
|
|
|
@ -1351,6 +1351,8 @@ RetryObjectLoading:
|
||||||
Control_center_next_fire_time = PHYSFSX_readSXE32(fp, swap);
|
Control_center_next_fire_time = PHYSFSX_readSXE32(fp, swap);
|
||||||
Control_center_present = PHYSFSX_readSXE32(fp, swap);
|
Control_center_present = PHYSFSX_readSXE32(fp, swap);
|
||||||
Dead_controlcen_object_num = PHYSFSX_readSXE32(fp, swap);
|
Dead_controlcen_object_num = PHYSFSX_readSXE32(fp, swap);
|
||||||
|
if (Control_center_destroyed)
|
||||||
|
Total_countdown_time = Countdown_timer/F0_5; // we do not need to know this, but it should not be 0 either...
|
||||||
|
|
||||||
// Restore the AI state
|
// Restore the AI state
|
||||||
ai_restore_state( fp, swap );
|
ai_restore_state( fp, swap );
|
||||||
|
|
Loading…
Reference in a new issue