(cherry picked from commit ba55947ee6ab36efc04598953a78a11173103bcf) # Conflicts: # src/doomtype.h # src/dummy/i_system.c