Merge branch 'master' into next

This commit is contained in:
Monster Iestyn committed 2017-05-22 13:23:46 +01:00
commit 6062223eb5
1 file changed
+2 -1
+2 -1
View File
@@ -965,7 +965,8 @@ void Y_StartIntermission(void)
}
// We couldn't display the intermission even if we wanted to.
if (dedicated) return;
// But we still need to give the players their score bonuses, dummy.
//if (dedicated) return;
// This should always exist, but just in case...
if(!mapheaderinfo[prevmap])