Skip to content

Commit

Permalink
Merge branch 'ermo-experimental' into experimental
Browse files Browse the repository at this point in the history
  • Loading branch information
Taose committed May 21, 2017
2 parents ec9e625 + af7a49d commit d4e9c7a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions engine/src/savegame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ void SaveGame::ReadMissionData( char* &buf, bool select_data, const std::set< st
vector< float > *vecfloat = 0;
bool skip = true;
// In rare instances (seen with wonky save game file),
// md_i_size can be < 0, which will cause the reserve call to fail hard
// md_i_size can be < 0, which will cause the reserve call to fail hard.
// Add a debug message to explain the issue and point out that the save
// game file is broken.
if ( md_i_size >= 0 && ( !select_data || select_data_filter.count( mag_num ) ) ) {
Expand All @@ -491,7 +491,7 @@ void SaveGame::ReadMissionData( char* &buf, bool select_data, const std::set< st
skip = false;
} else {
//debugging attempt -- show why the allocation would fail
vs_dprintf(1, " SaveGame::ReadMissionTringData: vecstring->reserve(md_i_size = %d) will fail, bailing out (i = %d)", md_i_size, i);
vs_dprintf(1, " SaveGame::ReadMissionData: vecstring->reserve(md_i_size = %d) will fail, bailing out (i = %d)", md_i_size, i);
}
for (int j = 0; j < md_i_size; j++) {
if (!skip) {
Expand Down

0 comments on commit d4e9c7a

Please sign in to comment.