equal
deleted
inserted
replaced
59 #include "clear_map.h" |
59 #include "clear_map.h" |
60 #include "fontcache.h" |
60 #include "fontcache.h" |
61 #include "newgrf.h" |
61 #include "newgrf.h" |
62 #include "newgrf_config.h" |
62 #include "newgrf_config.h" |
63 #include "newgrf_house.h" |
63 #include "newgrf_house.h" |
|
64 #include "newgrf_commons.h" |
64 #include "player_face.h" |
65 #include "player_face.h" |
65 |
66 |
66 #include "bridge_map.h" |
67 #include "bridge_map.h" |
67 #include "clear_map.h" |
68 #include "clear_map.h" |
68 #include "rail_map.h" |
69 #include "rail_map.h" |
683 static void MakeNewGame(bool from_heightmap) |
684 static void MakeNewGame(bool from_heightmap) |
684 { |
685 { |
685 _game_mode = GM_NORMAL; |
686 _game_mode = GM_NORMAL; |
686 |
687 |
687 ResetGRFConfig(true); |
688 ResetGRFConfig(true); |
688 ResetHouseIDMapping(); |
689 _house_mngr.ResetMapping(); |
689 |
690 |
690 GenerateWorldSetCallback(&MakeNewGameDone); |
691 GenerateWorldSetCallback(&MakeNewGameDone); |
691 GenerateWorld(from_heightmap ? GW_HEIGHTMAP : GW_NEWGAME, 1 << _patches.map_x, 1 << _patches.map_y); |
692 GenerateWorld(from_heightmap ? GW_HEIGHTMAP : GW_NEWGAME, 1 << _patches.map_x, 1 << _patches.map_y); |
692 } |
693 } |
693 |
694 |