For a few larger functions I took them out of sector_t and made them global functions to avoid creating more unnecessary stubs. # Conflicts: # src/p_sectors.cpp