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

Rearranged some calls of start_time() and stop_time() (+ limited usage to single functions) to make sure time_paused does not go out of balance

Browse source
This commit is contained in:
zico 2015-08-30 14:04:59 +02:00
parent 818017398d
commit 1aeb8505ee
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
similar/main/multi.cpp
View file

@ -4831,7 +4831,6 @@ void multi_save_game(ubyte slot, uint id, char *desc)
snprintf(filename, sizeof(filename), PLAYER_DIRECTORY_STRING("%s.mg%d"), static_cast<const char *>(get_local_player().callsign), slot);
HUD_init_message(HM_MULTI, "Saving game #%d, '%s'", slot, desc);
stop_time();
state_game_id = id;
state_save_all_sub(filename, desc );
}

7
similar/main/newdemo.cpp
View file

@ -3034,13 +3034,17 @@ static int newdemo_read_frame_information(int rewrite)
if ((loaded_level < Last_secret_level) || (loaded_level > Last_level)) {
nm_messagebox( NULL, 1, TXT_OK, "%s\n%s\n%s", TXT_CANT_PLAYBACK, TXT_LEVEL_CANT_LOAD, TXT_DEMO_OLD_CORRUPT );
Current_mission.reset();
start_time();
return -1;
}
LoadLevel((int)loaded_level,1);
nd_playback_v_cntrlcen_destroyed = 0;
start_time();
}
if (!rewrite)
stop_time();
#if defined(DXX_BUILD_DESCENT_II)
if (nd_playback_v_juststarted)
{
@ -3098,7 +3102,8 @@ static int newdemo_read_frame_information(int rewrite)
reset_palette_add(); // get palette back to normal
full_palette_save(); // initialise for palette_restore()
start_time();
if (!rewrite)
start_time();
break;
}

4
similar/main/state.cpp
View file

@ -881,6 +881,7 @@ int state_save_all(const secret_save secret, const blind_save blind_save)
}
}
#endif
start_time();
rval = state_save_all_sub(filename, desc);
@ -905,10 +906,11 @@ int state_save_all_sub(const char *filename, const char *desc)
auto fp = PHYSFSX_openWriteBuffered(filename);
if ( !fp ) {
nm_messagebox(NULL, 1, TXT_OK, "Error writing savegame.\nPossibly out of disk\nspace.");
start_time();
return 0;
}
stop_time();
//Save id
PHYSFS_write(fp, dgss_id, sizeof(char) * 4, 1);