Resolved merge conflicts. #17

Open
anomaly wants to merge 26 commits from anomaly/iw6-mod:master into master
Showing only changes of commit 5c7d1af309 - Show all commits
+2 -1
View File
@@ -157,11 +157,12 @@ namespace // demo class
if (!parse_demo(file_, buffer_, post_map_header_file_offset_, pred_data_, pred_data_index_, gs_))
{
if (is_demo_repeating() && *game::mp::connstate != game::CA_DISCONNECTED)
{ // don't repeat demo if it was stopped manually
{
repeat();
}
else
{
// don't repeat demo if it was stopped manually
stop();
}
}