Thank you for that - I have now uncommented LINE_WAYTOLL. This does not affect the above issue, but I presume that you did not imagine that it would.
Comparing the various tool definitions, we get, for dialogue tools:
vehicle-management-new
enum {
// dialogue tools
DIALOG_HELP = 0,
DIALOG_OPTIONS,
DIALOG_MINIMAP,
DIALOG_LINEOVERVIEW,
DIALOG_MESSAGES,
DIALOG_FINANCES,
DIALOG_PLAYERS,
DIALOG_DISPLAYOPTIONS,
DIALOG_SOUND,
DIALOG_LANGUAGE,
DIALOG_PLAYERCOLOR,
DIALOG_JUMP,
DIALOG_LOAD,
DIALOG_SAVE,
DIALOG_LIST_HALT,
DIALOG_LIST_CONVOI,
DIALOG_LIST_TOWN,
DIALOG_LIST_GOODS,
DIALOG_LIST_FACTORY,
DIALOG_LIST_CURIOSITY,
DIALOG_EDIT_FACTORY,
DIALOG_EDIT_ATTRACTION,
DIALOG_EDIT_HOUSE,
DIALOG_EDIT_TREE,
DIALOG_ENLARGE_MAP,
DIALOG_LIST_LABEL,
DIALOG_CLIMATES,
DIALOG_SETTINGS,
DIALOG_GAMEINFO,
DIALOG_THEMES,
DIALOG_SCENARIO,
DIALOG_SCENARIO_INFO,
DIALOG_LIST_DEPOT,
DIALOG_LIST_VEHICLE,
//DIALOG_SCRIPT_TOOL,
DIALOG_TOOL_STANDARD_COUNT,
// Extended entries from here:
DIALOG_LIST_SIGNALBOX =0x0080,
DIALOG_TOOL_COUNT,
DIALOG_TOOL = 0x4000
};
vehicle-management
enum {
// dialogue tools
DIALOG_HELP = 0,
DIALOG_OPTIONS,
DIALOG_MINIMAP,
DIALOG_LINEOVERVIEW,
DIALOG_MESSAGES,
DIALOG_FINANCES,
DIALOG_PLAYERS,
DIALOG_DISPLAYOPTIONS,
DIALOG_SOUND,
DIALOG_LANGUAGE,
DIALOG_PLAYERCOLOR,
DIALOG_JUMP,
DIALOG_LOAD,
DIALOG_SAVE,
DIALOG_LIST_HALT,
DIALOG_LIST_CONVOI,
DIALOG_LIST_TOWN,
DIALOG_LIST_GOODS,
DIALOG_LIST_FACTORY,
DIALOG_LIST_CURIOSITY,
DIALOG_EDIT_FACTORY,
DIALOG_EDIT_ATTRACTION,
DIALOG_EDIT_HOUSE,
DIALOG_EDIT_TREE,
DIALOG_ENLARGE_MAP,
DIALOG_LIST_LABEL,
DIALOG_CLIMATES,
DIALOG_SETTINGS,
DIALOG_GAMEINFO,
DIALOG_THEMES,
DIALOGE_TOOL_COUNT,
DIALOGE_TOOL = 0x4000
};
master
enum {
// dialogue tools
DIALOG_HELP = 0,
DIALOG_OPTIONS,
DIALOG_MINIMAP,
DIALOG_LINEOVERVIEW,
DIALOG_MESSAGES,
DIALOG_FINANCES,
DIALOG_PLAYERS,
DIALOG_DISPLAYOPTIONS,
DIALOG_SOUND,
DIALOG_LANGUAGE,
DIALOG_PLAYERCOLOR,
DIALOG_JUMP,
DIALOG_LOAD,
DIALOG_SAVE,
DIALOG_LIST_HALT,
DIALOG_LIST_CONVOI,
DIALOG_LIST_TOWN,
DIALOG_LIST_GOODS,
DIALOG_LIST_FACTORY,
DIALOG_LIST_CURIOSITY,
DIALOG_EDIT_FACTORY,
DIALOG_EDIT_ATTRACTION,
DIALOG_EDIT_HOUSE,
DIALOG_EDIT_TREE,
DIALOG_ENLARGE_MAP,
DIALOG_LIST_LABEL,
DIALOG_CLIMATES,
DIALOG_SETTINGS,
DIALOG_GAMEINFO,
DIALOG_THEMES,
DIALOG_SCENARIO,
DIALOG_SCENARIO_INFO,
DIALOG_LIST_DEPOT,
DIALOG_LIST_VEHICLE,
//DIALOG_SCRIPT_TOOL,
DIALOG_TOOL_STANDARD_COUNT,
// Extended entries from here:
DIALOG_LIST_SIGNALBOX =0x0080,
DIALOG_TOOL_COUNT,
DIALOG_TOOL = 0x4000
};
SIMPLE TOOLS
vehicle-management-new
enum {
// simple one click tools
TOOL_PAUSE = 0,
TOOL_FASTFORWARD,
TOOL_SCREENSHOT,
TOOL_INCREASE_INDUSTRY,
TOOL_UNDO,
TOOL_SWITCH_PLAYER,
TOOL_STEP_YEAR,
TOOL_CHANGE_GAME_SPEED,
TOOL_ZOOM_IN,
TOOL_ZOOM_OUT,
TOOL_SHOW_COVERAGE,
TOOL_SHOW_NAME,
TOOL_SHOW_GRID,
TOOL_SHOW_TREES,
TOOL_SHOW_HOUSES,
TOOL_SHOW_UNDERGROUND,
TOOL_ROTATE90,
TOOL_QUIT,
TOOL_FILL_TREES,
TOOL_DAYNIGHT_LEVEL,
TOOL_VEHICLE_TOOLTIPS,
TOOL_TOOGLE_PAX,
TOOL_TOOGLE_PEDESTRIANS,
TOOL_TRAFFIC_LEVEL,
TOOL_CHANGE_CONVOI,
TOOL_CHANGE_LINE,
TOOL_CHANGE_DEPOT,
UNUSED_WKZ_PWDHASH_TOOL,
TOOL_CHANGE_PLAYER,
TOOL_CHANGE_TRAFFIC_LIGHT,
TOOL_CHANGE_CITY,
TOOL_RENAME,
TOOL_ADD_MESSAGE,
TOOL_TOGGLE_RESERVATION,
TOOL_VIEW_OWNER,
TOOL_HIDE_UNDER_CURSOR,
TOOL_MOVE_MAP,
TOOL_ROLLUP_ALL_WIN,
TOOL_RECOLOUR_TOOL_DEPRECATED,
TOOL_ACCESS_TOOL_DEPRECATED,
SIMPLE_TOOL_STANDARD_COUNT,
// Extended entries from here:
TOOL_CHANGE_ROADSIGN=0x0080,
TOOL_SHOW_RIBI,
TOOL_RECOLOUR_TOOL,
TOOL_ACCESS_TOOL,
TOOL_SHOW_SIGNALBOX_COVERAGE,
TOOL_CONVOY_NAMEPLATES,
TOOL_CONVOY_LOADINGBAR,
SIMPLE_TOOL_COUNT,
SIMPLE_TOOL = 0x2000
};
vehicle-management
enum {
// simple one click tools
TOOL_PAUSE = 0,
TOOL_FASTFORWARD,
TOOL_SCREENSHOT,
TOOL_INCREASE_INDUSTRY,
TOOL_UNDO,
TOOL_SWITCH_PLAYER,
TOOL_STEP_YEAR,
TOOL_CHANGE_GAME_SPEED,
TOOL_ZOOM_IN,
TOOL_ZOOM_OUT,
TOOL_SHOW_COVERAGE,
TOOL_SHOW_NAME,
TOOL_SHOW_GRID,
TOOL_SHOW_TREES,
TOOL_SHOW_HOUSES,
TOOL_SHOW_UNDERGROUND,
TOOL_ROTATE90,
TOOL_QUIT,
TOOL_FILL_TREES,
TOOL_DAYNIGHT_LEVEL,
TOOL_VEHICLE_TOOLTIPS,
TOOL_TOOGLE_PAX,
TOOL_TOOGLE_PEDESTRIANS,
TOOL_TRAFFIC_LEVEL,
TOOL_CHANGE_CONVOI,
TOOL_CHANGE_LINE,
TOOL_CHANGE_DEPOT,
UNUSED_WKZ_PWDHASH_TOOL,
TOOL_CHANGE_PLAYER,
TOOL_CHANGE_TRAFFIC_LIGHT,
TOOL_CHANGE_CITY,
TOOL_RENAME,
TOOL_ADD_MESSAGE,
TOOL_TOGGLE_RESERVATION,
TOOL_VIEW_OWNER,
TOOL_HIDE_UNDER_CURSOR,
TOOL_CHANGE_ROADSIGN,
TOOL_SHOW_RIBI,
TOOL_RECOLOUR_TOOL,
TOOL_ACCESS_TOOL,
SIMPLE_TOOL_COUNT,
SIMPLE_TOOL = 0x2000
};
master
enum {
// simple one click tools
TOOL_PAUSE = 0,
TOOL_FASTFORWARD,
TOOL_SCREENSHOT,
TOOL_INCREASE_INDUSTRY,
TOOL_UNDO,
TOOL_SWITCH_PLAYER,
TOOL_STEP_YEAR,
TOOL_CHANGE_GAME_SPEED,
TOOL_ZOOM_IN,
TOOL_ZOOM_OUT,
TOOL_SHOW_COVERAGE,
TOOL_SHOW_NAME,
TOOL_SHOW_GRID,
TOOL_SHOW_TREES,
TOOL_SHOW_HOUSES,
TOOL_SHOW_UNDERGROUND,
TOOL_ROTATE90,
TOOL_QUIT,
TOOL_FILL_TREES,
TOOL_DAYNIGHT_LEVEL,
TOOL_VEHICLE_TOOLTIPS,
TOOL_TOOGLE_PAX,
TOOL_TOOGLE_PEDESTRIANS,
TOOL_TRAFFIC_LEVEL,
TOOL_CHANGE_CONVOI,
TOOL_CHANGE_LINE,
TOOL_CHANGE_DEPOT,
UNUSED_WKZ_PWDHASH_TOOL,
TOOL_CHANGE_PLAYER,
TOOL_CHANGE_TRAFFIC_LIGHT,
TOOL_CHANGE_CITY,
TOOL_RENAME,
TOOL_ADD_MESSAGE,
TOOL_TOGGLE_RESERVATION,
TOOL_VIEW_OWNER,
TOOL_HIDE_UNDER_CURSOR,
TOOL_MOVE_MAP,
TOOL_ROLLUP_ALL_WIN,
TOOL_RECOLOUR_TOOL_DEPRECATED,
TOOL_ACCESS_TOOL_DEPRECATED,
SIMPLE_TOOL_STANDARD_COUNT,
// Extended entries from here:
TOOL_CHANGE_ROADSIGN=0x0080,
TOOL_SHOW_RIBI,
TOOL_RECOLOUR_TOOL,
TOOL_ACCESS_TOOL,
TOOL_SHOW_SIGNALBOX_COVERAGE,
TOOL_CONVOY_NAMEPLATES,
TOOL_CONVOY_LOADINGBAR,
SIMPLE_TOOL_COUNT,
SIMPLE_TOOL = 0x2000
};
GENERAL TOOLS
vehicle-management-new
enum {
// general tools
TOOL_QUERY=0,
TOOL_REMOVER,
TOOL_RAISE_LAND,
TOOL_LOWER_LAND,
TOOL_SETSLOPE,
TOOL_RESTORESLOPE,
TOOL_MARKER,
TOOL_CLEAR_RESERVATION,
TOOL_TRANSFORMER,
TOOL_ADD_CITY,
TOOL_CHANGE_CITY_SIZE,
TOOL_PLANT_TREE,
TOOL_SCHEDULE_ADD,
TOOL_SCHEDULE_INS,
TOOL_BUILD_WAY,
TOOL_BUILD_BRIDGE,
TOOL_BUILD_TUNNEL,
TOOL_WAYREMOVER,
TOOL_BUILD_WAYOBJ,
TOOL_BUILD_STATION,
TOOL_BUILD_ROADSIGN,
TOOL_BUILD_DEPOT,
TOOL_BUILD_HOUSE,
TOOL_BUILD_LAND_CHAIN,
TOOL_CITY_CHAIN,
TOOL_BUILD_FACTORY,
TOOL_LINK_FACTORY,
TOOL_HEADQUARTER,
TOOL_LOCK_GAME,
TOOL_ADD_CITYCAR,
TOOL_FOREST,
TOOL_STOP_MOVER,
TOOL_MAKE_STOP_PUBLIC,
TOOL_REMOVE_WAYOBJ,
TOOL_SLICED_AND_UNDERGROUND_VIEW,
TOOL_BUY_HOUSE,
TOOL_BUILD_CITYROAD,
TOOL_ERROR_MESSAGE,
TOOL_CHANGE_WATER_HEIGHT,
TOOL_SET_CLIMATE,
TOOL_ROTATE_BUILDING,
TOOL_REASSIGN_SIGNAL_DEPRECATED,
GENERAL_TOOL_STANDARD_COUNT,
// Extended entries from here:
TOOL_BUILD_SIGNALBOX=0x0080,
TOOL_REASSIGN_SIGNAL,
GENERAL_TOOL_COUNT,
GENERAL_TOOL = 0x1000
};
vehicle-management
enum {
// general tools
TOOL_QUERY=0,
TOOL_REMOVER,
TOOL_RAISE_LAND,
TOOL_LOWER_LAND,
TOOL_SETSLOPE,
TOOL_RESTORESLOPE,
TOOL_MARKER,
TOOL_CLEAR_RESERVATION,
TOOL_TRANSFORMER,
TOOL_ADD_CITY,
TOOL_CHANGE_CITY_SIZE,
TOOL_PLANT_TREE,
TOOL_SCHEDULE_ADD,
TOOL_SCHEDULE_INS,
TOOL_BUILD_WAY,
TOOL_BUILD_BRIDGE,
TOOL_BUILD_TUNNEL,
TOOL_WAYREMOVER,
TOOL_BUILD_WAYOBJ,
TOOL_BUILD_STATION,
TOOL_BUILD_ROADSIGN,
TOOL_BUILD_DEPOT,
TOOL_BUILD_HOUSE,
TOOL_BUILD_LAND_CHAIN,
TOOL_CITY_CHAIN,
TOOL_BUILD_FACTORY,
TOOL_LINK_FACTORY,
TOOL_HEADQUARTER,
TOOL_LOCK_GAME,
TOOL_ADD_CITYCAR,
TOOL_FOREST,
TOOL_STOP_MOVER,
TOOL_MAKE_STOP_PUBLIC,
TOOL_REMOVE_WAYOBJ,
TOOL_SLICED_AND_UNDERGROUND_VIEW,
TOOL_BUY_HOUSE,
TOOL_BUILD_CITYROAD,
TOOL_ERROR_MESSAGE,
TOOL_CHANGE_WATER_HEIGHT,
TOOL_SET_CLIMATE,
TOOL_BUILD_SIGNALBOX,
TOOL_REASSIGN_SIGNAL,
GENERAL_TOOL_COUNT,
GENERAL_TOOL = 0x1000
};
master
enum {
// general tools
TOOL_QUERY=0,
TOOL_REMOVER,
TOOL_RAISE_LAND,
TOOL_LOWER_LAND,
TOOL_SETSLOPE,
TOOL_RESTORESLOPE,
TOOL_MARKER,
TOOL_CLEAR_RESERVATION,
TOOL_TRANSFORMER,
TOOL_ADD_CITY,
TOOL_CHANGE_CITY_SIZE,
TOOL_PLANT_TREE,
TOOL_SCHEDULE_ADD,
TOOL_SCHEDULE_INS,
TOOL_BUILD_WAY,
TOOL_BUILD_BRIDGE,
TOOL_BUILD_TUNNEL,
TOOL_WAYREMOVER,
TOOL_BUILD_WAYOBJ,
TOOL_BUILD_STATION,
TOOL_BUILD_ROADSIGN,
TOOL_BUILD_DEPOT,
TOOL_BUILD_HOUSE,
TOOL_BUILD_LAND_CHAIN,
TOOL_CITY_CHAIN,
TOOL_BUILD_FACTORY,
TOOL_LINK_FACTORY,
TOOL_HEADQUARTER,
TOOL_LOCK_GAME,
TOOL_ADD_CITYCAR,
TOOL_FOREST,
TOOL_STOP_MOVER,
TOOL_MAKE_STOP_PUBLIC,
TOOL_REMOVE_WAYOBJ,
TOOL_SLICED_AND_UNDERGROUND_VIEW,
TOOL_BUY_HOUSE,
TOOL_BUILD_CITYROAD,
TOOL_ERROR_MESSAGE,
TOOL_CHANGE_WATER_HEIGHT,
TOOL_SET_CLIMATE,
TOOL_ROTATE_BUILDING,
TOOL_REASSIGN_SIGNAL_DEPRECATED,
GENERAL_TOOL_STANDARD_COUNT,
// Extended entries from here:
TOOL_BUILD_SIGNALBOX=0x0080,
TOOL_REASSIGN_SIGNAL,
GENERAL_TOOL_COUNT,
GENERAL_TOOL = 0x1000
};
Incidentally, I will be moving/have moved this discussion to the schedule features (technical discussion) thread as the details of integrating the vehicle-management branch into the current branch more properly belong there.
Edit: Incidentally, an initial analysis shows that the vehicle-management-new branch's tool definitions in simmenu.h are identical to those in the master branch, suggesting no changes between the old master and vehicle-management branches and that these merged cleanly.