Make map_scroll() use new direction macros and slightly re-styled its code.