diff --git a/newgrf.c b/newgrf.c --- a/newgrf.c +++ b/newgrf.c @@ -3425,7 +3425,7 @@ static void InitNewGRFFile(const GRFConf /* Copy the initial parameter list */ assert(lengthof(newfile->param) == lengthof(config->param) && lengthof(config->param) == 0x80); newfile->param_end = config->num_params; - memcpy(newfile->param, config->param, 0x80 * sizeof(newfile->param[0])); + memcpy(newfile->param, config->param, sizeof(newfile->param)); if (_first_grffile == NULL) { _cur_grffile = newfile; diff --git a/openttd.h b/openttd.h --- a/openttd.h +++ b/openttd.h @@ -387,8 +387,6 @@ enum { WC_BUILD_VEHICLE, WC_BUILD_BRIDGE, WC_ERRMSG, - WC_ASK_ABANDON_GAME, - WC_QUIT_GAME, WC_BUILD_STATION, WC_BUS_STATION, WC_TRUCK_STATION, @@ -444,7 +442,6 @@ enum { WC_GENERATE_LANDSCAPE, WC_GENERATE_PROGRESS_WINDOW, WC_CONFIRM_POPUP_QUERY, - WC_DEPOT_SELL_ALL, };