diff --git a/command.c b/command.c index aaf947acab..2bee188316 100644 --- a/command.c +++ b/command.c @@ -167,8 +167,6 @@ DEF_COMMAND(CmdRemoveSignalTrack); DEF_COMMAND(CmdReplaceVehicle); -DEF_COMMAND(CmdSetNewMapSize); - /* The master command table */ static CommandProc * const _command_proc_table[] = { CmdBuildRailroadTrack, /* 0 */ @@ -310,7 +308,6 @@ static CommandProc * const _command_proc_table[] = { CmdGiveMoney, /* 113 */ CmdChangePatchSetting, /* 114 */ CmdReplaceVehicle, /* 115 */ - CmdSetNewMapSize, /* 116 */ }; /* This function range-checks a cmd, and checks if the cmd is not NULL */ diff --git a/command.h b/command.h index eeb9efd349..90a3283d2d 100644 --- a/command.h +++ b/command.h @@ -149,8 +149,6 @@ enum { CMD_CHANGE_PATCH_SETTING = 114, CMD_REPLACE_VEHICLE = 115, - - CMD_SET_NEW_MAP_SIZE = 116, }; enum { diff --git a/intro_gui.c b/intro_gui.c index 5d5b8345f2..827f63b93d 100644 --- a/intro_gui.c +++ b/intro_gui.c @@ -79,13 +79,16 @@ static void SelectGameWndProc(Window *w, WindowEvent *e) { case 4: DoCommandP(0, InteractiveRandom(), 0, NULL, CMD_CREATE_SCENARIO); break; case 5: ShowSaveLoadDialog(SLD_LOAD_SCENARIO); break; case 6: case 7: case 8: case 9: + // XXX: Useless usage of the CMD infrastructure? DoCommandP(0, e->click.widget - 6, 0, NULL, CMD_SET_NEW_LANDSCAPE_TYPE); break; case 10: case 11: case 12: case 13: case 14: case 15: - DoCommandP(0, 6 + e->click.widget - 10, _patches.map_y, NULL, CMD_SET_NEW_MAP_SIZE); + _patches.map_x = 6 + e->click.widget - 10; + InvalidateWindowClasses(WC_SELECT_GAME); break; case 16: case 17: case 18: case 19: case 20: case 21: - DoCommandP(0, _patches.map_x, 6 + e->click.widget - 16, NULL, CMD_SET_NEW_MAP_SIZE); + _patches.map_y = 6 + e->click.widget - 16; + InvalidateWindowClasses(WC_SELECT_GAME); break; case 23: #ifdef ENABLE_NETWORK @@ -326,9 +329,6 @@ int32 CmdSetNewLandscapeType(int x, int y, uint32 flags, uint32 p1, uint32 p2) int32 CmdSetNewMapSize(int x, int y, uint32 flags, uint32 p1, uint32 p2) { if (flags & DC_EXEC) { - _patches.map_x = p1; - _patches.map_y = p2; - InvalidateWindowClasses(WC_SELECT_GAME); } return 0; }