diff -r -B -X .diff-exclude vanilla/azure-pipelines/templates/windows-dependencies.yml cmclient/azure-pipelines/templates/windows-dependencies.yml
9a10,12
>     mv windows-dependencies/vcpkg.exe /c/vcpkg/
>     rm -rf /c/vcpkg/scripts
>     mv windows-dependencies/scripts /c/vcpkg/
Only in cmclient/bin/ai/regression: regression.nut
Only in cmclient/bin/ai/regression: regression.sav
Only in cmclient/bin/ai/regression: regression.txt
Only in cmclient/bin/ai/regression: require.nut
Only in cmclient/bin: data
Only in cmclient/bin/scripts: autoexec.scr
Only in cmclient/bin/scripts: on_client.scr
Only in cmclient: .clang-format
Only in cmclient: cm_changelog.txt
Only in cmclient: cmclient.sublime-project
Only in cmclient: .diff-exclude
Only in cmclient/docs: Readme_Windows_MSVC.txt
Only in cmclient: gen_newgrf_revisions.py
diff -r -B -X .diff-exclude vanilla/Makefile.bundle.in cmclient/Makefile.bundle.in
26a27
> DATA_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
32a34
> DATA_DIR    = $(BUNDLE_DIR)/data
47a50
> 	$(Q)mkdir -p "$(DATA_DIR)"
62a66
> 	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
Only in cmclient/projects: generate_vs100.vcxproj
Only in cmclient/projects: generate_vs80.vcproj
Only in cmclient/projects: generate_vs90.vcproj
Only in cmclient/projects: langs_vs100.vcxproj
Only in cmclient/projects: langs_vs100.vcxproj.filters
Only in cmclient/projects: langs_vs100.vcxproj.filters.in
Only in cmclient/projects: langs_vs100.vcxproj.in
Only in cmclient/projects: langs_vs80.vcproj
Only in cmclient/projects: langs_vs80.vcproj.in
Only in cmclient/projects: langs_vs90.vcproj
Only in cmclient/projects: langs_vs90.vcproj.in
Only in cmclient/projects: openttd_vs100.sln
Only in cmclient/projects: openttd_vs100.v11.suo
Only in cmclient/projects: openttd_vs100.vcxproj
Only in cmclient/projects: openttd_vs100.vcxproj.filters
Only in cmclient/projects: openttd_vs100.vcxproj.filters.in
Only in cmclient/projects: openttd_vs100.vcxproj.in
Only in cmclient/projects: openttd_vs100.vcxproj.my
Only in cmclient/projects: openttd_vs100.vcxproj.user
diff -r -B -X .diff-exclude vanilla/projects/openttd_vs140.vcxproj cmclient/projects/openttd_vs140.vcxproj
454a455
>     <ClInclude Include="..\src\cargo_table_gui.h" />
709a711
>     <ClInclude Include="..\src\watch_gui.h" />
721a724
>     <ClInclude Include="..\src\zoning.h" />
757a761
>     <ClCompile Include="..\src\cargo_table_gui.cpp" />
758a763
>     <ClCompile Include="..\src\commands_gui.cpp" />
807a813
>     <ClCompile Include="..\src\watch_gui.cpp" />
809a816
>     <ClCompile Include="..\src\zoning_gui.cpp" />
815a823
>     <ClInclude Include="..\src\widgets\cargo_table_widget.h" />
894a903
>     <ClCompile Include="..\src\zoning_cmd.cpp" />
1215a1225
>     <ClCompile Include="..\src\blitter\base.cpp" />
1350a1361,1393
>     <ClInclude Include="..\src\citymania\cm_bitstream.hpp" />
>     <ClCompile Include="..\src\citymania\cm_bitstream.cpp" />
>     <ClInclude Include="..\src\citymania\cm_console_cmds.hpp" />
>     <ClCompile Include="..\src\citymania\cm_console_cmds.cpp" />
>     <ClInclude Include="..\src\citymania\cm_event.hpp" />
>     <ClInclude Include="..\src\citymania\cm_export.hpp" />
>     <ClCompile Include="..\src\citymania\cm_export.cpp" />
>     <ClInclude Include="..\src\citymania\cm_game.hpp" />
>     <ClCompile Include="..\src\citymania\cm_game.cpp" />
>     <ClInclude Include="..\src\citymania\cm_hotkeys.hpp" />
>     <ClCompile Include="..\src\citymania\cm_hotkeys.cpp" />
>     <ClInclude Include="..\src\citymania\cm_main.hpp" />
>     <ClCompile Include="..\src\citymania\cm_main.cpp" />
>     <ClInclude Include="..\src\citymania\cm_tooltips.hpp" />
>     <ClCompile Include="..\src\citymania\cm_tooltips.cpp" />
>     <ClInclude Include="..\src\citymania\cm_type.hpp" />
>     <ClInclude Include="..\src\citymania\cm_saveload.hpp" />
>     <ClCompile Include="..\src\citymania\cm_saveload.cpp" />
>     <ClInclude Include="..\src\citymania\cm_settings.hpp" />
>     <ClInclude Include="..\src\citymania\extensions\cmext_town.hpp" />
>     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp" />
>     <ClInclude Include="..\src\citymania\cm_base64.hpp" />
>     <ClCompile Include="..\src\citymania\cm_base64.cpp" />
>     <ClInclude Include="..\src\citymania\cm_highlight.hpp" />
>     <ClCompile Include="..\src\citymania\cm_highlight.cpp" />
>     <ClInclude Include="..\src\citymania\cm_highlight_type.hpp" />
>     <ClInclude Include="..\src\citymania\cm_locations.hpp" />
>     <ClCompile Include="..\src\citymania\cm_locations.cpp" />
>     <ClInclude Include="..\src\citymania\cm_minimap.hpp" />
>     <ClCompile Include="..\src\citymania\cm_minimap.cpp" />
>     <ClInclude Include="..\src\citymania\cm_station_gui.hpp" />
>     <ClCompile Include="..\src\citymania\cm_station_gui.cpp" />
>     <ClInclude Include="..\src\newgrf_revisions.hpp" />
diff -r -B -X .diff-exclude vanilla/projects/openttd_vs140.vcxproj.filters cmclient/projects/openttd_vs140.vcxproj.filters
102a103,108
>     <Filter Include="CityMania">
>       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000033}</UniqueIdentifier>
>     </Filter>
>     <Filter Include="CityMania client">
>       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000034}</UniqueIdentifier>
>     </Filter>
446a453,455
>     <ClInclude Include="..\src\cargo_table_gui.h">
>       <Filter>Header Files</Filter>
>     </ClInclude>
1211a1221,1223
>     <ClInclude Include="..\src\watch_gui.h">
>       <Filter>Header Files</Filter>
>     </ClInclude>
1247a1260,1262
>     <ClInclude Include="..\src\zoning.h">
>       <Filter>Header Files</Filter>
>     </ClInclude>
1355a1371,1373
>     <ClCompile Include="..\src\cargo_table_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1358a1377,1379
>     <ClCompile Include="..\src\commands_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1505a1527,1529
>     <ClCompile Include="..\src\watch_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1511a1536,1538
>     <ClCompile Include="..\src\zoning_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1529a1557,1559
>     <ClInclude Include="..\src\widgets\cargo_table_widget.h">
>       <Filter>Widgets</Filter>
>     </ClInclude>
1766a1797,1799
>     <ClCompile Include="..\src\zoning_cmd.cpp">
>       <Filter>Command handlers</Filter>
>     </ClCompile>
2729a2763,2765
>     <ClCompile Include="..\src\blitter\base.cpp">
>       <Filter>Blitters</Filter>
>     </ClCompile>
3133a3170,3268
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_bitstream.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_bitstream.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_console_cmds.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_console_cmds.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_event.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_export.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_export.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_game.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_game.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_hotkeys.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_hotkeys.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_main.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_main.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_tooltips.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_tooltips.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_type.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_saveload.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_saveload.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_settings.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\extensions\cmext_town.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_base64.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_base64.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_highlight.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_highlight.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_highlight_type.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_locations.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_locations.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_minimap.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_minimap.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_station_gui.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_station_gui.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\newgrf_revisions.hpp">
>       <Filter>CityMania client</Filter>
diff -r -B -X .diff-exclude vanilla/projects/openttd_vs141.vcxproj cmclient/projects/openttd_vs141.vcxproj
454a455
>     <ClInclude Include="..\src\cargo_table_gui.h" />
709a711
>     <ClInclude Include="..\src\watch_gui.h" />
721a724
>     <ClInclude Include="..\src\zoning.h" />
757a761
>     <ClCompile Include="..\src\cargo_table_gui.cpp" />
758a763
>     <ClCompile Include="..\src\commands_gui.cpp" />
807a813
>     <ClCompile Include="..\src\watch_gui.cpp" />
809a816
>     <ClCompile Include="..\src\zoning_gui.cpp" />
815a823
>     <ClInclude Include="..\src\widgets\cargo_table_widget.h" />
894a903
>     <ClCompile Include="..\src\zoning_cmd.cpp" />
1215a1225
>     <ClCompile Include="..\src\blitter\base.cpp" />
1350a1361,1393
>     <ClInclude Include="..\src\citymania\cm_bitstream.hpp" />
>     <ClCompile Include="..\src\citymania\cm_bitstream.cpp" />
>     <ClInclude Include="..\src\citymania\cm_console_cmds.hpp" />
>     <ClCompile Include="..\src\citymania\cm_console_cmds.cpp" />
>     <ClInclude Include="..\src\citymania\cm_event.hpp" />
>     <ClInclude Include="..\src\citymania\cm_export.hpp" />
>     <ClCompile Include="..\src\citymania\cm_export.cpp" />
>     <ClInclude Include="..\src\citymania\cm_game.hpp" />
>     <ClCompile Include="..\src\citymania\cm_game.cpp" />
>     <ClInclude Include="..\src\citymania\cm_hotkeys.hpp" />
>     <ClCompile Include="..\src\citymania\cm_hotkeys.cpp" />
>     <ClInclude Include="..\src\citymania\cm_main.hpp" />
>     <ClCompile Include="..\src\citymania\cm_main.cpp" />
>     <ClInclude Include="..\src\citymania\cm_tooltips.hpp" />
>     <ClCompile Include="..\src\citymania\cm_tooltips.cpp" />
>     <ClInclude Include="..\src\citymania\cm_type.hpp" />
>     <ClInclude Include="..\src\citymania\cm_saveload.hpp" />
>     <ClCompile Include="..\src\citymania\cm_saveload.cpp" />
>     <ClInclude Include="..\src\citymania\cm_settings.hpp" />
>     <ClInclude Include="..\src\citymania\extensions\cmext_town.hpp" />
>     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp" />
>     <ClInclude Include="..\src\citymania\cm_base64.hpp" />
>     <ClCompile Include="..\src\citymania\cm_base64.cpp" />
>     <ClInclude Include="..\src\citymania\cm_highlight.hpp" />
>     <ClCompile Include="..\src\citymania\cm_highlight.cpp" />
>     <ClInclude Include="..\src\citymania\cm_highlight_type.hpp" />
>     <ClInclude Include="..\src\citymania\cm_locations.hpp" />
>     <ClCompile Include="..\src\citymania\cm_locations.cpp" />
>     <ClInclude Include="..\src\citymania\cm_minimap.hpp" />
>     <ClCompile Include="..\src\citymania\cm_minimap.cpp" />
>     <ClInclude Include="..\src\citymania\cm_station_gui.hpp" />
>     <ClCompile Include="..\src\citymania\cm_station_gui.cpp" />
>     <ClInclude Include="..\src\newgrf_revisions.hpp" />
diff -r -B -X .diff-exclude vanilla/projects/openttd_vs141.vcxproj.filters cmclient/projects/openttd_vs141.vcxproj.filters
102a103,108
>     <Filter Include="CityMania">
>       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000033}</UniqueIdentifier>
>     </Filter>
>     <Filter Include="CityMania client">
>       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000034}</UniqueIdentifier>
>     </Filter>
446a453,455
>     <ClInclude Include="..\src\cargo_table_gui.h">
>       <Filter>Header Files</Filter>
>     </ClInclude>
1211a1221,1223
>     <ClInclude Include="..\src\watch_gui.h">
>       <Filter>Header Files</Filter>
>     </ClInclude>
1247a1260,1262
>     <ClInclude Include="..\src\zoning.h">
>       <Filter>Header Files</Filter>
>     </ClInclude>
1355a1371,1373
>     <ClCompile Include="..\src\cargo_table_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1358a1377,1379
>     <ClCompile Include="..\src\commands_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1505a1527,1529
>     <ClCompile Include="..\src\watch_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1511a1536,1538
>     <ClCompile Include="..\src\zoning_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1529a1557,1559
>     <ClInclude Include="..\src\widgets\cargo_table_widget.h">
>       <Filter>Widgets</Filter>
>     </ClInclude>
1766a1797,1799
>     <ClCompile Include="..\src\zoning_cmd.cpp">
>       <Filter>Command handlers</Filter>
>     </ClCompile>
2729a2763,2765
>     <ClCompile Include="..\src\blitter\base.cpp">
>       <Filter>Blitters</Filter>
>     </ClCompile>
3133a3170,3268
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_bitstream.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_bitstream.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_console_cmds.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_console_cmds.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_event.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_export.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_export.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_game.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_game.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_hotkeys.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_hotkeys.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_main.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_main.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_tooltips.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_tooltips.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_type.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_saveload.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_saveload.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_settings.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\extensions\cmext_town.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_base64.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_base64.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_highlight.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_highlight.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_highlight_type.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_locations.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_locations.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_minimap.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_minimap.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_station_gui.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_station_gui.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\newgrf_revisions.hpp">
>       <Filter>CityMania client</Filter>
diff -r -B -X .diff-exclude vanilla/projects/openttd_vs142.vcxproj cmclient/projects/openttd_vs142.vcxproj
454a455
>     <ClInclude Include="..\src\cargo_table_gui.h" />
709a711
>     <ClInclude Include="..\src\watch_gui.h" />
721a724
>     <ClInclude Include="..\src\zoning.h" />
757a761
>     <ClCompile Include="..\src\cargo_table_gui.cpp" />
758a763
>     <ClCompile Include="..\src\commands_gui.cpp" />
807a813
>     <ClCompile Include="..\src\watch_gui.cpp" />
809a816
>     <ClCompile Include="..\src\zoning_gui.cpp" />
815a823
>     <ClInclude Include="..\src\widgets\cargo_table_widget.h" />
894a903
>     <ClCompile Include="..\src\zoning_cmd.cpp" />
1215a1225
>     <ClCompile Include="..\src\blitter\base.cpp" />
1350a1361,1393
>     <ClInclude Include="..\src\citymania\cm_bitstream.hpp" />
>     <ClCompile Include="..\src\citymania\cm_bitstream.cpp" />
>     <ClInclude Include="..\src\citymania\cm_console_cmds.hpp" />
>     <ClCompile Include="..\src\citymania\cm_console_cmds.cpp" />
>     <ClInclude Include="..\src\citymania\cm_event.hpp" />
>     <ClInclude Include="..\src\citymania\cm_export.hpp" />
>     <ClCompile Include="..\src\citymania\cm_export.cpp" />
>     <ClInclude Include="..\src\citymania\cm_game.hpp" />
>     <ClCompile Include="..\src\citymania\cm_game.cpp" />
>     <ClInclude Include="..\src\citymania\cm_hotkeys.hpp" />
>     <ClCompile Include="..\src\citymania\cm_hotkeys.cpp" />
>     <ClInclude Include="..\src\citymania\cm_main.hpp" />
>     <ClCompile Include="..\src\citymania\cm_main.cpp" />
>     <ClInclude Include="..\src\citymania\cm_tooltips.hpp" />
>     <ClCompile Include="..\src\citymania\cm_tooltips.cpp" />
>     <ClInclude Include="..\src\citymania\cm_type.hpp" />
>     <ClInclude Include="..\src\citymania\cm_saveload.hpp" />
>     <ClCompile Include="..\src\citymania\cm_saveload.cpp" />
>     <ClInclude Include="..\src\citymania\cm_settings.hpp" />
>     <ClInclude Include="..\src\citymania\extensions\cmext_town.hpp" />
>     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp" />
>     <ClInclude Include="..\src\citymania\cm_base64.hpp" />
>     <ClCompile Include="..\src\citymania\cm_base64.cpp" />
>     <ClInclude Include="..\src\citymania\cm_highlight.hpp" />
>     <ClCompile Include="..\src\citymania\cm_highlight.cpp" />
>     <ClInclude Include="..\src\citymania\cm_highlight_type.hpp" />
>     <ClInclude Include="..\src\citymania\cm_locations.hpp" />
>     <ClCompile Include="..\src\citymania\cm_locations.cpp" />
>     <ClInclude Include="..\src\citymania\cm_minimap.hpp" />
>     <ClCompile Include="..\src\citymania\cm_minimap.cpp" />
>     <ClInclude Include="..\src\citymania\cm_station_gui.hpp" />
>     <ClCompile Include="..\src\citymania\cm_station_gui.cpp" />
>     <ClInclude Include="..\src\newgrf_revisions.hpp" />
diff -r -B -X .diff-exclude vanilla/projects/openttd_vs142.vcxproj.filters cmclient/projects/openttd_vs142.vcxproj.filters
102a103,108
>     <Filter Include="CityMania">
>       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000033}</UniqueIdentifier>
>     </Filter>
>     <Filter Include="CityMania client">
>       <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000034}</UniqueIdentifier>
>     </Filter>
446a453,455
>     <ClInclude Include="..\src\cargo_table_gui.h">
>       <Filter>Header Files</Filter>
>     </ClInclude>
1211a1221,1223
>     <ClInclude Include="..\src\watch_gui.h">
>       <Filter>Header Files</Filter>
>     </ClInclude>
1247a1260,1262
>     <ClInclude Include="..\src\zoning.h">
>       <Filter>Header Files</Filter>
>     </ClInclude>
1355a1371,1373
>     <ClCompile Include="..\src\cargo_table_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1358a1377,1379
>     <ClCompile Include="..\src\commands_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1505a1527,1529
>     <ClCompile Include="..\src\watch_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1511a1536,1538
>     <ClCompile Include="..\src\zoning_gui.cpp">
>       <Filter>GUI Source Code</Filter>
>     </ClCompile>
1529a1557,1559
>     <ClInclude Include="..\src\widgets\cargo_table_widget.h">
>       <Filter>Widgets</Filter>
>     </ClInclude>
1766a1797,1799
>     <ClCompile Include="..\src\zoning_cmd.cpp">
>       <Filter>Command handlers</Filter>
>     </ClCompile>
2729a2763,2765
>     <ClCompile Include="..\src\blitter\base.cpp">
>       <Filter>Blitters</Filter>
>     </ClCompile>
3133a3170,3268
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_bitstream.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_bitstream.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_console_cmds.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_console_cmds.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_event.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_export.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_export.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_game.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_game.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_hotkeys.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_hotkeys.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_main.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_main.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_tooltips.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_tooltips.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_type.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_saveload.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_saveload.cpp">
>       <Filter>CityMania</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_settings.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\extensions\cmext_town.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\extensions\cmext_company.hpp">
>       <Filter>CityMania</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_base64.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_base64.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_highlight.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_highlight.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_highlight_type.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClInclude Include="..\src\citymania\cm_locations.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_locations.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_minimap.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_minimap.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\citymania\cm_station_gui.hpp">
>       <Filter>CityMania client</Filter>
>     </ClInclude>
>     <ClCompile Include="..\src\citymania\cm_station_gui.cpp">
>       <Filter>CityMania client</Filter>
>     </ClCompile>
>     <ClInclude Include="..\src\newgrf_revisions.hpp">
>       <Filter>CityMania client</Filter>
Only in cmclient/projects: openttd_vs80.sln
Only in cmclient/projects: openttd_vs80.vcproj
Only in cmclient/projects: openttd_vs80.vcproj.in
Only in cmclient/projects: openttd_vs80.vcproj.user
Only in cmclient/projects: openttd_vs90.sln
Only in cmclient/projects: openttd_vs90.vcproj
Only in cmclient/projects: openttd_vs90.vcproj.in
Only in cmclient/projects: openttd_vs90.vcproj.user
Only in cmclient/projects: settingsgen_vs100.vcxproj
Only in cmclient/projects: settingsgen_vs100.vcxproj.filters
Only in cmclient/projects: settingsgen_vs80.vcproj
Only in cmclient/projects: settingsgen_vs90.vcproj
Only in cmclient/projects: settings_vs100.vcxproj
Only in cmclient/projects: settings_vs100.vcxproj.filters
Only in cmclient/projects: settings_vs100.vcxproj.filters.in
Only in cmclient/projects: settings_vs100.vcxproj.in
Only in cmclient/projects: settings_vs100.vcxproj.user
Only in cmclient/projects: settings_vs80.vcproj
Only in cmclient/projects: settings_vs80.vcproj.in
Only in cmclient/projects: settings_vs90.vcproj
Only in cmclient/projects: settings_vs90.vcproj.in
Only in cmclient/projects: strgen_vs100.vcxproj
Only in cmclient/projects: strgen_vs100.vcxproj.filters
Only in cmclient/projects: strgen_vs100.vcxproj.user
Only in cmclient/projects: strgen_vs80.vcproj
Only in cmclient/projects: strgen_vs90.vcproj
Only in cmclient/projects: version_vs100.vcxproj
Only in cmclient/projects: version_vs80.vcproj
Only in cmclient/projects: version_vs90.vcproj
Only in cmclient: readme.txt
diff -r -B -X .diff-exclude vanilla/source.list cmclient/source.list
141a142
> cargo_table_gui.h
396a398
> watch_gui.h
408a411
> zoning.h
464a468
> cargo_table_gui.cpp
465a470
> commands_gui.cpp
514a520
> watch_gui.cpp
516a523
> zoning_gui.cpp
524a532
> widgets/cargo_table_widget.h
605a614
> zoning_cmd.cpp
959a969
> blitter/base.cpp
1193a1204,1240
> 
> # CityMania
> citymania/cm_bitstream.hpp
> citymania/cm_bitstream.cpp
> citymania/cm_console_cmds.hpp
> citymania/cm_console_cmds.cpp
> citymania/cm_event.hpp
> citymania/cm_export.hpp
> citymania/cm_export.cpp
> citymania/cm_game.hpp
> citymania/cm_game.cpp
> citymania/cm_hotkeys.hpp
> citymania/cm_hotkeys.cpp
> citymania/cm_main.hpp
> citymania/cm_main.cpp
> citymania/cm_tooltips.hpp
> citymania/cm_tooltips.cpp
> citymania/cm_type.hpp
> citymania/cm_saveload.hpp
> citymania/cm_saveload.cpp
> citymania/cm_settings.hpp
> citymania/extensions/cmext_town.hpp
> citymania/extensions/cmext_company.hpp
> 
> # CityMania client
> citymania/cm_base64.hpp
> citymania/cm_base64.cpp
> citymania/cm_highlight.hpp
> citymania/cm_highlight.cpp
> citymania/cm_highlight_type.hpp
> citymania/cm_locations.hpp
> citymania/cm_locations.cpp
> citymania/cm_minimap.hpp
> citymania/cm_minimap.cpp
> citymania/cm_station_gui.hpp
> citymania/cm_station_gui.cpp
> newgrf_revisions.hpp
Only in cmclient/src/3rdparty/squirrel: COMPILE
Only in cmclient/src/3rdparty/squirrel: doc
Only in cmclient/src/3rdparty/squirrel: etc
Only in cmclient/src/3rdparty/squirrel: HISTORY
Only in cmclient/src/3rdparty/squirrel/include: sqstdblob.h
Only in cmclient/src/3rdparty/squirrel/include: sqstdio.h
Only in cmclient/src/3rdparty/squirrel/include: sqstdsystem.h
Only in cmclient/src/3rdparty/squirrel: Makefile
Only in cmclient/src/3rdparty/squirrel: README
Only in cmclient/src/3rdparty/squirrel: samples
Only in cmclient/src/3rdparty/squirrel: sq
Only in cmclient/src/3rdparty/squirrel/sqstdlib: Makefile
Only in cmclient/src/3rdparty/squirrel/sqstdlib: sqstdblob.cpp
Only in cmclient/src/3rdparty/squirrel/sqstdlib: sqstdblobimpl.h
Only in cmclient/src/3rdparty/squirrel/sqstdlib: sqstdio.cpp
Only in cmclient/src/3rdparty/squirrel/sqstdlib: sqstdlib.dsp
Only in cmclient/src/3rdparty/squirrel/sqstdlib: sqstdstream.cpp
Only in cmclient/src/3rdparty/squirrel/sqstdlib: sqstdstream.h
Only in cmclient/src/3rdparty/squirrel/sqstdlib: sqstdsystem.cpp
Only in cmclient/src/3rdparty/squirrel/squirrel: Makefile
Only in cmclient/src/3rdparty/squirrel/squirrel: squirrel.dsp
Only in cmclient/src/3rdparty/squirrel: squirrel.dsw
diff -r -B -X .diff-exclude vanilla/src/aircraft_cmd.cpp cmclient/src/aircraft_cmd.cpp
2071c2071
< 	PerformanceAccumulator framerate(PFE_GL_AIRCRAFT);
---
> 	// PerformanceAccumulator framerate(PFE_GL_AIRCRAFT);
diff -r -B -X .diff-exclude vanilla/src/airport_gui.cpp cmclient/src/airport_gui.cpp
31a32,34
> #include "citymania/cm_hotkeys.hpp"
> #include "citymania/cm_station_gui.hpp"
> 
35,37c38,40
< static AirportClassID _selected_airport_class; ///< the currently visible airport class
< static int _selected_airport_index;            ///< the index of the selected airport in the current class or -1
< static byte _selected_airport_layout;          ///< selected airport layout number.
---
> AirportClassID _selected_airport_class; ///< the currently visible airport class
> int _selected_airport_index;            ///< the index of the selected airport in the current class or -1
> byte _selected_airport_layout;          ///< selected airport layout number.
56a60,64
> 	if (_settings_client.gui.cm_use_improved_station_join) {
> 		citymania::PlaceAirport(tile);
> 		return;
> 	}
> 
58c66
< 	uint32 p2 = _ctrl_pressed;
---
> 	uint32 p2 = (citymania::_fn_mod ? 1 : 0);
150a159,160
> 
> 		citymania::AbortStationPlacement();
422a433
> 			top = DrawStationAuthorityText(panel_nwi->pos_x + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, top) + WD_PAR_VSEP_NORMAL;
462c473,474
< 			if (_settings_client.gui.station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
---
> 			//if (_settings_client.gui.station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
> 			SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
diff -r -B -X .diff-exclude vanilla/src/blitter/32bpp_anim_sse4.hpp cmclient/src/blitter/32bpp_anim_sse4.hpp
39c39
< 		return Blitter_32bppSSE_Base::Encode(sprite, allocator);
---
> 		return Blitter_32bppSSE_Base::Encode(sprite, allocator, this);
diff -r -B -X .diff-exclude vanilla/src/blitter/32bpp_base.hpp cmclient/src/blitter/32bpp_base.hpp
156a157,178
> 
> 
> 	/* CM */
> 	uint8 cm_mdict[64*64*64] = {0};
> 	uint8 CM_GetMForRGB(uint8 r, uint8 g, uint8 b) {
> 		r &= 252; g &= 252; b &= 252;
> 		auto key = (r << 10) | (g << 4) | (b >> 2);
> 		auto m = this->cm_mdict[key];
> 		if (m != 0) return m;
> 		uint md = UINT_MAX;
> 		for (uint8 i = 1; i < 0xc0; i++) {
> 			auto c = this->LookupColourInPalette(i);
> 			auto dist = ((uint)c.r - r) * ((uint)c.r - r) + ((uint)c.g - g) * ((uint)c.g - g) + ((uint)c.b - b) * ((uint)c.b - b);
> 			if (dist < md) {
> 				md = dist;
> 				m = i;
> 			}
> 		}
> 		this->cm_mdict[key] = m;
> 		return m;
> 	}
> 
diff -r -B -X .diff-exclude vanilla/src/blitter/32bpp_optimized.cpp cmclient/src/blitter/32bpp_optimized.cpp
341a342
> 						*dst_n = this->CM_GetMForRGB(src->r, src->g, src->b) | (DEFAULT_BRIGHTNESS << 8);
diff -r -B -X .diff-exclude vanilla/src/blitter/32bpp_simple.cpp cmclient/src/blitter/32bpp_simple.cpp
131,132c130,131
< 			dst[i].m = 0;
< 			dst[i].v = 0;
---
> 			dst[i].m = this->CM_GetMForRGB(src->r, src->g, src->b);
> 			dst[i].v = DEFAULT_BRIGHTNESS;
diff -r -B -X .diff-exclude vanilla/src/blitter/32bpp_sse2.cpp cmclient/src/blitter/32bpp_sse2.cpp
23c23
< Sprite *Blitter_32bppSSE_Base::Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
---
> Sprite *Blitter_32bppSSE_Base::Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator, Blitter_32bppSimple *base_blitter)
91a92
> 						has_remap = true;
94a96
> 						dst_mv->m = base_blitter->CM_GetMForRGB(src->r, src->g, src->b);
diff -r -B -X .diff-exclude vanilla/src/blitter/32bpp_sse2.hpp cmclient/src/blitter/32bpp_sse2.hpp
75c75
< 	Sprite *Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
---
> 	Sprite *Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator, Blitter_32bppSimple *base_blitter);
88c88
< 		return Blitter_32bppSSE_Base::Encode(sprite, allocator);
---
> 		return Blitter_32bppSSE_Base::Encode(sprite, allocator, this);
Only in cmclient/src/blitter: base.cpp
diff -r -B -X .diff-exclude vanilla/src/bridge_gui.cpp cmclient/src/bridge_gui.cpp
25a26
> #include "tilehighlight_func.h"
30a32,33
> #include "citymania/cm_hotkeys.hpp"
> 
74a78,79
> 
> 	StoreRailPlacementEndpoints(p1, end_tile, (TileX(p1) == TileX(end_tile)) ? TRACK_Y : TRACK_X, false);
385c390
< 	if (_ctrl_pressed && CheckBridgeAvailability(last_bridge_type, bridge_len).Succeeded()) {
---
> 	if (citymania::_fn_mod && CheckBridgeAvailability(last_bridge_type, bridge_len).Succeeded()) {
diff -r -B -X .diff-exclude vanilla/src/build_vehicle_gui.cpp cmclient/src/build_vehicle_gui.cpp
35c35
< 
---
> #include "hotkeys.h"
37a38,39
> #include "citymania/cm_hotkeys.hpp"
> 
874a877,882
> 	if (_settings_client.gui.newgrf_developer_tools) {
> 		SetDParam(0, e->index);
> 		DrawString(left, right, y, STR_CM_PURCHASE_ENGINE_ID);
> 		y += FONT_HEIGHT_NORMAL;
> 	}
> 
1434c1442
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
1646a1655,1667
> 
> 	virtual EventState OnHotkey(int hotkey)
> 	{
> 		if (this->owner != _local_company) return ES_NOT_HANDLED;
> 		return Window::OnHotkey(hotkey);
> 	}
> 
> 	static HotkeyList hotkeys;
> };
> 
> static Hotkey build_vehicle_hotkeys[] = {
> 	Hotkey('R', "build_vehicle", WID_BV_BUILD),
> 	HOTKEY_LIST_END
1647a1669
> HotkeyList BuildVehicleWindow::hotkeys("build_vehicle", build_vehicle_hotkeys);
1653c1675,1676
< 	_nested_build_vehicle_widgets, lengthof(_nested_build_vehicle_widgets)
---
> 	_nested_build_vehicle_widgets, lengthof(_nested_build_vehicle_widgets),
> 	&BuildVehicleWindow::hotkeys
Only in cmclient/src: cargo_table_gui.cpp
Only in cmclient/src: cargo_table_gui.h
Only in cmclient/src: citymania
diff -r -B -X .diff-exclude vanilla/src/command.cpp cmclient/src/command.cpp
26a27,30
> #include "window_func.h"
> #include "watch_gui.h"
> #include "network/network_base.h"
> #include "window_func.h"
29a34,35
> #include "citymania/cm_hotkeys.hpp"
> 
563c569
< 	bool estimate_only = _shift_pressed && IsLocalCompany() &&
---
> 	bool estimate_only = citymania::_estimate_mod && IsLocalCompany() &&
566c572,573
< 			!(GetCommandFlags(cmd) & CMD_NO_EST);
---
> 			!(GetCommandFlags(cmd) & CMD_NO_EST) &&
> 			!(cmd & CMD_NO_ESTIMATE);
583a591
> 	if (!(cmd & CMD_NO_ESTIMATE) && my_cmd) citymania::CountEffectiveAction();
758a767,782
> 	}
> 
> 	/* Send Tile Number to Watching Company Windows */
> 	WatchCompany *wc;
> 	for(int watching_window = 0; ; watching_window++){
> 		wc = dynamic_cast<WatchCompany*>(FindWindowById(WC_WATCH_COMPANY, watching_window));
> 		if(wc != NULL) wc->OnDoCommand(_current_company, tile);
> 		else break;
> 	}
> 
> 	for (const NetworkClientInfo *ci : NetworkClientInfo::Iterate()) {
> 		if (ci->client_playas == _current_company) {
> 			wc = dynamic_cast<WatchCompany*>(FindWindowById(WC_WATCH_COMPANYA, ci->client_id));
> 			if (wc != NULL) wc->OnDoCommand(_current_company, tile);
> 			break;
> 		}
Only in cmclient/src: commands_gui.cpp
diff -r -B -X .diff-exclude vanilla/src/command_type.h cmclient/src/command_type.h
370c370
< #define CMD_MSG(x) ((x) << 16)
---
> #define CMD_MSG(x) ((uint32)((x) << 16))
378a379
> 	CMD_NO_ESTIMATE           = 0x0200, ///< execute command instead of doing estimate even if shift is pressed
diff -r -B -X .diff-exclude vanilla/src/company_base.h cmclient/src/company_base.h
19a20,21
> #include "citymania/extensions/cmext_company.hpp"
> 
26a29
> 	citymania::ext::CompanyEconomyEntry cm;  ///< CityMania extra economy data.
98a102,103
> 
> 	citymania::ext::Company cm;  ///< CityMania extra company data.
diff -r -B -X .diff-exclude vanilla/src/company_cmd.cpp cmclient/src/company_cmd.cpp
38a39,41
> #include "cargo_type.h"
> 
> #include "citymania/cm_hotkeys.hpp"
69a73,74
> 	InvalidateWindowClassesData(WC_WATCH_COMPANY, 0);
> 	InvalidateWindowClassesData(WC_WATCH_COMPANYA, 1);
91a97,98
> 	InvalidateWindowClassesData(WC_WATCH_COMPANY, 0);
> 	InvalidateWindowClassesData(WC_WATCH_COMPANYA, 1);
116a124
> 	if (switching_company) citymania::ResetEffectivveActionCounter();
581a590,591
> 	if (!is_ai) UpdateAllTownVirtCoords(); //coloured rating
> 
1074a1085
> 		InvalidateWindowClassesData(WC_WATCH_COMPANY, 0);
diff -r -B -X .diff-exclude vanilla/src/company_gui.cpp cmclient/src/company_gui.cpp
41a42,43
> #include "citymania/cm_hotkeys.hpp"
> 
440c442
< 				DoCommandP(0, 0, _ctrl_pressed, CMD_INCREASE_LOAN | CMD_MSG(STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY));
---
> 				DoCommandP(0, 0, citymania::_fn_mod, CMD_INCREASE_LOAN | CMD_MSG(STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY));
444c446
< 				DoCommandP(0, 0, _ctrl_pressed, CMD_DECREASE_LOAN | CMD_MSG(STR_ERROR_CAN_T_REPAY_LOAN));
---
> 				DoCommandP(0, 0, citymania::_fn_mod, CMD_DECREASE_LOAN | CMD_MSG(STR_ERROR_CAN_T_REPAY_LOAN));
969c971
< 					if (_ctrl_pressed) {
---
> 					if (citymania::_fn_mod) {
999c1001
< 				if (HasBit(this->sel, scheme) || (_ctrl_pressed && _livery_class[scheme] == this->livery_class && HasBit(_loaded_newgrf_features.used_liveries, scheme))) {
---
> 				if (HasBit(this->sel, scheme) || (citymania::_fn_mod && _livery_class[scheme] == this->livery_class && HasBit(_loaded_newgrf_features.used_liveries, scheme))) {
2183c2185,2192
< 						NWidget(NWID_SPACER), SetFill(0, 1),
---
> 						NWidget(NWID_SELECTION, INVALID_COLOUR, WID_C_SELECT_MOD),
> 							NWidget(NWID_SPACER), SetMinimalSize(0, 0), SetFill(0, 1),
> 							NWidget(NWID_VERTICAL), SetPIP(4, 2, 4),
> 								NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_MOD_COMPANY_JOIN), SetFill(1, 0), SetDataTip(STR_MOD_COMPANY_JOIN_BUTTON, STR_NULL),
> 								NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_C_MOD_COMPANY_TOGGLE_LOCK), SetFill(1, 0), SetDataTip(STR_MOD_TOGGLE_LOCK_BUTTON, STR_NULL),
> 								NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_C_MOD_COMPANY_RESET), SetFill(1, 0), SetDataTip(STR_MOD_COMPANY_RESET_BUTTON, STR_NULL),
> 							EndContainer(),
> 						EndContainer(),
2252a2262,2271
> static void ResetCallback(Window *w, bool confirmed)
> {
> 	if (confirmed) {
> 		CompanyID company2 = (CompanyID)w->window_number;
> 		char msg[128];
> 		seprintf(msg, lastof(msg), "!reset %i", company2 + 1);
> 		NetworkClientSendChatToServer(msg);
> 	}
> }
> 
2273a2293,2295
> 
> 		CWP_BUTTONS_PLAYER = 0,
> 		CWP_BUTTONS_MOD,
2342a2365,2371
> 			plane = (int)(_networking && _novarole ? CWP_BUTTONS_MOD: CWP_BUTTONS_PLAYER);
> 			wi = this->GetWidget<NWidgetStacked>(WID_C_SELECT_MOD);
> 			if (plane != wi->shown_plane) {
> 				wi->SetDisplayedPlane(plane);
> 				reinit = true;
> 			}
> 
2348a2378,2384
> 		// if(!_networking) {
> 		// 	this->SetWidgetDisabledState(CW_WIDGET_COMPANY_RESUME, true);
> 		// 	this->SetWidgetDisabledState(CW_WIDGET_COMPANY_SUSPEND, true);
> 		// 	this->SetWidgetDisabledState(CW_WIDGET_COMPANY_RESET, true);
> 		// 	this->SetWidgetDisabledState(CW_WIDGET_COMPANY_JOIN2, true);
> 		// }
> 
2402a2439,2447
> 			// case CW_WIDGET_COMPANY_RESUME:
> 			// case CW_WIDGET_COMPANY_SUSPEND:
> 			// case CW_WIDGET_COMPANY_RESET:
> 			// case CW_WIDGET_COMPANY_JOIN2:
> 			// 	if(!_novarole){
> 			// 		size->width = 0;
> 			// 		size->height = 0;
> 			// 	}
> 			// 	break;
2560c2605
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
2621a2667,2694
> 				MarkWholeScreenDirty();
> 				break;
> 			}
> 
> 			case WID_C_MOD_COMPANY_JOIN: {
> 				if (!_novarole) return;
> 				CompanyID company2 = (CompanyID)this->window_number;
> 				// this->query_widget = WID_C_MOD_COMPANY_JOIN;
> 				char msg[128];
> 				seprintf(msg, lastof(msg), "!move %i", company2 + 1);
> 				NetworkClientSendChatToServer(msg);
> 				MarkWholeScreenDirty();
> 				break;
> 			}
> 			case WID_C_MOD_COMPANY_RESET: {
> 				if (!_networking) return;
> 				this->query_widget = WID_C_MOD_COMPANY_RESET;
> 				ShowQuery(STR_XI_RESET_CAPTION, STR_XI_REALY_RESET, this, ResetCallback);
> 				MarkWholeScreenDirty();
> 				break;
> 			}
> 			case WID_C_MOD_COMPANY_TOGGLE_LOCK: {
> 				if (!_novarole) return;
> 				CompanyID company2 = (CompanyID)this->window_number;
> 				char msg[128];
> 				seprintf(msg, lastof(msg), "!lockp %i", company2 + 1);
> 				NetworkClientSendChatToServer(msg);
> 				MarkWholeScreenDirty();
2635c2708
< 		if (DoCommandP(tile, OBJECT_HQ, 0, CMD_BUILD_OBJECT | CMD_MSG(STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS)) && !_shift_pressed) {
---
> 		if (DoCommandP(tile, OBJECT_HQ, 0, CMD_BUILD_OBJECT | CMD_MSG(STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS)) && !citymania::_estimate_mod) {
diff -r -B -X .diff-exclude vanilla/src/console_cmds.cpp cmclient/src/console_cmds.cpp
42a43,44
> #include "citymania/cm_console_cmds.hpp"
> 
2210a2213,2216
> 
> 	IConsoleCmdRegister("cmstep", citymania::ConStep, ConHookNoNetwork);
> 	IConsoleCmdRegister("cmexport", citymania::ConExport);
> 	IConsoleCmdRegister("cmtreemap", citymania::ConTreeMap, ConHookNoNetwork);
diff -r -B -X .diff-exclude vanilla/src/crashlog.cpp cmclient/src/crashlog.cpp
120c120
< 			"OpenTTD version:\n"
---
> 			"OpenTTD version: CityMania patched client  http://citymania.org\n\n"
337c337
< 	buffer += seprintf(buffer, last, "*** OpenTTD Crash Report ***\n\n");
---
> 	buffer += seprintf(buffer, last, "*** OpenTTD Crash Report ***\nCityMania patched client  http://citymania.org\nPlease, unless you encounter this bug with unpatched OpenTTD version, report bug to CityMania team\n\n");
diff -r -B -X .diff-exclude vanilla/src/date.cpp cmclient/src/date.cpp
22a23,24
> #include "citymania/cm_main.hpp"
> 
240a243
> 	citymania::Emit(citymania::event::NewMonth());
diff -r -B -X .diff-exclude vanilla/src/depot_gui.cpp cmclient/src/depot_gui.cpp
29c29
< 
---
> #include "hotkeys.h"
33a34,35
> #include "citymania/cm_hotkeys.hpp"
> 
82,109d83
< static WindowDesc _train_depot_desc(
< 	WDP_AUTO, "depot_train", 362, 123,
< 	WC_VEHICLE_DEPOT, WC_NONE,
< 	0,
< 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
< );
< 
< static WindowDesc _road_depot_desc(
< 	WDP_AUTO, "depot_roadveh", 316, 97,
< 	WC_VEHICLE_DEPOT, WC_NONE,
< 	0,
< 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
< );
< 
< static WindowDesc _ship_depot_desc(
< 	WDP_AUTO, "depot_ship", 306, 99,
< 	WC_VEHICLE_DEPOT, WC_NONE,
< 	0,
< 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
< );
< 
< static WindowDesc _aircraft_depot_desc(
< 	WDP_AUTO, "depot_aircraft", 332, 99,
< 	WC_VEHICLE_DEPOT, WC_NONE,
< 	0,
< 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets)
< );
< 
126a101,103
> 
> 	if (_settings_client.gui.cm_open_orders_for_new_vehicles)
> 		ShowOrdersWindow(v);
144c121
< 	DoCommandP(v->tile, v->index | (_ctrl_pressed ? 1 : 0) << 20, wagon == nullptr ? INVALID_VEHICLE : wagon->index, CMD_MOVE_RAIL_VEHICLE | CMD_MSG(STR_ERROR_CAN_T_MOVE_VEHICLE));
---
> 	DoCommandP(v->tile, v->index | (citymania::_fn_mod ? 1 : 0) << 20, wagon == nullptr ? INVALID_VEHICLE : wagon->index, CMD_MOVE_RAIL_VEHICLE | CMD_MSG(STR_ERROR_CAN_T_MOVE_VEHICLE));
329,331c306,315
< 				SetDParam(0, CeilDiv(u->gcache.cached_total_length * 10, TILE_SIZE));
< 				SetDParam(1, 1);
< 				DrawString(rtl ? left + WD_FRAMERECT_LEFT : right - this->count_width, rtl ? left + this->count_width : right - WD_FRAMERECT_RIGHT, y + (this->resize.step_height - FONT_HEIGHT_SMALL) / 2, STR_TINY_BLACK_DECIMAL, TC_FROMSTRING, SA_RIGHT); // Draw the counter
---
> 				if (_settings_client.gui.old_depot_train_length_calc) {
> 					SetDParam(0, CeilDiv(u->gcache.cached_total_length, 8));
> 					SetDParam(1, 1);
> 					DrawString(rtl ? left + WD_FRAMERECT_LEFT : right - this->count_width, rtl ? left + this->count_width : right - WD_FRAMERECT_RIGHT, y + (this->resize.step_height - FONT_HEIGHT_SMALL) / 2, STR_TINY_BLACK_COMA, TC_FROMSTRING, SA_RIGHT); // Draw the counter
> 				}
> 				else {
> 					SetDParam(0, CeilDiv(u->gcache.cached_total_length * 10, TILE_SIZE));
> 					SetDParam(1, 1);
> 					DrawString(rtl ? left + WD_FRAMERECT_LEFT : right - this->count_width, rtl ? left + this->count_width : right - WD_FRAMERECT_RIGHT, y + (this->resize.step_height - FONT_HEIGHT_SMALL) / 2, STR_TINY_BLACK_DECIMAL, TC_FROMSTRING, SA_RIGHT); // Draw the counter
> 				}
563c547
< 					_cursor.vehchain = _ctrl_pressed;
---
> 					_cursor.vehchain = citymania::_fn_mod;
789c773
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
861c845
< 		bool whole_chain = (this->type == VEH_TRAIN && _ctrl_pressed);
---
> 		bool whole_chain = (this->type == VEH_TRAIN && citymania::_fn_mod);
908c892,898
< 		if (_ctrl_pressed) {
---
> 		if (_settings_client.gui.cm_open_vehicle_for_shared_clone) { // CM
> 			if (DoCommandP(this->window_number, v->index, citymania::_fn_mod ? 1 : 0, CMD_CLONE_VEHICLE | CMD_MSG(STR_ERROR_CAN_T_BUY_TRAIN + v->type), CcCloneVehicle))
> 				ResetObjectToPlace();
> 			return true;
> 		}
> 
> 		if (citymania::_fn_mod) {
1006c996
< 						if (gdvp.wagon != nullptr && gdvp.wagon->index == sel && _ctrl_pressed) {
---
> 						if (gdvp.wagon != nullptr && gdvp.wagon->index == sel && citymania::_fn_mod) {
1032c1022
< 				int sell_cmd = (v->type == VEH_TRAIN && (widget == WID_D_SELL_CHAIN || _ctrl_pressed)) ? 1 : 0;
---
> 				int sell_cmd = (v->type == VEH_TRAIN && (widget == WID_D_SELL_CHAIN || citymania::_fn_mod)) ? 1 : 0;
1069c1059
< 	EventState OnCTRLStateChange() override
---
> 	EventState CM_OnFnModStateChange() override
1072c1062
< 			_cursor.vehchain = _ctrl_pressed;
---
> 			_cursor.vehchain = citymania::_fn_mod;
1078a1069,1083
> 
> 	virtual EventState OnHotkey(int hotkey)
> 	{
> 		if (this->owner != _local_company) return ES_NOT_HANDLED;
> 		return Window::OnHotkey(hotkey);
> 	}
> 
> 	static HotkeyList hotkeys;
> };
> 
> static Hotkey depot_hotkeys[] = {
> 	Hotkey(WKC_CTRL | 'F', "depot_go_all", WID_D_START_ALL),
> 	Hotkey('R', "depot_build_vehicle", WID_D_BUILD),
> 	Hotkey(WKC_NONE, "depot_clone_vehicle", WID_D_CLONE),
> 	HOTKEY_LIST_END
1079a1085
> HotkeyList DepotWindow::hotkeys("depot_gui", depot_hotkeys);
1089a1096,1127
> 
> static WindowDesc _train_depot_desc(
> 	WDP_AUTO, "depot_train", 362, 123,
> 	WC_VEHICLE_DEPOT, WC_NONE,
> 	0,
> 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets),
> 	&DepotWindow::hotkeys
> );
> 
> static WindowDesc _road_depot_desc(
> 	WDP_AUTO, "depot_roadveh", 316, 97,
> 	WC_VEHICLE_DEPOT, WC_NONE,
> 	0,
> 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets),
> 	&DepotWindow::hotkeys
> );
> 
> static WindowDesc _ship_depot_desc(
> 	WDP_AUTO, "depot_ship", 306, 99,
> 	WC_VEHICLE_DEPOT, WC_NONE,
> 	0,
> 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets),
> 	&DepotWindow::hotkeys
> );
> 
> static WindowDesc _aircraft_depot_desc(
> 	WDP_AUTO, "depot_aircraft", 332, 99,
> 	WC_VEHICLE_DEPOT, WC_NONE,
> 	0,
> 	_nested_train_depot_widgets, lengthof(_nested_train_depot_widgets),
> 	&DepotWindow::hotkeys
> );
diff -r -B -X .diff-exclude vanilla/src/dock_gui.cpp cmclient/src/dock_gui.cpp
33a34,36
> #include "citymania/cm_hotkeys.hpp"
> #include "citymania/cm_station_gui.hpp"
> 
191a195,196
> 				if (citymania::_fn_mod == _settings_client.gui.persistent_depottools)
> 					ResetObjectToPlace();
194a200,205
> 
> 				if (_settings_client.gui.cm_use_improved_station_join) {
> 					citymania::PlaceDock(tile);
> 					break;
> 				}
> 
198c209
< 				CommandContainer cmdcont = { tile, _ctrl_pressed, p2, CMD_BUILD_DOCK | CMD_MSG(STR_ERROR_CAN_T_BUILD_DOCK_HERE), CcBuildDocks, "" };
---
> 				CommandContainer cmdcont = { tile, citymania::_fn_mod, p2, CMD_BUILD_DOCK | CMD_MSG(STR_ERROR_CAN_T_BUILD_DOCK_HERE), CcBuildDocks, "" };
237c248
< 					DoCommandP(end_tile, start_tile, (_game_mode == GM_EDITOR && _ctrl_pressed) ? WATER_CLASS_SEA : WATER_CLASS_CANAL, CMD_BUILD_CANAL | CMD_MSG(STR_ERROR_CAN_T_BUILD_CANALS), CcPlaySound_SPLAT_WATER);
---
> 					DoCommandP(end_tile, start_tile, (_game_mode == GM_EDITOR && citymania::_fn_mod) ? WATER_CLASS_SEA : WATER_CLASS_CANAL, CMD_BUILD_CANAL | CMD_MSG(STR_ERROR_CAN_T_BUILD_CANALS), CcPlaySound_SPLAT_WATER);
257a269,270
> 
> 		citymania::AbortStationPlacement();
419a433,435
> 		SetTileSelectSize(1, 1);
> 		SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
> 		#if 0
424a441
> 		#endif
432a450
> 		top = DrawStationAuthorityText(back_nwi->pos_x + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, top) + WD_PAR_VSEP_NORMAL;
451a470
> 				citymania::MarkCoverageHighlightDirty();
diff -r -B -X .diff-exclude vanilla/src/economy.cpp cmclient/src/economy.cpp
53a54,56
> #include "cargo_table_gui.h"
> 
> #include "citymania/cm_main.hpp"
374a378,379
> 		ClrBit(t->advertise_regularly, old_owner);
> 		ClrBit(t->do_powerfund, old_owner);
1055a1061,1064
> 
> 		if (amount > 0)
> 			citymania::Emit(citymania::event::CargoDeliveredToIndustry{ind, cargo_type, amount, st});
> 
1099a1109,1116
> 	/* Increase town's counter for all goods types only if delivered near town*/
> 	if(CB_Enabled()){
> 		if (_settings_client.gui.cb_distance_check == 0 || (DistanceManhattan(st->town->xy, st->xy) <= _settings_client.gui.cb_distance_check)) {
> 			st->town->cb.delivered[cargo_type] += accepted_total;
> 			InvalidateWindowData(WC_CB_TOWN, st->town->index);
> 		}
> 	}
> 
1113a1131,1136
> 	}
> 
> 	if (accepted_total > 0) {
> 		if (accepted_ind != accepted_total)
> 			citymania::Emit(citymania::event::CargoDeliveredToUnknown{cargo_type, accepted_total - accepted_ind, st});
> 		citymania::Emit(citymania::event::CargoAccepted{company, cargo_type, accepted_total, st, profit, src_type, src});
Only in cmclient/src: endian_check.cpp
diff -r -B -X .diff-exclude vanilla/src/engine_gui.cpp cmclient/src/engine_gui.cpp
30a31,32
> #include "citymania/cm_hotkeys.hpp"
> 
131c133
< 				if (!_shift_pressed) delete this;
---
> 				if (!citymania::_estimate_mod) delete this;
diff -r -B -X .diff-exclude vanilla/src/error_gui.cpp cmclient/src/error_gui.cpp
318,324d317
< 	EventState OnKeyPress(WChar key, uint16 keycode) override
< 	{
< 		if (keycode != WKC_SPACE) return ES_NOT_HANDLED;
< 		delete this;
< 		return ES_HANDLED;
< 	}
< 
424a418,429
> }
> 
> 
> /**
>   * Close active error message window
>   * @return true if a window was closed.
>   */
> bool HideActiveErrorMessage() {
> 	ErrmsgWindow *w = (ErrmsgWindow*)FindWindowById(WC_ERRMSG, 0);
> 	if (w == nullptr) return false;
> 	delete w;
> 	return true;
diff -r -B -X .diff-exclude vanilla/src/error.h cmclient/src/error.h
57a58,59
> bool HideActiveErrorMessage();
> 
diff -r -B -X .diff-exclude vanilla/src/fios_gui.cpp cmclient/src/fios_gui.cpp
56c56
< 	memset(&this->settings, 0, sizeof(this->settings));
---
> 	this->settings = {}; // CM memset(&this->settings, 0, sizeof(this->settings));
diff -r -B -X .diff-exclude vanilla/src/fontdetection.cpp cmclient/src/fontdetection.cpp
641c641
< 		FcFini();
---
> 		// FcFini();
diff -r -B -X .diff-exclude vanilla/src/framerate_gui.cpp cmclient/src/framerate_gui.cpp
309c309
< static const PerformanceElement DISPLAY_ORDER_PFE[PFE_MAX] = {
---
> static const PerformanceElement DISPLAY_ORDER_PFE[PFE_MAX - 4] = {
312,315c312,315
< 	PFE_GL_TRAINS,
< 	PFE_GL_ROADVEHS,
< 	PFE_GL_SHIPS,
< 	PFE_GL_AIRCRAFT,
---
> 	// PFE_GL_TRAINS,
> 	// PFE_GL_ROADVEHS,
> 	// PFE_GL_SHIPS,
> 	// PFE_GL_AIRCRAFT,
diff -r -B -X .diff-exclude vanilla/src/gfx.cpp cmclient/src/gfx.cpp
35a36
> bool _alt_pressed;    ///< Is Alt pressed?
47a49
> uint32 _pause_countdown;
diff -r -B -X .diff-exclude vanilla/src/gfx_func.h cmclient/src/gfx_func.h
55a56
> extern bool _alt_pressed;    ///< Is Alt pressed?
diff -r -B -X .diff-exclude vanilla/src/gfxinit.cpp cmclient/src/gfxinit.cpp
192a193,194
> 	// LoadGrfFile("innerhighlight.grf", SPR_INNER_HIGHLIGHT_BASE, i++);
> 	LoadGrfFile("cmclient-3.grf", SPR_INNER_HIGHLIGHT_BASE - 4, i++);
diff -r -B -X .diff-exclude vanilla/src/gfx_type.h cmclient/src/gfx_type.h
104a105,114
> 
> 	WKC_L_BRACE     = 154, ///< { Left brace
> 	WKC_R_BRACE     = 155, ///< } Right brace
> 	
> 	WKC_L_PAREN     = 157, ///< ( Left parentheses
> 	WKC_R_PAREN     = 158, ///< ) Right parentheses
> 	WKC_PLUS        = 159, ///< + Plus
> 	WKC_EXCLAIM     = 160, ///< ! Exclamation mark
> 	WKC_ASTERISK    = 161, ///< * Asterisk
> 	WKC_DOLLAR      = 162, ///< $ Dollar sign
diff -r -B -X .diff-exclude vanilla/src/goal_gui.cpp cmclient/src/goal_gui.cpp
30a31,32
> #include "citymania/cm_hotkeys.hpp"
> 
150c152
< 		if (_ctrl_pressed) {
---
> 		if (citymania::_fn_mod) {
189c191,198
< 		d.height *= 5;
---
> 		uint num = 0;
> 		for (const Goal *s : Goal::Iterate()) {
> 			if (s->company == INVALID_COMPANY || s->company == this->window_number) {
> 				num++;
> 			}
> 		}
> 
> 		d.height *= (5 + num);
diff -r -B -X .diff-exclude vanilla/src/graph_gui.cpp cmclient/src/graph_gui.cpp
425a426,465
> 						int mult_range = FindLastBit(x_axis_offset) + FindLastBit(abs(datapoint));
> 						int reduce_range = max(mult_range - 31, 0);
> 
> 						if (datapoint < 0) {
> 							datapoint = -(abs(datapoint) >> reduce_range);
> 						} else {
> 							datapoint >>= reduce_range;
> 						}
> 						y = r.top + x_axis_offset - ((r.bottom - r.top) * datapoint) / (interval_size >> reduce_range);
> 
> 						/* Draw the point. */
> 						GfxFillRect(x - pointoffs1 - 1, y - pointoffs1 - 1, x + pointoffs2 + 1, y + pointoffs2 + 1, PC_DARK_GREY);
> 
> 						/* Draw the line connected to the previous point. */
> 						if (prev_x != INVALID_DATAPOINT_POS) GfxDrawLine(prev_x, prev_y, x, y, PC_DARK_GREY, linewidth + 2);
> 
> 						prev_x = x;
> 						prev_y = y;
> 					} else {
> 						prev_x = INVALID_DATAPOINT_POS;
> 						prev_y = INVALID_DATAPOINT_POS;
> 					}
> 
> 					x += x_sep;
> 				}
> 			}
> 		}
> 		for (int i = 0; i < this->num_dataset; i++) {
> 			if (!HasBit(this->excluded_data, i)) {
> 				/* Centre the dot between the grid lines. */
> 				x = r.left + (x_sep / 2);
> 
> 				byte colour  = this->colours[i];
> 				uint prev_x = INVALID_DATAPOINT_POS;
> 				uint prev_y = INVALID_DATAPOINT_POS;
> 
> 				for (int j = 0; j < this->num_on_x_axis; j++) {
> 					OverflowSafeInt64 datapoint = this->cost[i][j];
> 
> 					if (datapoint != INVALID_DATAPOINT) {
609a650,802
> struct ExcludingCargoBaseGraphWindow : BaseGraphWindow {
> 	bool show_cargo_colors;
> 
> 	ExcludingCargoBaseGraphWindow(WindowDesc *desc, int widget, StringID format_str_y_axis, bool show_cargo_colors):
> 			BaseGraphWindow(desc, widget, format_str_y_axis), show_cargo_colors{show_cargo_colors}
> 	{
> 	}
> 
> 	uint line_height;   ///< Pixel height of each cargo type row.
> 	uint icon_size;     ///< Size of the cargo color icon.
> 	Scrollbar *vscroll; ///< Cargo list scrollbar.
> 
> 	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
> 	{
> 		if (widget != WID_CPR_MATRIX) {
> 			BaseGraphWindow::UpdateWidgetSize(widget, size, padding, fill, resize);
> 			return;
> 		}
> 
> 		Dimension max_cargo_dim = {0, 0};
> 		const CargoSpec *cs;
> 		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
> 			SetDParam(0, cs->name);
> 			max_cargo_dim = maxdim(max_cargo_dim, GetStringBoundingBox(STR_GRAPH_CARGO_PAYMENT_CARGO));
> 		}
> 
> 		this->icon_size = max<uint>(max_cargo_dim.height, 6);
> 		this->line_height = this->icon_size + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
> 		size->width = (max_cargo_dim.width + WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT + 1
> 		               + (this->show_cargo_colors ? this->icon_size + WD_PAR_VSEP_NORMAL : 0));
> 		size->height = max<uint>(size->height, this->line_height * _sorted_standard_cargo_specs_size);
> 		resize->width = 0;
> 		resize->height = this->line_height;
> 		fill->width = 0;
> 		fill->height = this->line_height;
> 	}
> 
> 	virtual void DrawWidget(const Rect &r, int widget) const
> 	{
> 		if (widget != WID_CPR_MATRIX) {
> 			BaseGraphWindow::DrawWidget(r, widget);
> 			return;
> 		}
> 
> 		bool rtl = _current_text_dir == TD_RTL;
> 
> 		int x = r.left + WD_FRAMERECT_LEFT;
> 		int y = r.top;
> 
> 		int pos = this->vscroll->GetPosition();
> 		int max = pos + this->vscroll->GetCapacity();
> 
> 		const CargoSpec *cs;
> 		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
> 			if (pos-- > 0) continue;
> 			if (--max < 0) break;
> 
> 			bool lowered = !HasBit(_legend_excluded_cargo, cs->Index());
> 
> 			/* Redraw box if lowered */
> 			if (lowered) DrawFrameRect(r.left, y, r.right, y + this->line_height - 1, COLOUR_ORANGE, lowered ? FR_LOWERED : FR_NONE);
> 
> 			byte clk_dif = lowered ? 1 : 0;
> 
> 			uint icon_offset = 0;
> 			if (this->show_cargo_colors) {
> 				int rect_x = clk_dif + 1 + (rtl ? r.right - 12 : r.left + WD_FRAMERECT_LEFT);
> 				GfxFillRect(rect_x, y + 1 + clk_dif, rect_x + this->icon_size - 2, y + this->icon_size - 2 + clk_dif, PC_BLACK);
> 				GfxFillRect(rect_x + 1, y + 2 + clk_dif, rect_x + this->icon_size - 3, y + this->icon_size - 3 + clk_dif, cs->legend_colour);
> 				icon_offset = this->icon_size + WD_PAR_VSEP_NORMAL;
> 			}
> 
> 			SetDParam(0, cs->name);
> 			DrawString(rtl ? r.left : x + icon_offset + clk_dif, (rtl ? r.right - icon_offset + clk_dif : r.right), y + clk_dif, STR_GRAPH_CARGO_PAYMENT_CARGO);
> 
> 			y += this->line_height;
> 		}
> 	}
> 
> 	void UpdateExcludedData()
> 	{
> 		this->excluded_data = 0;
> 
> 		int i = 0;
> 		const CargoSpec *cs;
> 		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
> 			if (HasBit(_legend_excluded_cargo, cs->Index())) SetBit(this->excluded_data, i);
> 			i++;
> 		}
> 	}
> 
> 	virtual void OnClick(Point pt, int widget, int click_count)
> 	{
> 		switch (widget) {
> 			case WID_CPR_KEY_BUTTON:
> 				ShowGraphLegend();
> 				break;
> 
> 			case WID_CPR_ENABLE_CARGOES:
> 				/* Remove all cargoes from the excluded lists. */
> 				_legend_excluded_cargo = 0;
> 				this->excluded_data = 0;
> 				this->SetDirty();
> 				break;
> 
> 			case WID_CPR_DISABLE_CARGOES: {
> 				/* Add all cargoes to the excluded lists. */
> 				int i = 0;
> 				const CargoSpec *cs;
> 				FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
> 					SetBit(_legend_excluded_cargo, cs->Index());
> 					SetBit(this->excluded_data, i);
> 					i++;
> 				}
> 				this->SetDirty();
> 				break;
> 			}
> 
> 			case WID_CPR_MATRIX: {
> 				uint row = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_CPR_MATRIX, 0, this->line_height);
> 				if (row >= this->vscroll->GetCount()) return;
> 
> 				const CargoSpec *cs;
> 				FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
> 					if (row-- > 0) continue;
> 
> 					ToggleBit(_legend_excluded_cargo, cs->Index());
> 					this->UpdateExcludedData();
> 					this->SetDirty();
> 					break;
> 				}
> 				break;
> 			}
> 		}
> 	}
> 
> 	virtual void OnResize()
> 	{
> 		this->vscroll->SetCapacityFromWidget(this, WID_CPR_MATRIX);
> 	}
> 
> 	/**
> 	 * Some data on this window has become invalid.
> 	 * @param data Information about the changed data.
> 	 * @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details.
> 	 */
> 	virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
> 	{
> 		if (!gui_scope) return;
> 		this->UpdateExcludedData();
> 	}
> };
> 
665c858
< struct IncomeGraphWindow : BaseGraphWindow {
---
> struct IncomeGraphWindow : ExcludingCargoBaseGraphWindow {
667c860
< 			BaseGraphWindow(desc, WID_CV_GRAPH, STR_JUST_CURRENCY_SHORT)
---
> 			ExcludingCargoBaseGraphWindow(desc, WID_CPR_GRAPH, STR_JUST_CURRENCY_SHORT, false)
669c862,866
< 		this->InitializeWindow(window_number);
---
> 		this->CreateNestedTree();
> 		this->vscroll = this->GetScrollbar(WID_CPR_MATRIX_SCROLLBAR);
> 		this->vscroll->SetCount(_sorted_standard_cargo_specs_size);
> 		this->UpdateExcludedData();
> 		this->FinishInitNested(window_number);
673a871
> 		if(_legend_excluded_cargo == 0){
675a874,882
> 		uint total_income = 0;
> 		const CargoSpec *cs;
> 		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
> 			if (!HasBit(_legend_excluded_cargo, cs->Index())){
> 				total_income += c->old_economy[j].cm.cargo_income[cs->Index()];
> 			}
> 		}
> 		return total_income;
> 	}
682c889
< 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_CV_KEY_BUTTON), SetMinimalSize(50, 0), SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 2), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),
---
> 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_CPR_KEY_BUTTON), SetMinimalSize(50, 0), SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 2), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),
687c894
< 	NWidget(WWT_PANEL, COLOUR_GREY, WID_CV_BACKGROUND),
---
> 	NWidget(WWT_PANEL, COLOUR_GREY, WID_CPR_BACKGROUND),
689c896
< 			NWidget(WWT_EMPTY, COLOUR_GREY, WID_CV_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
---
> 			NWidget(WWT_EMPTY, COLOUR_GREY, WID_CPR_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
691,692c898,906
< 				NWidget(NWID_SPACER), SetFill(0, 1), SetResize(0, 1),
< 				NWidget(WWT_RESIZEBOX, COLOUR_GREY, WID_CV_RESIZE),
---
> 				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
> 				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_CPR_ENABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_ENABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL), SetFill(1, 0),
> 				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_CPR_DISABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_DISABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL), SetFill(1, 0),
> 				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
> 				NWidget(NWID_HORIZONTAL),
> 					NWidget(WWT_MATRIX, COLOUR_ORANGE, WID_CPR_MATRIX), SetFill(0, 2), SetResize(0, 2), SetMatrixDataTip(1, 0, STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO), SetScrollbar(WID_CPR_MATRIX_SCROLLBAR),
> 					NWidget(NWID_VSCROLLBAR, COLOUR_ORANGE, WID_CPR_MATRIX_SCROLLBAR),
> 				EndContainer(),
> 				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
693a908,914
> 			NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(0, 1), SetResize(0, 1),
> 		EndContainer(),
> 		NWidget(NWID_HORIZONTAL),
> 			NWidget(NWID_SPACER), SetMinimalSize(WD_RESIZEBOX_WIDTH, 0), SetFill(1, 0), SetResize(1, 0),
> 			NWidget(WWT_TEXT, COLOUR_GREY, WID_CPR_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL, STR_NULL),
> 			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
> 			NWidget(WWT_RESIZEBOX, COLOUR_GREY, WID_CPR_RESIZE),
714c935
< struct DeliveredCargoGraphWindow : BaseGraphWindow {
---
> struct DeliveredCargoGraphWindow : ExcludingCargoBaseGraphWindow {
716c937
< 			BaseGraphWindow(desc, WID_CV_GRAPH, STR_JUST_COMMA)
---
> 			ExcludingCargoBaseGraphWindow(desc, WID_CPR_GRAPH, STR_JUST_COMMA, false)
718c939,943
< 		this->InitializeWindow(window_number);
---
> 		this->CreateNestedTree();
> 		this->vscroll = this->GetScrollbar(WID_CPR_MATRIX_SCROLLBAR);
> 		this->vscroll->SetCount(_sorted_standard_cargo_specs_size);
> 		this->OnHundredthTick();
> 		this->FinishInitNested(window_number);
722a948
> 		if(_legend_excluded_cargo == 0){
724a951,959
> 		uint total_delivered = 0;
> 		const CargoSpec *cs;
> 		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
> 			if (!HasBit(_legend_excluded_cargo, cs->Index())){
> 				total_delivered += c->old_economy[j].delivered_cargo[cs->Index()];
> 			}
> 		}
> 		return total_delivered;
> 	}
731c966
< 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_CV_KEY_BUTTON), SetMinimalSize(50, 0), SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 2), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),
---
> 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_CPR_KEY_BUTTON), SetMinimalSize(50, 0), SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 2), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),
736c971
< 	NWidget(WWT_PANEL, COLOUR_GREY, WID_CV_BACKGROUND),
---
> 	NWidget(WWT_PANEL, COLOUR_GREY, WID_CPR_BACKGROUND),
738c973
< 			NWidget(WWT_EMPTY, COLOUR_GREY, WID_CV_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
---
> 			NWidget(WWT_EMPTY, COLOUR_GREY, WID_CPR_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
740,741c975,983
< 				NWidget(NWID_SPACER), SetFill(0, 1), SetResize(0, 1),
< 				NWidget(WWT_RESIZEBOX, COLOUR_GREY, WID_CV_RESIZE),
---
> 				NWidget(NWID_SPACER), SetMinimalSize(0, 4), SetFill(0, 0),
> 				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_CPR_ENABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_ENABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL), SetFill(1, 0),
> 				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_CPR_DISABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_DISABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL), SetFill(1, 0),
> 				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
> 				NWidget(NWID_HORIZONTAL),
> 					NWidget(WWT_MATRIX, COLOUR_ORANGE, WID_CPR_MATRIX), SetFill(0, 2), SetResize(0, 2), SetMatrixDataTip(1, 0, STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO), SetScrollbar(WID_CPR_MATRIX_SCROLLBAR),
> 					NWidget(NWID_VSCROLLBAR, COLOUR_ORANGE, WID_CPR_MATRIX_SCROLLBAR),
> 				EndContainer(),
> 				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
742a985,991
> 			NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(0, 1), SetResize(0, 1),
> 		EndContainer(),
> 		NWidget(NWID_HORIZONTAL),
> 			NWidget(NWID_SPACER), SetMinimalSize(WD_RESIZEBOX_WIDTH, 0), SetFill(1, 0), SetResize(1, 0),
> 			NWidget(WWT_TEXT, COLOUR_GREY, WID_CPR_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL, STR_NULL),
> 			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
> 			NWidget(WWT_RESIZEBOX, COLOUR_GREY, WID_CPR_RESIZE),
868,871c1117
< struct PaymentRatesGraphWindow : BaseGraphWindow {
< 	uint line_height;   ///< Pixel height of each cargo type row.
< 	Scrollbar *vscroll; ///< Cargo list scrollbar.
< 
---
> struct PaymentRatesGraphWindow : ExcludingCargoBaseGraphWindow {
873c1119
< 			BaseGraphWindow(desc, WID_CPR_GRAPH, STR_JUST_CURRENCY_SHORT)
---
> 			ExcludingCargoBaseGraphWindow(desc, WID_CPR_GRAPH, STR_JUST_CURRENCY_SHORT, true)
891,1008d1136
< 	void UpdateExcludedData()
< 	{
< 		this->excluded_data = 0;
< 
< 		int i = 0;
< 		const CargoSpec *cs;
< 		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
< 			if (HasBit(_legend_excluded_cargo, cs->Index())) SetBit(this->excluded_data, i);
< 			i++;
< 		}
< 	}
< 
< 	void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
< 	{
< 		if (widget != WID_CPR_MATRIX) {
< 			BaseGraphWindow::UpdateWidgetSize(widget, size, padding, fill, resize);
< 			return;
< 		}
< 
< 		const CargoSpec *cs;
< 		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
< 			SetDParam(0, cs->name);
< 			Dimension d = GetStringBoundingBox(STR_GRAPH_CARGO_PAYMENT_CARGO);
< 			d.width += 14; // colour field
< 			d.width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;
< 			d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
< 			*size = maxdim(d, *size);
< 		}
< 
< 		this->line_height = size->height;
< 		size->height = this->line_height * 11; /* Default number of cargo types in most climates. */
< 		resize->width = 0;
< 		resize->height = this->line_height;
< 	}
< 
< 	void DrawWidget(const Rect &r, int widget) const override
< 	{
< 		if (widget != WID_CPR_MATRIX) {
< 			BaseGraphWindow::DrawWidget(r, widget);
< 			return;
< 		}
< 
< 		bool rtl = _current_text_dir == TD_RTL;
< 
< 		int x = r.left + WD_FRAMERECT_LEFT;
< 		int y = r.top;
< 
< 		int pos = this->vscroll->GetPosition();
< 		int max = pos + this->vscroll->GetCapacity();
< 
< 		const CargoSpec *cs;
< 		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
< 			if (pos-- > 0) continue;
< 			if (--max < 0) break;
< 
< 			bool lowered = !HasBit(_legend_excluded_cargo, cs->Index());
< 
< 			/* Redraw box if lowered */
< 			if (lowered) DrawFrameRect(r.left, y, r.right, y + this->line_height - 1, COLOUR_ORANGE, lowered ? FR_LOWERED : FR_NONE);
< 
< 			byte clk_dif = lowered ? 1 : 0;
< 			int rect_x = clk_dif + (rtl ? r.right - 12 : r.left + WD_FRAMERECT_LEFT);
< 
< 			GfxFillRect(rect_x, y + clk_dif, rect_x + 8, y + 5 + clk_dif, PC_BLACK);
< 			GfxFillRect(rect_x + 1, y + 1 + clk_dif, rect_x + 7, y + 4 + clk_dif, cs->legend_colour);
< 			SetDParam(0, cs->name);
< 			DrawString(rtl ? r.left : x + 14 + clk_dif, (rtl ? r.right - 14 + clk_dif : r.right), y + clk_dif, STR_GRAPH_CARGO_PAYMENT_CARGO);
< 
< 			y += this->line_height;
< 		}
< 	}
< 
< 	void OnClick(Point pt, int widget, int click_count) override
< 	{
< 		switch (widget) {
< 			case WID_CPR_ENABLE_CARGOES:
< 				/* Remove all cargoes from the excluded lists. */
< 				_legend_excluded_cargo = 0;
< 				this->excluded_data = 0;
< 				this->SetDirty();
< 				break;
< 
< 			case WID_CPR_DISABLE_CARGOES: {
< 				/* Add all cargoes to the excluded lists. */
< 				int i = 0;
< 				const CargoSpec *cs;
< 				FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
< 					SetBit(_legend_excluded_cargo, cs->Index());
< 					SetBit(this->excluded_data, i);
< 					i++;
< 				}
< 				this->SetDirty();
< 				break;
< 			}
< 
< 			case WID_CPR_MATRIX: {
< 				uint row = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_CPR_MATRIX, 0, this->line_height);
< 				if (row >= this->vscroll->GetCount()) return;
< 
< 				const CargoSpec *cs;
< 				FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
< 					if (row-- > 0) continue;
< 
< 					ToggleBit(_legend_excluded_cargo, cs->Index());
< 					this->UpdateExcludedData();
< 					this->SetDirty();
< 					break;
< 				}
< 				break;
< 			}
< 		}
< 	}
< 
< 	void OnResize() override
< 	{
< 		this->vscroll->SetCapacityFromWidget(this, WID_CPR_MATRIX);
< 	}
< 
1014,1024d1141
< 	/**
< 	 * Some data on this window has become invalid.
< 	 * @param data Information about the changed data.
< 	 * @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details.
< 	 */
< 	void OnInvalidateData(int data = 0, bool gui_scope = true) override
< 	{
< 		if (!gui_scope) return;
< 		this->OnHundredthTick();
< 	}
< 
1059c1176
< 				NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 1),
---
> 				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
1064c1181
< 					NWidget(WWT_MATRIX, COLOUR_ORANGE, WID_CPR_MATRIX), SetResize(0, 2), SetMatrixDataTip(1, 0, STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO), SetScrollbar(WID_CPR_MATRIX_SCROLLBAR),
---
> 					NWidget(WWT_MATRIX, COLOUR_ORANGE, WID_CPR_MATRIX), SetFill(0, 2), SetResize(0, 2), SetMatrixDataTip(1, 0, STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO), SetScrollbar(WID_CPR_MATRIX_SCROLLBAR),
1067c1184
< 				NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 1),
---
> 				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
diff -r -B -X .diff-exclude vanilla/src/group_gui.cpp cmclient/src/group_gui.cpp
31a32,33
> #include "citymania/cm_hotkeys.hpp"
> 
734c736
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
783c785
< 					DoCommandP(0, this->vli.index, (g->replace_protection ? 0 : 1) | (_ctrl_pressed << 1), CMD_SET_GROUP_REPLACE_PROTECTION);
---
> 					DoCommandP(0, this->vli.index, (g->replace_protection ? 0 : 1) | (citymania::_fn_mod ? 2 : 0), CMD_SET_GROUP_REPLACE_PROTECTION);
826c828
< 				DoCommandP(0, DEFAULT_GROUP, this->vehicle_sel | (_ctrl_pressed ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE));
---
> 				DoCommandP(0, DEFAULT_GROUP, this->vehicle_sel | (citymania::_fn_mod ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE));
843c845
< 				DoCommandP(0, new_g, vindex | (_ctrl_pressed ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE), new_g == NEW_GROUP ? CcAddVehicleNewGroup : nullptr);
---
> 				DoCommandP(0, new_g, vindex | (citymania::_fn_mod ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE), new_g == NEW_GROUP ? CcAddVehicleNewGroup : nullptr);
diff -r -B -X .diff-exclude vanilla/src/gui.h cmclient/src/gui.h
39a40,43
> /* commands_gui.cpp */
> void ShowCommandsToolbar();
> void ShowLoginWindow();
> 
45c49
< void ShowLandInfo(TileIndex tile);
---
> void ShowLandInfo(TileIndex tile, TileIndex end_tile=INVALID_TILE);
diff -r -B -X .diff-exclude vanilla/src/heightmap.cpp cmclient/src/heightmap.cpp
453c453
< static bool ReadHeightMap(DetailedFileType dft, const char *filename, uint *x, uint *y, byte **map)
---
> bool ReadHeightMap(DetailedFileType dft, const char *filename, uint *x, uint *y, byte **map)
diff -r -B -X .diff-exclude vanilla/src/hotkeys.cpp cmclient/src/hotkeys.cpp
77,78c77
< 	{",", WKC_COMMA},
< 	{"COMMA", WKC_COMMA}, // legacy variant, should be below ","
---
> 	{"COMMA", WKC_COMMA},
80a80,87
> 
> 	{"TAB", WKC_TAB},
> 	{"L_BRACE", WKC_L_BRACE},
> 	{"R_BRACE", WKC_R_BRACE},
> 	{"L_PAREN", WKC_L_PAREN},
> 	{"R_PAREN", WKC_R_PAREN},
> 	{"EXCLAIM", WKC_EXCLAIM},
> 	{"ASTERISK", WKC_ASTERISK},
diff -r -B -X .diff-exclude vanilla/src/industry_cmd.cpp cmclient/src/industry_cmd.cpp
356a357
> 		// DrawGroundSprite(image, GroundSpritePaletteTransform(image, dits->ground.pal, GENERAL_SPRITE_COLOUR(ind->random_colour)));
1960a1962,1995
> }
> 
> /**
>   * Return whether industry can be built on tile or not
>   * regardless of terrain
>   */
> bool CanBuildIndustryOnTile(IndustryType type, TileIndex tile) {
> 	const IndustrySpec *indspec = GetIndustrySpec(type);
>     CommandCost ret;
> 
> 	if (HasBit(indspec->callback_mask, CBM_IND_LOCATION)) {
> 		ret = CheckIfCallBackAllowsCreation(
> 			tile, type, 0, 0, 0, _current_company,
> 			_current_company == OWNER_DEITY ? IACT_RANDOMCREATION : IACT_USERCREATION);
> 	} else {
> 		ret = _check_new_industry_procs[GetIndustrySpec(type)->check_proc](tile);
> 	}
> 	if (ret.Failed())
> 		return false;
> 
> 	ret = CheckIfFarEnoughFromConflictingIndustry(tile, type);
> 	if (ret.Failed())
> 		return false;
> 
> 	Town *t = NULL;
> 	ret = FindTownForIndustry(tile, type, &t);
> 	if (ret.Failed())
> 		return false;
> 
> 	ret = CheckIfIndustryIsAllowed(tile, type, t);
> 	if (ret.Failed())
> 		return false;
> 
> 	return true;
diff -r -B -X .diff-exclude vanilla/src/industry_gui.cpp cmclient/src/industry_gui.cpp
41a42
> #include "hotkeys.h"
44a46,48
> #include "citymania/cm_hotkeys.hpp"
> #include "citymania/cm_highlight.hpp"
> 
252a257,271
> 	NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetResize(1, 0),
> 		NWidget(NWID_HORIZONTAL), SetPIP(2, 0, 2),
> 			NWidget(WWT_LABEL, COLOUR_DARK_GREEN), SetMinimalSize(140, 14), SetDataTip(STR_FUND_INDUSTRY_FORBIDDEN_TILES_TITLE, STR_NULL),
> 			NWidget(NWID_SPACER), SetFill(1, 0),
> 		EndContainer(),
> 		NWidget(NWID_HORIZONTAL), SetPIP(2, 0, 2),
> 			NWidget(NWID_SPACER), SetFill(1, 0),
> 			NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_DPI_FT_OFF), SetMinimalSize(60, 12),
> 											SetDataTip(STR_FUND_INDUSTRY_FORBIDDEN_TILES_OFF, STR_FUND_INDUSTRY_FORBIDDEN_TILES_OFF_TOOLTIP),
> 			NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_DPI_FT_ON), SetMinimalSize(60, 12),
> 											SetDataTip(STR_FUND_INDUSTRY_FORBIDDEN_TILES_ON, STR_FUND_INDUSTRY_FORBIDDEN_TILES_ON_TOOLTIP),
> 			NWidget(NWID_SPACER), SetFill(1, 0),
> 		EndContainer(),
> 		NWidget(NWID_SPACER), SetMinimalSize(0, 2),
> 	EndContainer(),
260a280
> #if 0  // CM defined later
267a288
> #endif
278a300
> 	bool funding_enabled;
327a350
> 			citymania::SetIndustryForbiddenTilesHighlight(this->selected_type);
330a354,355
> 
> 		this->funding_enabled = (_game_mode == GM_EDITOR || Company::IsValidID(_local_company));
336c361
< 		this->SetWidgetDisabledState(WID_DPI_FUND_WIDGET, this->selected_type != INVALID_INDUSTRYTYPE && !this->enabled[this->selected_index]);
---
> 		this->SetWidgetDisabledState(WID_DPI_FUND_WIDGET,  !this->funding_enabled || (this->selected_type != INVALID_INDUSTRYTYPE && !this->enabled[this->selected_index]));
337a363
> 		this->LowerWidget(_settings_client.gui.show_industry_forbidden_tiles + WID_DPI_FT_OFF);
388c414
< 	BuildIndustryWindow() : Window(&_build_industry_desc)
---
> 	BuildIndustryWindow(WindowDesc *desc) : Window(desc)
395a422
> 		this->funding_enabled = false;
403a431,435
> 	~BuildIndustryWindow()
> 	{
> 		citymania::SetIndustryForbiddenTilesHighlight(INVALID_INDUSTRYTYPE);
> 	}
> 
589a622
> 					citymania::SetIndustryForbiddenTilesHighlight(this->selected_type);
632a666,675
> 
> 			case WID_DPI_FT_OFF:
> 			case WID_DPI_FT_ON:
> 				this->RaiseWidget(_settings_client.gui.show_industry_forbidden_tiles + WID_DPI_FT_OFF);
> 				_settings_client.gui.show_industry_forbidden_tiles = (widget != WID_DPI_FT_OFF);
> 				this->LowerWidget(_settings_client.gui.show_industry_forbidden_tiles + WID_DPI_FT_OFF);
> 				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
> 				this->SetDirty();
> 				MarkWholeScreenDirty();
> 				break;
701c744
< 		this->RaiseButtons();
---
> 		this->RaiseWidget(WID_DPI_FUND_WIDGET);
706c749
< 		this->RaiseButtons();
---
> 		this->RaiseWidget(WID_DPI_FUND_WIDGET);
722a766,778
> 
> 	virtual EventState OnHotkey(int hotkey)
> 	{
> 		return Window::OnHotkey(hotkey);
> 	}
> 
> 	static HotkeyList hotkeys;
> };
> 
> static Hotkey build_industry_hotkeys[] = {
> 	Hotkey((uint16)0, "display_chain", WID_DPI_DISPLAY_WIDGET),
> 	Hotkey((uint16)0, "build_button", WID_DPI_FUND_WIDGET),
> 	HOTKEY_LIST_END
724a781,792
> HotkeyList BuildIndustryWindow::hotkeys("industry_fund_gui", build_industry_hotkeys);
> 
> /** Window definition of the dynamic place industries gui */
> static WindowDesc _build_industry_desc(
> 	WDP_AUTO, "build_industry", 170, 212,
> 	WC_BUILD_INDUSTRY, WC_NONE,
> 	WDF_CONSTRUCTION,
> 	_nested_build_industry_widgets, lengthof(_nested_build_industry_widgets),
> 	&BuildIndustryWindow::hotkeys
> );
> 
> 
727c795,796
< 	if (_game_mode != GM_EDITOR && !Company::IsValidID(_local_company)) return;
---
> 	// CM always enable window to allow checking stuff as a spectator
> 	// if (_game_mode != GM_EDITOR && !Company::IsValidID(_local_company)) return;
729c798
< 	new BuildIndustryWindow();
---
> 	new BuildIndustryWindow(&_build_industry_desc);
1025c1094
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
1636c1705
< 					if (_ctrl_pressed) {
---
> 					if (citymania::_fn_mod) {
diff -r -B -X .diff-exclude vanilla/src/industry_type.h cmclient/src/industry_type.h
12a13,14
> #include "tile_type.h"
> 
42a45
> bool CanBuildIndustryOnTile(IndustryType type, TileIndex tile);
diff -r -B -X .diff-exclude vanilla/src/intro_gui.cpp cmclient/src/intro_gui.cpp
33a34,35
> #include "citymania/cm_hotkeys.hpp"
> 
120c122
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
diff -r -B -X .diff-exclude vanilla/src/lang/english_AU.txt cmclient/src/lang/english_AU.txt
247a248
> STR_TOOLTIP_DEMOLISH_TREES                                      :{BLACK}Demolish only trees on a square of land. Ctrl selects the area diagonally.
diff -r -B -X .diff-exclude vanilla/src/lang/english.txt cmclient/src/lang/english.txt
234a235,237
> STR_BUTTON_FILTER                                               :{BLACK}Filter
> STR_BUTTON_FILTER_SELECT_ALL                                    :Select All
> STR_BUTTON_FILTER_SELECT_NONE                                   :Select None
251a255
> STR_TOOLTIP_DEMOLISH_TREES                                      :{BLACK}Demolish only trees on a square of land. Ctrl selects the area diagonally.
279c283
< 
---
> STR_MEASURE_DIST_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Distance: {NUM}{}Height difference: {HEIGHT}
327a332
> STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_CARGOS                      :{BLACK}Display company cargos information
330a336
> STR_TOOLBAR_TOOLTIP_DISPLAY_WATCH                               :{BLACK}Watch company's actions
383a390
> STR_SETTINGS_MENU_ZONING                                        :Zoning
407a415
> STR_MAP_MENU_WATCH_COMPANY                                      :Watch Company
477c485,486
< STR_ABOUT_MENU_SEPARATOR                                        :
---
> STR_ABOUT_MENU_SEPARATOR                                        :CityMania
> STR_ABOUT_MENU_LOGIN_WINDOW                                     :Server Login
1439a1449,1452
> STR_CONFIG_SETTING_PERSISTENT_DEPOTTOOLS                        :Keep depot building tools active after usage: {STRING2}
> STR_CONFIG_SETTING_PERSISTENT_DEPOTTOOLS_HELPTEXT               :Keep the building tools for road, train and ship depots (reversible by placing with Ctrl).
> STR_CM_CONFIG_SETTING_IMPROVED_STATION_JOIN                     :Use improved station joining controls: {STRING2}
> STR_CM_CONFIG_SETTING_IMPROVED_STATION_JOIN_HELPTEXT            :Use Ctrl-click on station tile to select or deselect station to join. If station has no tiles Ctrl-click its sign. Ctrl-click empty tile for a new station. Also recently built station is automatically selected as a station to join.
1745a1759,1778
> STR_CONFIG_SETTING_VEHICLES_CTRL                                :{ORANGE}Controls & Orders
> STR_CONFIG_SETTING_ORDER_SHORTCUTS                              :{ORANGE}Order's Shortcuts
> STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP              :Allow ctrl+left-click vehicles to start or stop them: {STRING2}
> STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER                   :"Transfer" orders are "No Loading" by default: {STRING2}
> STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD                     :"Unload all" orders are "No Loading" by default: {STRING2}
> 
> STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK                 :ctrl+left-click: {STRING2}
> STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK            :ctrl+shift+left-click: {STRING2}
> STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK                :shift+left-click: {STRING2}
> STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_ALTLCLICK                  :alt+left-click: {STRING2}
> STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_ALTSHIFTCLICK              :alt+shift+left-click: {STRING2}
> STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLALTLCLICK              :ctrl+alt+left-click: {STRING2}
> STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE                      :do nothing
> STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY             :Full load any cargo
> STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO            :Transfer cargo
> STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL                :Force unload of all cargo
> STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FEEDERLOAD                :Feeder Load (replace first order)
> STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FEEDERDROP                :Feeder Unload (replace last order)
> STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NO_LOAD                   :Do not load any cargo
> 
2354a2388
> STR_RAIL_TOOLBAR_TOOLTIP_BUILD_POLYRAIL                         :{BLACK}Build railway track using the Polyline mode. Ctrl toggles build/remove for railway construction. Shift toggles building/showing cost estimate
2371a2406
> STR_BUILD_DEPOT_TRAIN_ORIENTATION_AUTO_TOOLTIP                  :{BLACK}Automatically select railway depot orientation based on environment
2379a2415,2416
> STR_STATION_BUILD_ORIENTATION_AUTO                              :{BLACK}Auto
> STR_STATION_BUILD_ORIENTATION_AUTO_TOOLTIP                      :{BLACK}Automatically select station orientation based on environment
2459a2497
> STR_BUILD_DEPOT_ROAD_ORIENTATION_AUTO_TOOLTIP                   :{BLACK}Automatically select road depot orientation based on environment
5061a5100,5102
> STR_VIEWPORT_TOWN_POP_VERY_POOR_RATING                          :{WHITE}{TOWN} {RED}({COMMA})
> STR_VIEWPORT_TOWN_POP_MEDIOCRE_RATING                           :{WHITE}{TOWN} {ORANGE}({COMMA})
> STR_VIEWPORT_TOWN_POP_GOOD_RATING                               :{WHITE}{TOWN} {YELLOW}({COMMA})
5062a5104
> STR_VIEWPORT_TOWN_POP_EXCELLENT_RATING                          :{WHITE}{TOWN} {GREEN}({COMMA})
5064a5107,5109
> STR_VIEWPORT_TOWN_TINY_VERY_POOR_RATING                         :{TINY_FONT}{RED}{TOWN}
> STR_VIEWPORT_TOWN_TINY_MEDIOCRE_RATING                          :{TINY_FONT}{ORANGE}{TOWN}
> STR_VIEWPORT_TOWN_TINY_GOOD_RATING                              :{TINY_FONT}{YELLOW}{TOWN}
5065a5111
> STR_VIEWPORT_TOWN_TINY_EXCELLENT_RATING                         :{TINY_FONT}{GREEN}{TOWN}
5150a5197,5547
> 
> ### PATCH
> STR_TOWN_DIRECTORY_CAPTION_EXTRA                                :{WHITE}Towns ({YELLOW}{COMMA}{WHITE} / {ORANGE}{COMMA}{WHITE})
> STR_LOCAL_AUTHORITY_COMPANY_RATING_NUM                          :{YELLOW}{COMPANY} {COMPANY_NUM}: {ORANGE}{STRING} {BLACK}({COMMA})
> STR_TOWN_VIEW_GROWTH                                            :{BLACK}GR: {ORANGE}{COMMA}{STRING}  {BLACK}Next: {ORANGE}{COMMA}  {BLACK}RH: {ORANGE}{COMMA}  {BLACK}Flag {ORANGE}{NUM}  {BLACK}FB: {ORANGE}{NUM} {BLACK}month{P "" s}
> STR_TOWN_VIEW_GROWTH_RATE_CUSTOM                                :*
> STR_TOWN_VIEW_GROWTH_TILES                                      :{BLACK}HS: {ORANGE}{COMMA}(+{COMMA})  {BLACK}CS: {ORANGE}{COMMA}(+{COMMA})  {BLACK}HR: {ORANGE}{COMMA}(+{COMMA})
> STR_TOWN_VIEW_REALPOP_RATE                                      :{BLACK}Real Population: {YELLOW}{COMMA}  {BLACK}Rating: {YELLOW}{COMMA}
> STR_TOWN_VIEW_HOUSE_STATE                                       :{BLACK}Houses: UC {ORANGE}{COMMA}  {BLACK}RTM: {ORANGE}{COMMA}  {BLACK}DTM: {ORANGE}{COMMA}
> STR_CB_DISTANCE_CHECK                                           :CB town acceptance: {STRING2}
> 
> ###ADMIN
> STR_WATCH_WINDOW_TITLE                                          :{WHITE}Watching {RAW_STRING}.
> STR_WATCH_CLICK_TO_WATCH_COMPANY                                :{BLACK}Click here to watch company building
> STR_WATCH_CLICK_NEW_WINDOW                                      :{BLACK}Click here to open new watching window
> 
> STR_WATCH_WINDOW_TITLE_CLIENT                                   :{WHITE}{RAW_STRING} in {RAW_STRING}({NUM}).
> STR_XI_KICK                                                     :{BLACK}Kick
> STR_XI_KICKC                                                    :{BLACK}Kick from cp
> STR_XI_BAN                                                      :{BLACK}Ban
> STR_XI_BAN1                                                     :{BLACK}Ban (1 day)
> STR_XI_LOCK                                                     :{BLACK}Lock
> STR_XI_UNLOCK                                                   :{BLACK}UNLock
> STR_XI_JOIN                                                     :{BLACK}Join company
> STR_XI_RESET                                                    :{BLACK}Reset company
> STR_XI_WATCH                                                    :Watch
> STR_MOD_COMPANY_RESET_BUTTON                                    :{BLACK}Reset
> STR_MOD_COMPANY_JOIN_BUTTON                                     :{BLACK}Join as mod
> STR_MOD_TOGGLE_LOCK_BUTTON                                      :{BLACK}Lock/unlock
> STR_XI_ENABLE                                                   :{BLACK}En/Dis
> STR_XI_SIGN_TOOLTIP                                             :{BLACK}Put a sign to attract player
> STR_XI_PLAYERS_TOOLTIP                                          :{BLACK}Show clients
> STR_XI_COMPANYW_TOOLTIP                                         :{BLACK}Open Company window
> STR_XI_COMPANYHQ                                                :{BLACK}HQ
> STR_XI_COMPANYHQ_TOOLTIP                                        :{BLACK}Go to company's HQ
> STR_XI_PRIVATE_PLAYER_MESSAGE                                   :{BLACK}.{GREEN}P{BLACK}.
> STR_XI_PRIVATE_PLAYER_MESSAGE_TOOLTIP                           :{BLACK}Send a Custom private message to this player
> STR_XI_PRIVATE_COMPANY_MESSAGE                                  :{BLACK}.{GREEN}C{BLACK}.
> STR_XI_PRIVATE_COMPANY_MESSAGE_TOOLTIP                          :{BLACK}Send a Custom private message to this company
> 
> STR_XI_BAN_QUERY                                                :{WHITE}<days> <reason>
> STR_XI_BAN_DAYSDEFAULT                                          :1
> STR_XI_REALY_RESET                                              :{WHITE}Are you sure?.
> STR_XI_RESET_CAPTION                                            :{WHITE}Reset
> 
> STR_NETWORK_CLIENT_EXTRA                                        :{WHITE}(#{NUM} in c#{NUM})
> 
> ######## Zoning toolbar
> 
> STR_ZONING_TOOLBAR                                              :{WHITE}Zoning toolbar
> STR_ZONING_OUTER                                                :{BLACK}Outer tile borders:
> STR_ZONING_INNER                                                :{BLACK}Inner tile borders:
> STR_ZONING_OUTER_INFO                                           :{BLACK}Select which type of zoning you want on the outer border of a tile.
> STR_ZONING_INNER_INFO                                           :{BLACK}Select which type of zoning you want on the inner border of a tile.
> 
> STR_ZONING_NO_ZONING                                            :{BLACK}Nothing
> STR_ZONING_AUTHORITY                                            :{BLACK}Authority
> STR_ZONING_CAN_BUILD                                            :{BLACK}Where I can't build
> STR_ZONING_STA_CATCH                                            :{BLACK}Station catchment
> STR_ZONING_IND_CATCH                                            :{BLACK}Industry catchment
> STR_ZONING_BUL_CATCH                                            :{BLACK}City catchment
> STR_ZONING_BUL_UNSER                                            :{BLACK}Unserved buildings
> STR_ZONING_IND_UNSER                                            :{BLACK}Unserved industries
> STR_ZONING_TOWN_ZONES                                           :{BLACK}Town zones
> STR_ZONING_CB_ACCEPTANCE                                        :{BLACK}CB cargo acceptance
> STR_ZONING_CB_TOWN_LIMIT                                        :{BLACK}CB town limit
> STR_ZONING_ADVERTISEMENT_ZONES                                  :{BLACK}Advertisement
> STR_ZONING_TOWN_GROWTH_TILES                                    :{BLACK}Town growth tiles
> STR_ZONING_ACTIVE_STATIONS                                      :{BLACK}Active stations
> 
> # Commands toolbar
> STR_TOOLBAR_COMMANDS_CAPTION                                    :{WHITE}Commands
> STR_TOOLBAR_COMMANDS_GOAL_CAPTION                               :{BLACK}Goal
> STR_TOOLBAR_COMMANDS_GOAL_TOOLTIP                               :{BLACK}Send !goal command to server.
> STR_TOOLBAR_COMMANDS_QUEST_CAPTION                              :{BLACK}Quest list
> STR_TOOLBAR_COMMANDS_QUEST_TOOLTIP                              :{BLACK}Send !quest command to server.
> STR_TOOLBAR_COMMANDS_SCORE_CAPTION                              :{BLACK}Score
> STR_TOOLBAR_COMMANDS_SCORE_TOOLTIP                              :{BLACK}Send !score command to server.
> STR_TOOLBAR_COMMANDS_TOWN_CAPTION                               :{BLACK}Town
> STR_TOOLBAR_COMMANDS_TOWN_TOOLTIP                               :{BLACK}Send !town command to server.
> STR_TOOLBAR_COMMANDS_TOWN_ID_CAPTION                            :{BLACK}Town ID
> STR_TOOLBAR_COMMANDS_TOWN_ID_TOOLTIP                            :{BLACK}Send !town c-id command to server.
> STR_TOOLBAR_COMMANDS_HINT_CAPTION                               :{BLACK}CB Hint
> STR_TOOLBAR_COMMANDS_HINT_TOOLTIP                               :{BLACK}Send !hint command to server(Shows town demand in CB mode).
> STR_TOOLBAR_COMMANDS_LOGIN_CAPTION                              :{BLACK}Login
> STR_TOOLBAR_COMMANDS_LOGIN_TOOLTIP                              :{BLACK}Send !login command to server.
> STR_TOOLBAR_COMMANDS_TIMELEFT_CAPTION                           :{BLACK}Timeleft
> STR_TOOLBAR_COMMANDS_TIMELEFT_TOOLTIP                           :{BLACK}Send !timeleft command to server.
> STR_TOOLBAR_COMMANDS_NS_CAPTION                                 :{BLACK}CM{NUM}
> STR_TOOLBAR_COMMANDS_NS_TOOLTIP                                 :{BLACK}Join CM{NUM}
> STR_TOOLBAR_COMMANDS_RESETME_CAPTION                            :{BLACK}ResetMe
> STR_TOOLBAR_COMMANDS_RESETME_TOOLTIP                            :{BLACK}Send !resetme command to server.
> STR_TOOLBAR_COMMANDS_SAVEME_CAPTION                             :{BLACK}SaveMe
> STR_TOOLBAR_COMMANDS_SAVEME_TOOLTIP                             :{BLACK}Send !saveme command to server.
> STR_TOOLBAR_COMMANDS_NAME_CAPTION                               :{BLACK}New name
> STR_TOOLBAR_COMMANDS_NAME_TOOLTIP                               :{BLACK}Send !name command to server.
> STR_TOOLBAR_COMMANDS_INFO_CAPTION                               :{BLACK}Info
> STR_TOOLBAR_COMMANDS_INFO_TOOLTIP                               :{BLACK}Send !info command to server.
> 
> STR_TOOLBAR_COMMANDS_OPTION_CARGO_CAPTION                       :{BLACK}Both
> STR_TOOLBAR_COMMANDS_OPTION_CARGO_TOOLTIP                       :{BLACK}Switch cargo buttons to both amount and income
> STR_TOOLBAR_COMMANDS_OPTION_CARGO_I_CAPTION                     :{BLACK}Income
> STR_TOOLBAR_COMMANDS_OPTION_CARGO_A_CAPTION                     :{BLACK}Amount
> STR_TOOLBAR_COMMANDS_OPTION_CARGO_A_TOOLTIP                     :{BLACK}Switch cargo buttons to amount
> STR_TOOLBAR_COMMANDS_OPTION_CARGO_I_TOOLTIP                     :{BLACK}Switch cargo buttons to income
> 
> 
> STR_TOOLBAR_COMMANDS_TOWN_QUERY                                 :{WHITE}Company ID:
> STR_TOOLBAR_COMMANDS_LOGIN_NAME_QUERY                           :{WHITE}<Name> <password>
> STR_TOOLBAR_COMMANDS_LOGIN_PASSWORD_QUERY                       :{WHITE}Password:
> STR_TOOLBAR_COMMANDS_NAME_NEWNAME_QUERY                         :{WHITE}New name:
> 
> STR_TOOLBAR_COMMANDS_TOPICS_CAPTION                             :{BLACK}Topics
> STR_TOOLBAR_COMMANDS_TOPICS_TOOLTIP                             :{BLACK}Display help topics
> STR_TOOLBAR_COMMANDS_TOPIC1_CAPTION                             :{BLACK}HELP Login
> STR_TOOLBAR_COMMANDS_TOPIC1_TOOLTIP                             :{BLACK}How to use login
> STR_TOOLBAR_COMMANDS_TOPIC2_CAPTION                             :{BLACK}HELP Coal Accept
> STR_TOOLBAR_COMMANDS_TOPIC2_TOOLTIP                             :{BLACK}What to do when town does not accept Coal
> STR_TOOLBAR_COMMANDS_TOPIC3_CAPTION                             :{BLACK}HELP Food accept
> STR_TOOLBAR_COMMANDS_TOPIC3_TOOLTIP                             :{BLACK}What to do when town does not accept Food
> STR_TOOLBAR_COMMANDS_TOPIC4_CAPTION                             :{BLACK}HELP energy
> STR_TOOLBAR_COMMANDS_TOPIC4_TOOLTIP                             :{BLACK}What are tourists, business mail or energy?
> STR_TOOLBAR_COMMANDS_TOPIC5_CAPTION                             :{BLACK}HELP admin
> STR_TOOLBAR_COMMANDS_TOPIC5_TOOLTIP                             :{BLACK}How to use admin command?
> STR_TOOLBAR_COMMANDS_TOPIC6_CAPTION                             :{BLACK}HELP New Comp.
> STR_TOOLBAR_COMMANDS_TOPIC6_TOOLTIP                             :{BLACK}Why new company can not be starter?
> 
> STR_TOOLBAR_COMMANDS_HELP_CAPTION                               :{BLACK}Help
> STR_TOOLBAR_COMMANDS_HELP_TOOLTIP                               :{BLACK}Display Help
> STR_TOOLBAR_COMMANDS_RULES_CAPTION                              :{BLACK}RULES
> STR_TOOLBAR_COMMANDS_RULES_TOOLTIP                              :{BLACK}Show Rules
> STR_TOOLBAR_COMMANDS_CBHINT_CAPTION                             :{BLACK}CB Hint
> STR_TOOLBAR_COMMANDS_CBHINT_TOOLTIP                             :{BLACK}Display help for City builder
> STR_TOOLBAR_COMMANDS_BEST_CAPTION                               :{BLACK}Best
> STR_TOOLBAR_COMMANDS_BEST_TOOLTIP                               :{BLACK}Show 5 best games
> STR_TOOLBAR_COMMANDS_RANK_CAPTION                               :{BLACK}Rank
> STR_TOOLBAR_COMMANDS_RANK_TOOLTIP                               :{BLACK}Show top 10 players
> STR_TOOLBAR_COMMANDS_ME_CAPTION                                 :{BLACK}My Rank
> STR_TOOLBAR_COMMANDS_ME_TOOLTIP                                 :{BLACK}Show your ranking position
> 
> #login window
> STR_LOGINWINDOW_CAPTION                                         :{WHITE}Login Window
> STR_LOGINWINDOW_CITYMANIA                                       :{BLACK}CityMania
> STR_LOGINWINDOW_NICE                                            :{BLACK}N-ice
> STR_LOGINWINDOW_BTPRO                                           :{BLACK}BTPro
> STR_LOGINERROR_NOCONNECT                                        :{WHITE}Failed to connect
> STR_LOGINERROR_BADINPUT                                         :{WHITE}Bad username or password
> STR_LOGIN_USERNAME                                              :{WHITE}Username
> STR_LOGIN_PASSWORD                                              :{WHITE}Password
> STR_LOGIN_SET                                                   :{WHITE}Set
> STR_LOGIN_NOTSET                                                :{WHITE}Not Set
> STR_LOGIN_CHANGE_USERNAME                                       :{WHITE}Change username
> STR_LOGIN_CHANGE_PASSWORD                                       :{WHITE}Change password
> STR_LOGIN_SEND_LOGIN_TT                                         :{WHITE}Send Login - you must but on the correct community server
> STR_LOGIN_USERNAME_DISPLAY                                      :{WHITE}{RAW_STRING}
> STR_LOGIN_PASSWORD_DISPLAY                                      :{WHITE}{STRING}
> 
> #cargo table
> STR_TOOLBAR_CARGOS_HEADER_CARGO                                 :{BLACK}Cargo Name
> STR_TOOLBAR_CARGOS_HEADER_AMOUNT                                :{BLACK}Amount
> STR_TOOLBAR_CARGOS_HEADER_INCOME                                :{BLACK}Income
> STR_TOOLBAR_CARGOS_HEADER_TOTAL                                 :{BLACK}Total
> STR_TOOLBAR_CARGOS_HEADER_TOTAL_MONTH                           :{BLACK}Total this Month
> 
> STR_TOOLBAR_CARGOS_UNITS                                        :{BLACK}{COMMA}
> STR_TOOLBAR_CARGOS_UNITS_TOTAL                                  :{BLACK}{COMMA}
> STR_TOOLBAR_CARGOS_CAPTION                                      :{WHITE}{COMPANY} Cargo Transported {BLACK}{COMPANY_NUM}
> STR_TOOLBAR_CARGOS_NAME                                         :{BLACK}{STRING}
> 
> #towns
> STR_TOWN_DIRECTORY_TOWN_COLOUR                                  :{ORANGE}{TOWN}{BLACK} ({COMMA}->{COMMA}) {YELLOW}{COMMA} {P "house" "houses"}
> STR_TOWN_DIRECTORY_CITY_COLOUR                                  :{YELLOW}{TOWN}{BLACK} ({COMMA}->{COMMA}) {YELLOW}{COMMA} {P "house" "houses"}
> STR_OLD_DEPOT_TRAINT_LENGTH                                     :Old depot length format: {STRING2}
> STR_SMALLMAP_TOWN_LARGE                                         :{TINY_FONT}{YELLOW}{TOWN}
> 
> STR_SORT_BY_HOUSES                                              :Houses
> STR_SORT_BY_REAL_POPULATION                                     :Real population
> STR_ORDER_DIST                                                  :{NUM}, {NUM}
> 
> #server list
> STR_NETWORK_SELECT_CITYMANIA                                    :{BLACK}CityMania
> STR_NETWORK_SELECT_NICE                                         :{BLACK}N-ice
> STR_NETWORK_SELECT_BTPRO                                        :{BLACK}BTPro
> STR_NETWORK_SELECT_REDDIT                                       :{BLACK}reddit
> STR_NETWORK_SELECT_SERVER_TOOLTIP                               :{BLACK}Filter this one
> 
> ### Town CB gui
> STR_BUTTON_CB                                                   :{STRING}
> STR_BUTTON_CB_YES                                               :{BLACK}CB
> STR_TOWN_VIEW_CB_CAPTION                                        :{WHITE}{TOWN}
> 
> STR_CB_LARGE_ADVERTISING_CAMPAIGN                               :{BLACK}Large Advertising
> STR_CB_NEW_BUILDINGS                                            :{BLACK}Fund Buildings
> STR_CB_FUND_REGULAR                                             :{BLACK}Fund Regularly
> STR_CB_FUND_REGULAR_TT                                          :{BLACK}Every time fund buildings is zero and company has enough money, buildings will be funded automatically
> STR_CB_FUNDED_REGULARLY                                         :{GREEN}Town is funded regularly
> STR_CB_ADVERT_REGULAR                                           :{BLACK}Adv. Regularly
> STR_CB_ADVERT_REGULAR_TT                                        :{BLACK}Automatically advertise town whenever stations rating drops below a certain point
> STR_CB_POWERFUND                                                :{BLACK}Powerfund
> STR_CB_ADVERT_REGULAR_RATING_TO_KEEP                            :{BLACK}Keep station rating at
> STR_CB_POWERFUND_TT                                             :{BLACK}Continiously funds town with maximum speed possible
> 
> STR_TOWN_CB_FUNDING                                             :{ORANGE}Funded for {YELLOW}{COMMA}{ORANGE} month{P "" s}
> STR_TOWN_CB_GROWING                                             :{GREEN}Town is growing!
> STR_TOWN_CB_NOT_GROWING                                         :{WHITE}Town is not growing
> STR_TOWN_CB_GROWING_DETAIL                                      :{ORANGE}1 house in {YELLOW}{COMMA} {ORANGE}days ({YELLOW}{COMMA}%{ORANGE}). Next House in {YELLOW}{COMMA} {ORANGE}days
> 
> STR_TOWN_GROWTH_HEADER_CARGO                                    :{BLACK}Cargo
> STR_TOWN_GROWTH_HEADER_AMOUNT                                   :{BLACK}Delivered
> STR_TOWN_GROWTH_HEADER_REQ                                      :{BLACK}Required
> STR_TOWN_GROWTH_HEADER_LAST                                     :{BLACK}Last Month
> STR_TOWN_GROWTH_HEADER_STORE                                    :{BLACK}Stored
> STR_TOWN_GROWTH_HEADER_STORE_PCT                                :{BLACK}Use%
> STR_TOWN_GROWTH_HEADER_FROM                                     :{BLACK}From
> 
> STR_TOWN_CB_CARGO_NAME                                          :{BLACK}{STRING}:
> 
> STR_TOWN_CB_CARGO_AMOUNT_GOOD                                   :{GREEN}{COMMA}
> STR_TOWN_CB_CARGO_AMOUNT_BAD                                    :{YELLOW}{COMMA}
> STR_TOWN_CB_CARGO_AMOUNT_NOT                                    :{SILVER}{COMMA}
> 
> STR_TOWN_CB_CARGO_REQ_YES                                       :{ORANGE}{COMMA}
> STR_TOWN_CB_CARGO_REQ_NOT                                       :{SILVER}{COMMA}
> 
> STR_TOWN_CB_CARGO_STORE_YES                                     :{LTBLUE}{COMMA}
> STR_TOWN_CB_CARGO_STORE_NOT                                     :{SILVER}{COMMA}
> STR_TOWN_CB_CARGO_STORE_DECAY                                   :{BLACK}-
> 
> STR_TOWN_CB_CARGO_STORE_PCT_YES                                 :{LTBLUE}{COMMA}%
> STR_TOWN_CB_CARGO_STORE_PCT_NOT                                 :{SILVER}{COMMA}%
> 
> STR_TOWN_CB_CARGO_PREVIOUS_YES                                  :{GREEN}{COMMA}
> STR_TOWN_CB_CARGO_PREVIOUS_EDGE                                 :{YELLOW}{COMMA}
> STR_TOWN_CB_CARGO_PREVIOUS_BAD                                  :{RED}{COMMA}
> STR_TOWN_CB_CARGO_PREVIOUS_NOT                                  :{SILVER}{COMMA}
> 
> STR_TOWN_CB_CARGO_FROM_YES                                      :{YELLOW}{COMMA}
> STR_TOWN_CB_CARGO_FROM_NOT                                      :{SILVER}{COMMA}
> 
> #polyrail double click option
> STR_CONFIG_SETTING_POLYRAIL_DOUBLECLICK_TOOLTIPS                :Enable finishing polyrail with mouse double click{STRING2}
> 
> # Industry funding forbidden tiles
> STR_FUND_INDUSTRY_FORBIDDEN_TILES_TITLE                         :{BLACK}Forbidden areas highlight
> STR_FUND_INDUSTRY_FORBIDDEN_TILES_OFF                           :{BLACK}Off
> STR_FUND_INDUSTRY_FORBIDDEN_TILES_ON                            :{BLACK}On
> STR_FUND_INDUSTRY_FORBIDDEN_TILES_OFF_TOOLTIP                   :{BLACK}Don't highlight areas where particular industry can not be funded
> STR_FUND_INDUSTRY_FORBIDDEN_TILES_ON_TOOLTIP                    :{BLACK}Highlight areas where particular industry can not be funded
> 
> STR_CB_GUI_TOWN_VIEW_BUTTON                                     :{BLACK}Town view
> STR_CB_GUI_TOWN_VIEW_TOOLTIP                                    :{BLACK}Show information on town
> 
> STR_CONFIG_SETTING_WARN_IF_RUNWAY_IS_TOO_SHORT                  :Warn if airplane has in its orders an airport whose runway is too short
> 
> STR_CONFIG_SETTING_POWERFUND_MONEY                              :Powerfund minimum needed money for fund: {STRING2}
> STR_CONFIG_SETTING_POWERFUND_HOUSES                             :Maximum amount of houses to powerfund up to: {STRING2}
> 
> STR_STATION_RATING_TOOLTIP_RATING_DETAILS                       :{STRING} Rating Details
> STR_STATION_RATING_TOOLTIP_TOTAL_RATING                         :Total target rating: {LTBLUE}{NUM}%
> STR_STATION_RATING_TOOLTIP_NEWGRF_RATING                        :NewGRF station rating: {STRING1} {BLACK}based on
> STR_STATION_RATING_TOOLTIP_NEWGRF_RATING_0                      :{GOLD}{NUM}%
> STR_STATION_RATING_TOOLTIP_NEWGRF_RATING_1                      :{LTBLUE}+{NUM}%
> STR_STATION_RATING_TOOLTIP_NEWGRF_SPEED                         :Max speed of last vehicle: {LTBLUE}{VELOCITY}
> STR_STATION_RATING_TOOLTIP_NEWGRF_WAITUNITS                     :Units of cargo waiting: {LTBLUE}{NUM}
> STR_STATION_RATING_TOOLTIP_NEWGRF_WAITTIME                      :Time since last pickup: {LTBLUE}{NUM} days
> 
> STR_STATION_RATING_TOOLTIP_SPEED                                :Max speed of last vehicle (max 17%): {STRING2}
> STR_STATION_RATING_TOOLTIP_SPEED_MAX                            :{GREEN}{VELOCITY} or more, +{NUM}%
> STR_STATION_RATING_TOOLTIP_SPEED_ZERO                           :{RED}{VELOCITY}, {NUM}%
> STR_STATION_RATING_TOOLTIP_SPEED_0                              :{ORANGE}{VELOCITY}, +{NUM}%
> STR_STATION_RATING_TOOLTIP_SPEED_1                              :{GOLD}{VELOCITY}, +{NUM}%
> STR_STATION_RATING_TOOLTIP_SPEED_2                              :{YELLOW}{VELOCITY}, +{NUM}%
> STR_STATION_RATING_TOOLTIP_SPEED_3                              :{GREEN}{VELOCITY}, +{NUM}%
> 
> STR_STATION_RATING_TOOLTIP_AGE                                  :Age of last vehicle (max 13%): {STRING2}
> STR_STATION_RATING_TOOLTIP_AGE_0                                :{ORANGE}{NUM} years, {NUM}%
> STR_STATION_RATING_TOOLTIP_AGE_1                                :{GOLD}{NUM} years, +{NUM}%
> STR_STATION_RATING_TOOLTIP_AGE_2                                :{YELLOW}{NUM} year, +{NUM}%
> STR_STATION_RATING_TOOLTIP_AGE_3                                :{GREEN}{NUM} years, +{NUM}%
> 
> STR_STATION_RATING_TOOLTIP_WAITTIME                             :Time since last pickup (max 51%): {STRING2}
> STR_STATION_RATING_TOOLTIP_WAITTIME_SHIP                        :Time since last pickup (max 51%): {STRING2} (by ship)
> STR_STATION_RATING_TOOLTIP_WAITTIME_0                           :{RED}{NUM} days, {NUM}%
> STR_STATION_RATING_TOOLTIP_WAITTIME_1                           :{ORANGE}{NUM} days, +{NUM}%
> STR_STATION_RATING_TOOLTIP_WAITTIME_2                           :{GOLD}{NUM} days, +{NUM}%
> STR_STATION_RATING_TOOLTIP_WAITTIME_3                           :{YELLOW}{NUM} days, +{NUM}%
> STR_STATION_RATING_TOOLTIP_WAITTIME_4                           :{GREEN}{NUM} day{P "" s}, +{NUM}%
> 
> STR_STATION_RATING_TOOLTIP_WAITUNITS                            :Units of cargo waiting (max 16%): {STRING2}
> STR_STATION_RATING_TOOLTIP_WAITUNITS_0                          :{RED}{NUM}, {NUM}%
> STR_STATION_RATING_TOOLTIP_WAITUNITS_1                          :{ORANGE}{NUM}, {NUM}%
> STR_STATION_RATING_TOOLTIP_WAITUNITS_2                          :{GOLD}{NUM}, {NUM}%
> STR_STATION_RATING_TOOLTIP_WAITUNITS_3                          :{YELLOW}{NUM}, +{NUM}%
> STR_STATION_RATING_TOOLTIP_WAITUNITS_4                          :{YELLOW}{NUM}, +{NUM}%
> STR_STATION_RATING_TOOLTIP_WAITUNITS_5                          :{GREEN}{NUM}, +{NUM}%
> 
> STR_STATION_RATING_TOOLTIP_STATUE                               :Statue in town (max 10%): {STRING}
> STR_STATION_RATING_TOOLTIP_STATUE_NO                            :{GOLD}no, 0%
> STR_STATION_RATING_TOOLTIP_STATUE_YES                           :{GREEN}yes, +10%
> 
> STR_IGNORE_VERSION_CHECK_WARNING : WARNING! You're about to join server running a different version of the game!
> STR_IGNORE_VERSION_CHECK_WARNING_DETAILS : OpenTTD was never indended to work in such way. If you're lucky you may be able to play it but most likely something is going to break sooner or later. Desyncs or crashes are to be expected. So proceed at your own risk and don't report any errors you encounter there.
> STR_CM_STATION_BUILD_TOWN :{BLACK}Town: {GOLD}{TOWN}
> STR_CM_STATION_BUILD_TOWN_LARGE :{BLACK}Town: {GOLD}{TOWN} (L)
> STR_CM_STATION_BUILD_TOWN_MEDIUM :{BLACK}Town: {GOLD}{TOWN} (M)
> STR_CM_STATION_BUILD_TOWN_SMALL :{BLACK}Town: {GOLD}{TOWN} (S)
> STR_CM_CONFIG_SETTING_OPEN_VEHICLE_FOR_SHARED_CLONE :Open vehicle window for shared clones: {STRING2}
> STR_CM_CONFIG_SETTING_OPEN_VEHICLE_FOR_SHARED_CLONE_HELPTEXT :Open vehicle window when cloning vehicles with shared orders (as it does for non-shared ones)
> STR_CM_CONFIG_SETTING_OPEN_ORDERS_FOR_NEW_VEHICLES :Open orders window for new vehicles: {STRING2}
> STR_CM_CONFIG_SETTING_OPEN_ORDERS_FOR_NEW_VEHICLES_HELPTEXT :Automatically open oreders windown along with a vehicle window for a new vehicles
> STR_CM_PURCHASE_ENGINE_ID :{BLACK}Engine ID: {GOLD}{NUM}
> STR_CM_SMALLMAP_TOOLTIP_SHOW_IMBA_ON_MAP :{BLACK}Show industries on map combined with land contours and vegetation
> STR_CM_CONFIG_SETTING_PAUSE_AFTER_LOAD                             :Pause the game after loading: {STRING2}
> STR_CM_CONFIG_SETTING_PAUSE_AFTER_LOAD_HELPTEXT                    :Control whether the game should be paused after load (if it's not already paused). Useful for desync debugging.
> 
> 
> STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_HOUSES                        :Show tooltips when hovering over houses: {STRING2}
> STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_INDUSTRIES                    :Show tooltips when hovering over industries: {STRING2}
> STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_STATIONS                      :Show tooltips when hovering over stations: {STRING2}
> STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_HOUSES_HELPTEXT               :Show tooltips when hovering over houses in the viewport. {GOLD}(CityMania addon)
> STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_INDUSTRIES_HELPTEXT           :Show tooltips when hovering over industries in the viewport. {GOLD}(CityMania addon)
> STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_STATIONS_HELPTEXT             :Show tooltips when hovering over stations in the viewport. {GOLD}(CityMania addon)
> STR_CM_LAND_TOOLTIPS_HOUSE_NAME                   :{LTBLUE}{STRING}
> STR_CM_LAND_TOOLTIPS_HOUSE_POPULATION             :{BLACK}Population: {NUM}
> STR_CM_LAND_TOOLTIPS_INDUSTRY_NAME                :{LTBLUE}{INDUSTRY}
> STR_CM_LAND_TOOLTIPS_INDUSTRY_CARGO               :{WHITE}{STRING}  {BLACK}{CARGO_SHORT} {YELLOW}{NUM} %
> STR_CM_LAND_TOOLTIPS_STATION_NAME                 :{LTBLUE}{STATION}
> STR_CM_LAND_TOOLTIPS_STATION_CARGO                :{WHITE}{STRING}  {BLACK}{CARGO_SHORT} {YELLOW}{NUM} %
> 
> STR_LAND_AREA_INFORMATION_POP                                   :{BLACK}Population: {LTBLUE}{NUM}
> 
> STR_CM_CONFIG_SETTING_MODIFIER_FN          : Additional function modifier key: {STRING2}
> STR_CM_CONFIG_SETTING_MODIFIER_FN_HELPTEXT : Modifier key for accessing additional functions.
> STR_CM_CONFIG_SETTING_MODIFIER_REMOVE          : Remove modifier key: {STRING2}
> STR_CM_CONFIG_SETTING_MODIFIER_REMOVE_HELPTEXT : Modifier key for removal mode on building tools.
> STR_CM_CONFIG_SETTING_MODIFIER_ESTIMATE          : Estimate modifier key: {STRING2}
> STR_CM_CONFIG_SETTING_MODIFIER_ESTIMATE_HELPTEXT : Modifier key for estimating action cost.
> STR_CM_CONFIG_SETTING_MODIFIER_NONE  : None
> STR_CM_CONFIG_SETTING_MODIFIER_SHIFT : Shift
> STR_CM_CONFIG_SETTING_MODIFIER_CTRL  : Ctrl
> STR_CM_CONFIG_SETTING_MODIFIER_ALT   : Alt
> 
> STR_CM_CONFIG_SETTING_SHADED_TREES          : Shaded trees: {STRING2}
> STR_CM_CONFIG_SETTING_SHADED_TREES_HELPTEXT : Change tree brightness depending on a slope. Enhances visual appeal of mountaneous forests.
> STR_CM_CONFIG_SETTING_SHADED_TREES_OFF      : Always off
> STR_CM_CONFIG_SETTING_SHADED_TREES_ON       : Always on
> STR_CM_CONFIG_SETTING_SHADED_TREES_SERVER   : As server
> 
> STR_CM_CONFIG_SETTING_SHOW_APM          : Show APM counter: {STRING2}
> STR_CM_CONFIG_SETTING_SHOW_APM_HELPTEXT : Adds APM (actions per minute) counter to the statusbar.
> STR_CM_STATUSBAR_APM                    : {WHITE}APM: {NUM} AVG: {NUM}
diff -r -B -X .diff-exclude vanilla/src/lang/english_US.txt cmclient/src/lang/english_US.txt
251a252
> STR_TOOLTIP_DEMOLISH_TREES                                      :{BLACK}Demolish only trees on a square of land. Ctrl selects the area diagonally.
diff -r -B -X .diff-exclude vanilla/src/main_gui.cpp cmclient/src/main_gui.cpp
33a34,35
> #include "error.h"
> #include "news_gui.h"
105c107
< 	if (w->IsWidgetLowered(widget)) {
---
> 	if (w->IsWidgetLowered(widget) && mode == _thd.place_mode) {
233a236
> 	GHK_BORROW_ALL,
237a241,242
> 	GHK_CLOSE_NEWS,
> 	GHK_CLOSE_ERROR,
401a407,410
> 			case GHK_BORROW_ALL:
> 				DoCommandP(0, 0, 1, CMD_INCREASE_LOAN | CMD_MSG(STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY));
> 				break;
> 
429a439,446
> 			case GHK_CLOSE_NEWS: // close active news window
> 				if (!HideActiveNewsMessage()) return ES_NOT_HANDLED;
> 				break;
> 
> 			case GHK_CLOSE_ERROR: // close active error window
> 				if (!HideActiveErrorMessage()) return ES_NOT_HANDLED;
> 				break;
> 
471a489,493
> 	virtual void OnMouseOver(Point pt, int widget)
> 	{
> 		if (_game_mode != GM_MENU && pt.x != -1) GuiPrepareTooltipsExtra(this);
> 	}
> 
518a541
> 	Hotkey(WKC_NONE, "borrow_all", GHK_BORROW_ALL),
522a546,547
> 	Hotkey(WKC_SPACE, "close_news", GHK_CLOSE_NEWS),
> 	Hotkey(WKC_SPACE, "close_error", GHK_CLOSE_ERROR),
diff -r -B -X .diff-exclude vanilla/src/map.cpp cmclient/src/map.cpp
14a15
> #include "citymania/cm_highlight.hpp"
63a65
> 	citymania::AllocateZoningMap(_map_size);
diff -r -B -X .diff-exclude vanilla/src/misc_cmd.cpp cmclient/src/misc_cmd.cpp
173c173
< 			if (p2 == 0) {
---
> 			if ((p2 & 1) == 0) {
174a175
> 				_pause_countdown = (p2 >> 1);
diff -r -B -X .diff-exclude vanilla/src/misc.cpp cmclient/src/misc.cpp
66a67
> 	_pause_countdown = 0;
122a124
> 	ResetRailPlacementEndpoints();
diff -r -B -X .diff-exclude vanilla/src/misc_gui.cpp cmclient/src/misc_gui.cpp
25a26
> #include "newgrf_cargo.h"
33a35,42
> #include "house.h"
> #include "town_map.h"
> #include "station_base.h"
> #include "viewport_func.h"
> #include "industry.h"
> 
> #include "citymania/cm_tooltips.hpp"
> 
35a45,46
> extern const Station *_viewport_highlight_station; // CM
> 
46,51c57
< 	NWidget(NWID_HORIZONTAL),
< 		NWidget(WWT_CLOSEBOX, COLOUR_GREY),
< 		NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_LAND_AREA_INFORMATION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
< 		NWidget(WWT_DEBUGBOX, COLOUR_GREY),
< 	EndContainer(),
< 	NWidget(WWT_PANEL, COLOUR_GREY, WID_LI_BACKGROUND), EndContainer(),
---
> 	NWidget(WWT_PANEL, COLOUR_GREY, WID_LI_BACKGROUND), SetMinimalSize(64, 32),	EndContainer(),
55c61
< 	WDP_AUTO, "land_info", 0, 0,
---
> 	WDP_MANUAL, "land_info", 0, 0,
72a79,90
> 	TileIndex end_tile;  ///< For use in ruler(dragdrop) mode
> 
> 	virtual Point OnInitialPosition(int16 sm_width, int16 sm_height, int window_number)
> 	{
> 		int scr_top = GetMainViewTop() + 2;
> 		int scr_bot = GetMainViewBottom() - 2;
> 		Point pt;
> 		pt.y = Clamp(_cursor.pos.y + _cursor.total_size.y + _cursor.total_offs.y + 5, scr_top, scr_bot);
> 		if (pt.y + sm_height > scr_bot) pt.y = min(_cursor.pos.y + _cursor.total_offs.y - 5, scr_bot) - sm_height;
> 		pt.x = sm_width >= _screen.width ? 0 : Clamp(_cursor.pos.x - (sm_width >> 1), 0, _screen.width - sm_width);
> 		return pt;
> 	}
77a96,100
> 		GfxDrawLine(r.left,  r.top,    r.right, r.top,    PC_BLACK);
> 		GfxDrawLine(r.left,  r.bottom, r.right, r.bottom, PC_BLACK);
> 		GfxDrawLine(r.left,  r.top,    r.left,  r.bottom, PC_BLACK);
> 		GfxDrawLine(r.right, r.top,    r.right, r.bottom, PC_BLACK);
> 
110c133
< 			size->width = max(size->width, min(300u, width));
---
> 			size->width = max(size->width, min<uint>(ScaleGUITrad(300), width));
116c139,140
< 	LandInfoWindow(TileIndex tile) : Window(&_land_info_desc), tile(tile)
---
> 	LandInfoWindow(TileIndex tile, TileIndex end_tile=INVALID_TILE) :
> 		Window(&_land_info_desc), tile(tile), end_tile(end_tile)
118a143
> 		CLRBITS(this->flags, WF_WHITE_BORDER);
171a197
>  		td.population = 0;
325a352,358
> 		/* House pop */
> 		if (td.population != 0) {
> 			SetDParam(0, td.population);
> 			GetString(this->landinfo_data[line_nr], STR_LAND_AREA_INFORMATION_POP, lastof(this->landinfo_data[line_nr]));
> 			line_nr++;
> 		}
> 
385c418
< void ShowLandInfo(TileIndex tile)
---
> void ShowLandInfo(TileIndex tile, TileIndex end_tile)
386a420,423
>     static TileIndex last_tooltip_tile = INVALID_TILE;
>     if (tile == last_tooltip_tile) return;
>     last_tooltip_tile = tile;
> 
388c425,426
< 	new LandInfoWindow(tile);
---
> 	if (tile == INVALID_TILE) return;
> 	new LandInfoWindow(tile, end_tile);
1277a1316,1331
> }
> 
> /** Window for displaying a tooltip. */
> void GuiPrepareTooltipsExtra(Window *parent){
> 	const Point p = GetTileBelowCursor();
> 	TileIndex tile = (p.x == -1 ? INVALID_TILE : TileVirtXY(p.x, p.y));
> 
> 	if (_cursor.sprite_seq[0].sprite == SPR_CURSOR_QUERY) {
> 		// Land info tool active
> 		ShowLandInfo(tile);
> 		return;
> 	}
> 	ShowLandInfo(INVALID_TILE);
> 
> 	if (tile >= MapSize()) tile = INVALID_TILE;
> 	citymania::ShowLandTooltips(tile, parent);
diff -r -B -X .diff-exclude vanilla/src/network/network_client.cpp cmclient/src/network/network_client.cpp
34c33,35
< #include "../safeguards.h"
---
> #include "../town.h"
> #include "network_func.h"
> #include "../newgrf_revisions.hpp"
35a37
> #include "../safeguards.h"
37a40,43
> void SyncCMUser(const char *msg);
> // extern const std::map<std::string, uint32> OPENTTD_NEWGRF_VERSIONS;
> // extern const std::map<uint32, uint32> OPENTTD_RELEASE_REVISIONS;
> static const uint32 OPENTTD_NEWGRF_REVISION_MASK = (1 << 19) - 1;
219a226,227
> 	this->CloseConnection(res);
> 
223d230
< 	this->CloseConnection(res);
323a331,332
> /** Server revision to use when fooling revision check */
> const char *_network_join_server_revision = NULL;
353,354c362,385
< 	p->Send_string(GetNetworkRevisionString());
< 	p->Send_uint32(_openttd_newgrf_version);
---
> 	if (_network_join_server_revision) {
> 		auto r = _network_join_server_revision;
> 		p->Send_string(r);
> 		auto nr = OPENTTD_NEWGRF_VERSIONS.find(r);
> 		uint32 rev;
> 		if (nr != OPENTTD_NEWGRF_VERSIONS.end()) {
> 			p->Send_uint32(nr->second);
> 		} else if (r[0] == 'r' && r[6] == 0 && (rev = strtoul(r + 1, nullptr, 10)) > 0) {
> 			// assume it's nightly
> 			uint32 max_rev = 0;
> 			// find release closest to the nightly
> 			for (auto &kv: OPENTTD_RELEASE_REVISIONS) {
> 				if (kv.first > max_rev && kv.first <= rev)
> 					max_rev = kv.first;
> 			}
> 			p->Send_uint32(OPENTTD_RELEASE_REVISIONS.at(max_rev) |
> 			               (rev & OPENTTD_NEWGRF_REVISION_MASK));
> 		} else {
> 			p->Send_uint32(_openttd_newgrf_version);
> 		}
> 	} else {
> 		p->Send_string(GetNetworkRevisionString());
> 		p->Send_uint32(_openttd_newgrf_version);
> 	}
636a668,671
> 		InvalidateWindowClassesData(WC_WATCH_COMPANY, 0);
> 		SetWindowClassesDirty(WC_WATCH_COMPANY);
> 		InvalidateWindowData(WC_WATCH_COMPANYA, ci->client_id, 1);
> 		SetWindowClassesDirty(WC_WATCH_COMPANYA);
655a691,694
> 	InvalidateWindowClassesData(WC_WATCH_COMPANY, 0);
> 	SetWindowClassesDirty(WC_WATCH_COMPANY);
> 	InvalidateWindowData(WC_WATCH_COMPANYA, ci->client_id, 1);
> 	SetWindowClassesDirty(WC_WATCH_COMPANYA);
1018c1057,1058
< 		NetworkTextMessage(action, GetDrawStringCompanyColour(ci->client_playas), self_send, name, msg, data);
---
> 		if (strncmp(msg, "synccmuser", 10) == 0) SyncCMUser(msg);
> 		else NetworkTextMessage(action, GetDrawStringCompanyColour(ci->client_playas), self_send, name, msg, data);
1054a1095,1096
> 	InvalidateWindowClassesData( WC_WATCH_COMPANYA, 0 );
> 	SetWindowClassesDirty( WC_WATCH_COMPANYA );
1144a1187,1188
> 	InvalidateWindowClassesData( WC_WATCH_COMPANYA, 0 );
> 	SetWindowClassesDirty( WC_WATCH_COMPANYA );
1288a1333,1336
> void NetworkClientSendChatToServer(const char * msg)
> {
> 	NetworkClientSendChat(NETWORK_ACTION_CHAT_CLIENT, DESTTYPE_CLIENT, CLIENT_ID_SERVER, msg);
> }
1331a1380,1387
> 
> void SyncCMUser(const char *msg) {
> 	uint user_id, role;
> 	sscanf(msg + 10, "%u %u", &user_id, &role);
> 	_novarole = (role >= 50);
> 	DEBUG(net, 1, "CityMania user synchronized: %u %u", user_id, role);
> }
> 
diff -r -B -X .diff-exclude vanilla/src/network/network_client.h cmclient/src/network/network_client.h
115a116
> extern const char *_network_join_server_revision;
diff -r -B -X .diff-exclude vanilla/src/network/network.cpp cmclient/src/network/network.cpp
81c81
< 
---
> bool _novarole = false;
111a112
> 	InvalidateWindowData(WC_WATCH_COMPANYA, this->client_id, 2);
979a981
> 		if (_pause_countdown > 0 && --_pause_countdown == 0) DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
diff -r -B -X .diff-exclude vanilla/src/network/network_func.h cmclient/src/network/network_func.h
37c37
< 
---
> extern bool _novarole;
55a56
> void NetworkClientSendChatToServer(const char * msg);
diff -r -B -X .diff-exclude vanilla/src/network/network_gui.cpp cmclient/src/network/network_gui.cpp
39a40,45
> #include "../error.h"
> #include "../zoom_func.h"
> #include "../watch_gui.h"
> 
> #include "../citymania/cm_hotkeys.hpp"
> 
235a242
> 	bool UDP_CC_queried;
389a397
> 		int lock_y_offset = (this->resize.step_height - GetSpriteSize(SPR_LOCK).height) / 2;
434c442
< 			if (cur_item->info.use_password) DrawSprite(SPR_LOCK, PAL_NONE, nwi_info->pos_x + this->lock_offset, y + icon_y_offset - 1);
---
> 			if (cur_item->info.use_password) DrawSprite(SPR_LOCK, PAL_NONE, nwi_info->pos_x + this->lock_offset, y + lock_y_offset);
437c445
< 			DrawSprite(SPR_BLOT, (cur_item->info.compatible ? PALETTE_TO_GREEN : (cur_item->info.version_compatible ? PALETTE_TO_YELLOW : PALETTE_TO_RED)), nwi_info->pos_x + this->blot_offset, y + icon_y_offset);
---
> 			DrawSprite(SPR_BLOT, (cur_item->info.compatible ? PALETTE_TO_GREEN : (cur_item->info.version_compatible ? PALETTE_TO_YELLOW : PALETTE_TO_RED)), nwi_info->pos_x + this->blot_offset, y + icon_y_offset + 1);
440c448
< 			DrawSprite(SPR_FLAGS_BASE + cur_item->info.server_lang, PAL_NONE, nwi_info->pos_x + this->flag_offset, y + icon_y_offset);
---
> 			DrawSprite(SPR_FLAGS_BASE + cur_item->info.server_lang, PAL_NONE, nwi_info->pos_x + this->flag_offset, y + (this->resize.step_height - GetSpriteSize(SPR_FLAGS_BASE + cur_item->info.server_lang).height) / 2);
475a484
> 		this->UDP_CC_queried = false;
612c621
< 				!sel->info.compatible); // Revision mismatch
---
> 				(!sel->info.compatible && !citymania::_fn_mod)); // Revision mismatch
772a782,792
> 					if (this->server->info.compatible) {
> 						_network_join_server_revision = NULL;
> 					} else {
> 						_network_join_server_revision = this->server->info.server_revision;
> 						ShowErrorMessage(STR_IGNORE_VERSION_CHECK_WARNING,
> 						                 STR_IGNORE_VERSION_CHECK_WARNING_DETAILS,
> 						                 WL_WARNING,
> 						                 0, 0,
> 						                 NULL, 0, NULL);
> 						// ShowGoalQuestion(0, 2 /* WARNING */, 2 /* OK */, "Full-tile autoroad tool is deprecated and will be removed in next release.\n Use regular autoroad tool instead.");
> 					}
787a808,824
> 			case WID_NG_NICE:
> 			case WID_NG_BTPRO:
> 			case WID_NG_REDDIT:
> 			case WID_NG_CITYMANIA:
> 				if(!UDP_CC_queried){
> 					NetworkUDPQueryMasterServer();
> 					UDP_CC_queried = true;
> 				}
> 				if(widget == WID_NG_NICE) this->filter_editbox.text.Assign("n-ice");
> 				else if(widget == WID_NG_BTPRO) this->filter_editbox.text.Assign("BTPro");
> 				else if(widget == WID_NG_CITYMANIA) this->filter_editbox.text.Assign("citymania");
> 				else if(widget == WID_NG_REDDIT) this->filter_editbox.text.Assign("reddit");
> 				this->servers.ForceRebuild();
> 				this->BuildGUINetworkGameList();
> 				this->ScrollToSelectedServer();
> 				this->SetDirty();
> 				break;
918c955
< Listing NetworkGameWindow::last_sorting = {false, 5};
---
> Listing NetworkGameWindow::last_sorting = {false, 0};
954a992,995
> 						NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_CITYMANIA), SetFill(1, 0), SetDataTip(STR_NETWORK_SELECT_CITYMANIA, STR_NETWORK_SELECT_SERVER_TOOLTIP),
> 						NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_BTPRO), SetFill(1, 0), SetDataTip(STR_NETWORK_SELECT_BTPRO, STR_NETWORK_SELECT_SERVER_TOOLTIP),
> 						NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_NICE), SetFill(1, 0), SetDataTip(STR_NETWORK_SELECT_NICE, STR_NETWORK_SELECT_SERVER_TOOLTIP),
> 						NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_REDDIT), SetFill(1, 0), SetDataTip(STR_NETWORK_SELECT_REDDIT, STR_NETWORK_SELECT_SERVER_TOOLTIP),
1187c1228
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
1395c1436
< 				resize->height = WD_MATRIX_TOP + FONT_HEIGHT_NORMAL + WD_MATRIX_BOTTOM;
---
> 				resize->height = WD_MATRIX_TOP + max(max(GetSpriteSize(SPR_LOCK).height, GetSpriteSize(SPR_PROFIT_LOT).height), (uint)FONT_HEIGHT_NORMAL) + WD_MATRIX_BOTTOM;
1396a1438
> 				size->width = ScaleGUITrad(146);
1448a1491
> 		uint text_offset = (this->resize.step_height - WD_MATRIX_TOP - WD_MATRIX_BOTTOM - FONT_HEIGHT_NORMAL) / 2 + WD_MATRIX_TOP;
1452c1495
< 		int lock_y_offset   = (this->resize.step_height - WD_MATRIX_TOP - WD_MATRIX_BOTTOM - lock_size.height) / 2;
---
> 		int lock_y_offset   = (this->resize.step_height - lock_size.height) / 2;
1456c1499
< 		int profit_y_offset   = (this->resize.step_height - WD_MATRIX_TOP - WD_MATRIX_BOTTOM - profit_size.height) / 2;
---
> 		int profit_y_offset   = (this->resize.step_height - profit_size.height) / 2;
1463c1506
< 		int y = r.top + WD_MATRIX_TOP;
---
> 		int y = r.top;
1470c1513
< 				GfxFillRect(r.left + 1, y - 2, r.right - 1, y + FONT_HEIGHT_NORMAL, PC_GREY); // show highlighted item with a different colour
---
> 				GfxFillRect(r.left + 1, y + 1, r.right - 1, y + this->resize.step_height - 1, PC_GREY); // show highlighted item with a different colour
1473c1516
< 			DrawString(text_left, text_right, y, this->company_info[company].company_name, TC_BLACK);
---
> 			DrawString(text_left, text_right, y + text_offset, this->company_info[company].company_name, TC_BLACK);
1699a1743,1750
> static void ClientList_Watch(const NetworkClientInfo *ci)
> {
> 	if (ci != NULL){
> 		CompanyID cid = (CompanyID)ci->client_id;
> 		ShowWatchWindow(cid, 1);
> 	}
> }
> 
1773a1825,1827
> 		if (_network_own_client_id != ci->client_id && ci->client_id != CLIENT_ID_SERVER && _novarole) {
> 			this->AddAction(STR_XI_WATCH, &ClientList_Watch);
> 		}
1917,1918c1971,1974
< 
< 		size->width = WD_FRAMERECT_LEFT + this->server_client_width + this->icon_size.width + WD_FRAMERECT_LEFT + width + WD_FRAMERECT_RIGHT;
---
> 		SetDParam(0, 0xFFFF);
> 		SetDParam(1, INVALID_COMPANY);
> 		uint width2 = GetStringBoundingBox(STR_NETWORK_CLIENT_EXTRA).width;
> 		size->width = WD_FRAMERECT_LEFT + this->server_client_width + this->icon_size.width + WD_FRAMERECT_LEFT + width + WD_FRAMERECT_RIGHT + width2;
1968a2025,2029
> 
> 			uint extra = GetStringBoundingBox(ci->client_name).width + 15;
> 			SetDParam(0, ci->client_id);
> 			SetDParam(1, ci->client_playas == INVALID_COMPANY ? ci->client_playas : ci->client_playas + 1);
> 			DrawString(rtl ? left : name_left + extra, rtl ? name_right - extra : right, y + text_offset, STR_NETWORK_CLIENT_EXTRA, TC_FROMSTRING, SA_RIGHT);
diff -r -B -X .diff-exclude vanilla/src/newgrf_debug_gui.cpp cmclient/src/newgrf_debug_gui.cpp
44a45,46
> #include "citymania/cm_hotkeys.hpp"
> 
459a462
> 		this->DrawString(r, i++, "Industry type: %d", (int)((const Industry *)base)->type);
859,865c862,872
< 		if (widget != WID_SA_LIST) return;
< 
< 		resize->height = max(11, FONT_HEIGHT_NORMAL + 1);
< 		resize->width  = 1;
< 
< 		/* Resize to about 200 pixels (for the preview) */
< 		size->height = (1 + 200 / resize->height) * resize->height;
---
> 		switch (widget) {
> 			case WID_SA_SPRITE:
> 				size->height = ScaleGUITrad(200);
> 				break;
> 			case WID_SA_LIST:
> 				resize->height = max(11, FONT_HEIGHT_NORMAL + 1);
> 				resize->width  = 1;
> 				break;
> 			default:
> 				break;
> 		}
974,977c981,984
< 					case WID_SA_UP:    spr->y_offs -= _ctrl_pressed ? 8 : 1; break;
< 					case WID_SA_DOWN:  spr->y_offs += _ctrl_pressed ? 8 : 1; break;
< 					case WID_SA_LEFT:  spr->x_offs -= _ctrl_pressed ? 8 : 1; break;
< 					case WID_SA_RIGHT: spr->x_offs += _ctrl_pressed ? 8 : 1; break;
---
> 					case WID_SA_UP:    spr->y_offs -= citymania::_fn_mod ? 8 : 1; break;
> 					case WID_SA_DOWN:  spr->y_offs += citymania::_fn_mod ? 8 : 1; break;
> 					case WID_SA_LEFT:  spr->x_offs -= citymania::_fn_mod ? 8 : 1; break;
> 					case WID_SA_RIGHT: spr->x_offs += citymania::_fn_mod ? 8 : 1; break;
Only in cmclient/src: newgrf_revisions.hpp
diff -r -B -X .diff-exclude vanilla/src/newgrf_spritegroup.cpp cmclient/src/newgrf_spritegroup.cpp
180,183c180,184
< 		case DSGA_OP_SDIV: return value == 0 ? (S)last_value : (S)last_value / (S)value;
< 		case DSGA_OP_SMOD: return value == 0 ? (S)last_value : (S)last_value % (S)value;
< 		case DSGA_OP_UDIV: return value == 0 ? (U)last_value : (U)last_value / (U)value;
< 		case DSGA_OP_UMOD: return value == 0 ? (U)last_value : (U)last_value % (U)value;
---
> 		// replaced ?: with if to avoid VS2015U3 optimizator bug
> 		case DSGA_OP_SDIV: if (value == 0) return (S)last_value; else return (S)last_value / (S)value;
> 		case DSGA_OP_SMOD: if (value == 0) return (S)last_value; else return (S)last_value % (S)value;
> 		case DSGA_OP_UDIV: if (value == 0) return (U)last_value; else return (U)last_value / (U)value;
> 		case DSGA_OP_UMOD: if (value == 0) return (U)last_value; else return (U)last_value % (U)value;
diff -r -B -X .diff-exclude vanilla/src/news_gui.cpp cmclient/src/news_gui.cpp
41a42,43
> #include "citymania/cm_hotkeys.hpp"
> 
509c511
< 					if (_ctrl_pressed) {
---
> 					if (citymania::_fn_mod) {
522,531d523
< 	EventState OnKeyPress(WChar key, uint16 keycode) override
< 	{
< 		if (keycode == WKC_SPACE) {
< 			/* Don't continue. */
< 			delete this;
< 			return ES_HANDLED;
< 		}
< 		return ES_NOT_HANDLED;
< 	}
< 
1033a1025,1035
> }
> 
> /**
>   * Close active news message window
>   * @return true if a window was closed.
>   */
> bool HideActiveNewsMessage() {
> 	NewsWindow *w = (NewsWindow*)FindWindowById(WC_NEWS_WINDOW, 0);
> 	if (w == nullptr) return false;
> 	delete w;
> 	return true;
diff -r -B -X .diff-exclude vanilla/src/news_gui.h cmclient/src/news_gui.h
16a17
> bool HideActiveNewsMessage();
diff -r -B -X .diff-exclude vanilla/src/openttd.cpp cmclient/src/openttd.cpp
70a71,73
> #include "citymania/cm_highlight.hpp"
> #include "citymania/cm_main.hpp"
> 
330a334,335
> 	citymania::ResetGame();
> 
341a347
> 	_pause_countdown = 0;
963a970
> 	citymania::InitializeZoningMap();
979a987
> 	citymania::InitializeZoningMap();
1044a1053
> 	citymania::SwitchToMode(new_mode);
1444a1454,1458
> 	}
> 
> 	if (_pause_countdown > 0 && --_pause_countdown == 0) {
> 		_pause_mode = PM_PAUSED_NORMAL;
> 		SetWindowDirty(WC_MAIN_TOOLBAR, 0);
diff -r -B -X .diff-exclude vanilla/src/openttd.h cmclient/src/openttd.h
70a71
> extern uint32 _pause_countdown;
diff -r -B -X .diff-exclude vanilla/src/order_cmd.cpp cmclient/src/order_cmd.cpp
1773a1774
> 							_settings_client.gui.runway_too_short_warn &&
diff -r -B -X .diff-exclude vanilla/src/order_gui.cpp cmclient/src/order_gui.cpp
3c3
<  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
---
>  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version  error:141A318A:SSL routines:tls_process_ske_dhe:dh key too smal.
33a34,35
> #include "citymania/cm_hotkeys.hpp"
> 
173a176,251
> enum class FeederOrderMod{
> 	NONE,
> 	LOAD,
> 	UNLOAD
> };
> 
> struct OrdersFromSettings {
> 	OrderLoadFlags load;
> 	OrderUnloadFlags unload;
> 	FeederOrderMod mod;
> };
> 
> enum  GetOrderFromSettingsTypes {
> 	GOFS_NONE = 0,
> 	GOFS_FULL,
> 	GOFS_XFER,
> 	GOFS_UNLOAD,
> 	GOFS_FEEDLOAD,
> 	GOFS_FEEDUNLOAD,
> 	GOFS_NOLOAD
> };
> 
> #define GOFSFEEDER_ORDERMOD_RESET gofsfeeder_ordermod = GOFS_FEEDER_NULL
> 
> 
> /* fetch and compute orders set from settings */
> 
> static OrdersFromSettings GetOrdersFromSettings(const Vehicle *v, uint8 setting)
> {
> 	OrdersFromSettings res = {
> 		OLF_LOAD_IF_POSSIBLE,
> 		OUF_UNLOAD_IF_POSSIBLE,
> 		FeederOrderMod::NONE
> 	};
> 
> 	switch(setting) {
> 
> 	case GOFS_FEEDLOAD:
> 		if (v->GetNumOrders() > 0) res.mod = FeederOrderMod::LOAD;
> 		res.unload = OUFB_NO_UNLOAD;
> 		res.load = OLF_FULL_LOAD_ANY;
> 		break;
> 	case GOFS_FULL:
> 		res.load = OLF_FULL_LOAD_ANY;
> 		break;
> 
> 	case GOFS_UNLOAD:
> 		res.unload = OUFB_UNLOAD;
> 		if (_settings_client.gui.auto_noload_on_unloadall)
> 			res.load = OLFB_NO_LOAD;
> 		break;
> 
> 	case GOFS_FEEDUNLOAD:
> 		if (v->GetNumOrders() > 0) res.mod = FeederOrderMod::UNLOAD;
> 		res.unload = OUFB_TRANSFER;
> 		res.load = OLFB_NO_LOAD;
> 		break;
> 
> 	case GOFS_XFER:
> 		res.unload = OUFB_TRANSFER;
> 		if (_settings_client.gui.auto_noload_on_transfer)
> 			res.load = OLFB_NO_LOAD;
> 		break;
> 
> 	case GOFS_NOLOAD:
> 		res.load = OLFB_NO_LOAD;
> 		break;
> 
> 	case GOFS_NONE:
> 		break;
> 
> 	default: NOT_REACHED();
> 	}
> 	return res;
> }
> 
348a427,439
> 
> 	uint order_dist_sq = 0;
> 	uint order_dist_mh = 0;
> 	const Order *next2 = order->next != NULL ? order->next : v->GetFirstOrder();
> 	TileIndex prev_tile = order->GetLocation(v, true);
> 	TileIndex cur_tile = next2->GetLocation(v, true);
> 	if (prev_tile != INVALID_TILE && cur_tile != INVALID_TILE){
> 		order_dist_sq = IntSqrt(DistanceSquare(prev_tile, cur_tile));
> 		order_dist_mh = DistanceManhattan(prev_tile, cur_tile);
> 	}
> 	SetDParam(0, order_dist_sq);
> 	SetDParam(1, order_dist_mh);
> 	DrawString(middle, right, y, STR_ORDER_DIST, TC_WHITE, SA_RIGHT);
357c448
< static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
---
> static std::pair<Order, FeederOrderMod> GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
371c462
< 		if (_ctrl_pressed) order.SetDepotOrderType((OrderDepotTypeFlags)(order.GetDepotOrderType() ^ ODTFB_SERVICE));
---
> 		if (citymania::_fn_mod) order.SetDepotOrderType((OrderDepotTypeFlags)(order.GetDepotOrderType() ^ ODTFB_SERVICE));
373c464
< 		return order;
---
> 		return std::make_pair(order, FeederOrderMod::NONE);
381,382c472,473
< 		if (_settings_client.gui.new_nonstop != _ctrl_pressed) order.SetNonStopType(ONSF_NO_STOP_AT_ANY_STATION);
< 		return order;
---
> 		if (_settings_client.gui.new_nonstop != citymania::_fn_mod) order.SetNonStopType(ONSF_NO_STOP_AT_ANY_STATION);
> 		return std::make_pair(order, FeederOrderMod::NONE);
388c479
< 		return order;
---
> 		return std::make_pair(order, FeederOrderMod::NONE);
412c503,531
< 				if (_ctrl_pressed) order.SetLoadType(OLF_FULL_LOAD_ANY);
---
> 
> 				uint8 os = 0xff;
> 				if (_ctrl_pressed) {
> 					if (_shift_pressed)
> 						os = _settings_client.gui.goto_shortcuts_ctrlshift_lclick;
> 					else if (_alt_pressed)
> 						os = _settings_client.gui.goto_shortcuts_altctrl_lclick;
> 					else
> 						os = _settings_client.gui.goto_shortcuts_ctrl_lclick;
> 				}
> 				else if (_shift_pressed) {
> 					if (_alt_pressed)
> 						os = _settings_client.gui.goto_shortcuts_altshift_lclick;
> 					else
> 						os = _settings_client.gui.goto_shortcuts_shift_lclick;
> 				}
> 				else if (_alt_pressed)
> 					os = _settings_client.gui.goto_shortcuts_alt_lclick;
> 
> 				auto feeder_mod = FeederOrderMod::NONE;
> 				if (os != 0xff) {
> 					auto ofs = GetOrdersFromSettings(v, os);
> 					if (ofs.load != (enum OrderLoadFlags)-1)
> 						order.SetLoadType(ofs.load);
> 					if (ofs.unload != (enum OrderUnloadFlags)-1)
> 					order.SetUnloadType(ofs.unload);
> 					feeder_mod = ofs.mod;
> 				}
> 
415c534
< 				return order;
---
> 				return std::make_pair(order, feeder_mod);
422c541
< 	return order;
---
> 	return std::make_pair(order, FeederOrderMod::NONE);
437a557
> 	OHK_CLOSE,
645a766,772
> 		bool set_no_load = false;
> 		if (unload_type == OUFB_TRANSFER){
> 			set_no_load = _settings_client.gui.auto_noload_on_transfer;
> 		}
> 		else if (unload_type == OUFB_UNLOAD){
> 			set_no_load = _settings_client.gui.auto_noload_on_unloadall;
> 		}
647c774
< 		if (unload_type == OUFB_TRANSFER) {
---
> 		if (set_no_load) {
698c825
< 		if (_ctrl_pressed && this->vehicle->cur_implicit_order_index == this->OrderGetSel()) return;
---
> 		if (citymania::_fn_mod && this->vehicle->cur_implicit_order_index == this->OrderGetSel()) return;
701,702c828,829
< 		DoCommandP(this->vehicle->tile, this->vehicle->index, _ctrl_pressed ? this->OrderGetSel() : ((this->vehicle->cur_implicit_order_index + 1) % this->vehicle->GetNumOrders()),
< 				CMD_SKIP_TO_ORDER | CMD_MSG(_ctrl_pressed ? STR_ERROR_CAN_T_SKIP_TO_ORDER : STR_ERROR_CAN_T_SKIP_ORDER));
---
> 		DoCommandP(this->vehicle->tile, this->vehicle->index, citymania::_fn_mod ? this->OrderGetSel() : ((this->vehicle->cur_implicit_order_index + 1) % this->vehicle->GetNumOrders()),
> 				CMD_SKIP_TO_ORDER | CMD_MSG(citymania::_fn_mod ? STR_ERROR_CAN_T_SKIP_TO_ORDER : STR_ERROR_CAN_T_SKIP_ORDER));
730c857
< 		if (_ctrl_pressed) {
---
> 		if (citymania::_fn_mod) {
751c878
< 		if (_ctrl_pressed) {
---
> 		if (citymania::_fn_mod) {
1187c1314
< 				if (_ctrl_pressed && sel < this->vehicle->GetNumOrders()) {
---
> 				if (citymania::_fn_mod && sel < this->vehicle->GetNumOrders()) {
1433a1561,1565
> 		if(hotkey == OHK_GOTO && this->goto_type != OPOS_NONE){
> 			this->RaiseWidget(WID_O_GOTO);
> 			ResetObjectToPlace();
> 			return ES_NOT_HANDLED;
> 		}
1446a1579
> 			case OHK_CLOSE:          delete this; break;
1455c1588,1591
< 			const Order cmd = GetOrderCmdFromTile(this->vehicle, tile);
---
> 			auto cmd_pair = GetOrderCmdFromTile(this->vehicle, tile);
> 			auto cmd = cmd_pair.first;
> 			auto feeder_mod = cmd_pair.second;
> 
1458c1594,1607
< 			if (DoCommandP(this->vehicle->tile, this->vehicle->index + (this->OrderGetSel() << 20), cmd.Pack(), CMD_INSERT_ORDER | CMD_MSG(STR_ERROR_CAN_T_INSERT_NEW_ORDER))) {
---
> 			if (feeder_mod != FeederOrderMod::NONE) {
> 				if (feeder_mod == FeederOrderMod::LOAD) {
> 					if (DoCommandP(this->vehicle->tile, this->vehicle->index + (1 << 20), cmd.Pack(), CMD_INSERT_ORDER | CMD_NO_ESTIMATE | CMD_MSG(STR_ERROR_CAN_T_INSERT_NEW_ORDER))) {
> 						DoCommandP(this->vehicle->tile, this->vehicle->index,  0, CMD_DELETE_ORDER |  CMD_NO_ESTIMATE | CMD_MSG(STR_ERROR_CAN_T_DELETE_THIS_ORDER));
> 					}
> 
> 				}
> 				else if (feeder_mod == FeederOrderMod::UNLOAD) { // still flushes the whole order table
> 					if (DoCommandP(this->vehicle->tile, this->vehicle->index + ((uint32)(this->vehicle->GetNumOrders()) << 20), cmd.Pack(), CMD_INSERT_ORDER | CMD_NO_ESTIMATE | CMD_MSG(STR_ERROR_CAN_T_INSERT_NEW_ORDER))) {
> 						DoCommandP(this->vehicle->tile, this->vehicle->index, (this->vehicle->GetNumOrders()-2+(int)_networking) , CMD_DELETE_ORDER | CMD_NO_ESTIMATE | CMD_MSG(STR_ERROR_CAN_T_DELETE_THIS_ORDER));
> 					}
> 				}
> 			}
> 			else if (DoCommandP(this->vehicle->tile, this->vehicle->index + (this->OrderGetSel() << 20), cmd.Pack(), CMD_INSERT_ORDER |  CMD_NO_ESTIMATE | CMD_MSG(STR_ERROR_CAN_T_INSERT_NEW_ORDER))) {
1472c1621
< 		bool share_order = _ctrl_pressed || this->goto_type == OPOS_SHARE;
---
> 		bool share_order = citymania::_fn_mod || this->goto_type == OPOS_SHARE;
1535a1685
> 	Hotkey('Q', "close", OHK_CLOSE),
diff -r -B -X .diff-exclude vanilla/src/os/macosx/osx_stdafx.h cmclient/src/os/macosx/osx_stdafx.h
85a86
> #include <string>
Only in cmclient/src/os/windows: ottdres.rc
diff -r -B -X .diff-exclude vanilla/src/rail_cmd.cpp cmclient/src/rail_cmd.cpp
45a46,47
> uint8 _sorted_railtypes_size;
> TileIndex _rail_track_endtile; ///< The end of a rail track; as hidden return from the rail build/remove command for GUI purposes.
448a451,452
> 	_rail_track_endtile = INVALID_TILE;
> 
465c469,472
< 			if (ret.Failed()) return ret;
---
> 			if (ret.Failed()) {
> 				if (ret.GetErrorMessage() == STR_ERROR_ALREADY_BUILT) _rail_track_endtile = tile;
> 				return ret;
> 			}
562a570
> 				_rail_track_endtile = tile;
604a613
> 	_rail_track_endtile = tile;
622a632,633
> 	_rail_track_endtile = INVALID_TILE;
> 
751a763
> 	_rail_track_endtile = tile;
884a897,898
> 	_rail_track_endtile = INVALID_TILE;
> 
895a910
> 		TileIndex last_endtile = _rail_track_endtile;
899a915
> 			if (_rail_track_endtile == INVALID_TILE) _rail_track_endtile = last_endtile;
diff -r -B -X .diff-exclude vanilla/src/rail_gui.cpp cmclient/src/rail_gui.cpp
40a41,43
> #include "citymania/cm_hotkeys.hpp"
> #include "citymania/cm_station_gui.hpp"
> 
44c47
< static RailType _cur_railtype;               ///< Rail type of the current build-rail toolbar.
---
> RailType _cur_railtype;               ///< Rail type of the current build-rail toolbar.
46c49,50
< static DiagDirection _build_depot_direction; ///< Currently selected depot direction
---
> static bool _cm_invert_remove;                  ///< Invert remove mode on tools (when fn-clicked)
> /* CM  static */ DiagDirection _build_depot_direction; ///< Currently selected depot direction
52a57,58
> extern TileIndex _rail_track_endtile; // rail_cmd.cpp
> 
55a62,67
> static const int HOTKEY_MASK        = 0x1000;
> static const int HOTKEY_POLYRAIL     = 0x1000;
> static const int HOTKEY_NEW_POLYRAIL = 0x1001;
> static const int HOTKEY_BUILD_STATION_SIZED = 0x1010;     ///< Build a station in fixed size mode.
> static const int HOTKEY_BUILD_STATION_DRAGDROP = 0x1011;  ///< Build a station in dragdrop mode.
> 
64c76
< static RailStationGUISettings _railstation; ///< Settings of the station builder GUI
---
> RailStationGUISettings _railstation; ///< Settings of the station builder GUI
92c104
< static void GenericPlaceRail(TileIndex tile, int cmd)
---
> static CommandContainer GenericPlaceRailCmd(TileIndex tile, Track track)
94,98c106,117
< 	DoCommandP(tile, _cur_railtype, cmd,
< 			_remove_button_clicked ?
< 			CMD_REMOVE_SINGLE_RAIL | CMD_MSG(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK) :
< 			CMD_BUILD_SINGLE_RAIL | CMD_MSG(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK),
< 			CcPlaySound_SPLAT_RAIL);
---
> 	CommandContainer ret = {
> 		tile,          // tile
> 		_cur_railtype, // p1
> 		track,         // p2
> 		_remove_button_clicked ?
> 				CMD_REMOVE_SINGLE_RAIL | CMD_MSG(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK) :
> 				CMD_BUILD_SINGLE_RAIL | CMD_MSG(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK), // cmd
> 		CcPlaySound_SPLAT_RAIL, // callback
> 		""             // text
> 	};
> 
> 	return ret;
193c212,216
< 		uint32 p1 = _cur_railtype | _railstation.orientation << 6 | _settings_client.gui.station_numtracks << 8 | _settings_client.gui.station_platlength << 16 | _ctrl_pressed << 24;
---
> 		if (_settings_client.gui.cm_use_improved_station_join) {
> 			citymania::PlaceRail_Station(tile);
> 			return;
> 		}
> 		uint32 p1 = _cur_railtype | _railstation.orientation << 6 | _settings_client.gui.station_numtracks << 8 | _settings_client.gui.station_platlength << 16 | citymania::_fn_mod << 24;
237c260
< 			SB(p1, 3, 1, _ctrl_pressed);
---
> 			SB(p1, 3, 1, citymania::_fn_mod);
243c266
< 			SB(p1, 3, 1, _ctrl_pressed);
---
> 			SB(p1, 3, 1, citymania::_fn_mod);
277a301
> 		StoreRailPlacementEndpoints(tile, _build_tunnel_endtile, TileX(tile) == TileX(_build_tunnel_endtile) ? TRACK_Y : TRACK_X, false);
307c331
< 		if ((i <= WID_RAT_AUTORAIL || i >= WID_RAT_BUILD_WAYPOINT) && w->IsWidgetLowered(i)) {
---
> 		if ((i <= WID_RAT_POLYRAIL || i >= WID_RAT_BUILD_WAYPOINT) && w->IsWidgetLowered(i)) {
351c375
< static void DoRailroadTrack(int mode)
---
> static CommandContainer DoRailroadTrackCmd(TileIndex start_tile, TileIndex end_tile, Track track)
353,357c377,388
< 	DoCommandP(TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), _cur_railtype | (mode << 6),
< 			_remove_button_clicked ?
< 			CMD_REMOVE_RAILROAD_TRACK | CMD_MSG(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK) :
< 			CMD_BUILD_RAILROAD_TRACK  | CMD_MSG(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK),
< 			CcPlaySound_SPLAT_RAIL);
---
> 	CommandContainer ret = {
> 		start_tile,                             // tile
> 		end_tile,                               // p1
> 		(uint32)(_cur_railtype | (track << 6)), // p2
> 		_remove_button_clicked ?
> 				CMD_REMOVE_RAILROAD_TRACK | CMD_MSG(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK) :
> 				CMD_BUILD_RAILROAD_TRACK  | CMD_MSG(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK), // cmd
> 		CcPlaySound_SPLAT_RAIL,                 // callback
> 		""                                      // text
> 	};
> 
> 	return ret;
362,366c393,415
< 	int trackstat = _thd.drawstyle & HT_DIR_MASK; // 0..5
< 
< 	if (_thd.drawstyle & HT_RAIL) { // one tile case
< 		GenericPlaceRail(TileVirtXY(_thd.selend.x, _thd.selend.y), trackstat);
< 		return;
---
> 	Track track = (Track)(_thd.drawstyle & HT_DIR_MASK); // 0..5
> 	TileIndex start_tile = TileVirtXY(_thd.selstart.x, _thd.selstart.y);
> 	TileIndex end_tile = TileVirtXY(_thd.selend.x, _thd.selend.y);
> 
> 	CommandContainer cmd = (_thd.drawstyle & HT_RAIL) ?
> 			GenericPlaceRailCmd(end_tile, track) : // one tile case
> 			DoRailroadTrackCmd(start_tile, end_tile, track); // multitile selection
> 
> 	/* When overbuilding existing tracks in polyline mode we want to move the
> 	 * snap point over the last overbuilt track piece. In such case we don't
> 	 * wan't to show any errors to the user. Don't execute the command right
> 	 * away, first check if overbuilding. */
> 	if (citymania::_estimate_mod || !(_thd.place_mode & HT_POLY) ||
> 			DoCommand(&cmd, DC_AUTO | DC_NO_WATER).GetErrorMessage() != STR_ERROR_ALREADY_BUILT ||
> 			_rail_track_endtile == INVALID_TILE) {
> 		/* Execute. */
> 		if (!DoCommandP(&cmd)) return;
> 	}
> 
> 	/* Save new snap points for the polyline tool, no matter if the command
> 	 * succeeded, the snapping will be extended over overbuilt track pieces. */
> 	if (!citymania::_estimate_mod && _rail_track_endtile != INVALID_TILE) {
> 		StoreRailPlacementEndpoints(start_tile, _rail_track_endtile, track, true);
368,369d416
< 
< 	DoRailroadTrack(trackstat);
393c440
< 		SB(p2,  6, 1, _ctrl_pressed);
---
> 		SB(p2,  6, 1, citymania::_fn_mod);
400c447
< 		SB(p2,  6, 1, _ctrl_pressed);
---
> 		SB(p2,  6, 1, citymania::_fn_mod);
415a463,529
> // FIXME duplicate from road_gui.cpp
> static DiagDirection TileFractCoordsToDiagDir() {
> 	bool diag = (_tile_fract_coords.x + _tile_fract_coords.y) < 16;
> 	if (_tile_fract_coords.x < _tile_fract_coords.y) {
> 		return diag ? DIAGDIR_NE : DIAGDIR_SE;
> 	}
> 	return diag ? DIAGDIR_NW : DIAGDIR_SW;
> }
> 
> // FIXME duplicate from road_gui.cpp
> static DiagDirection RoadBitsToDiagDir(RoadBits bits) {
> 	if (bits < ROAD_SE) {
> 		return bits == ROAD_NW ? DIAGDIR_NW : DIAGDIR_SW;
> 	}
> 	return bits == ROAD_SE ? DIAGDIR_SE : DIAGDIR_NE;
> }
> 
> RoadBits FindRailsToConnect(TileIndex tile) {
> 	RoadBits directed = ROAD_NONE;
> 	RoadBits passing = ROAD_NONE;
> 	DiagDirection ddir;
> 	for (ddir = DIAGDIR_BEGIN; ddir < DIAGDIR_END; ddir++) {
> 		TileIndex cur_tile = TileAddByDiagDir(tile, ddir);
> 		if (HasStationTileRail(cur_tile)) {
> 			if (GetRailStationTrackBits(cur_tile) & DiagdirReachesTracks(ddir)) {
> 				directed |= DiagDirToRoadBits(ddir);
> 			}
> 			continue;
> 		}
> 		if (!IsTileType(cur_tile, MP_RAILWAY)) continue;
> 		if (!IsPlainRail(cur_tile)) continue;
> 		passing |= DiagDirToRoadBits(ddir);
> 		if (GetTrackBits(cur_tile) & DiagdirReachesTracks(ddir)) {
> 			directed |= DiagDirToRoadBits(ddir);
> 		}
> 	}
> 	// Prioritize track bits that head in this direction
> 	if (directed != ROAD_NONE) {
> 		return directed;
> 	}
> 	return passing;
> }
> 
> /*
>  * Selects orientation for rail object (depot)
>  */
> DiagDirection AutodetectRailObjectDirection(TileIndex tile) {
> 	RoadBits bits = FindRailsToConnect(tile);
> 	// FIXME after this point repeats road autodetection
> 	if (HasExactlyOneBit(bits)) return RoadBitsToDiagDir(bits);
> 	if (bits == ROAD_NONE) bits = ROAD_ALL;
> 	RoadBits frac_bits = DiagDirToRoadBits(TileFractCoordsToDiagDir());
> 	if (HasExactlyOneBit(frac_bits & bits)) {
> 		return RoadBitsToDiagDir(frac_bits & bits);
> 	}
> 	frac_bits |= MirrorRoadBits(frac_bits);
> 	if (HasExactlyOneBit(frac_bits & bits)) {
> 		return RoadBitsToDiagDir(frac_bits & bits);
> 	}
> 	for (DiagDirection ddir = DIAGDIR_BEGIN; ddir < DIAGDIR_END; ddir++) {
> 		if (DiagDirToRoadBits(ddir) & bits) {
> 			return ddir;
> 		}
> 	}
> 	NOT_REACHED();
> }
> 
463a578
> 		this->GetWidget<NWidgetCore>(WID_RAT_POLYRAIL)->widget_data     = rti->gui_sprites.auto_rail;
491a607
> 			case WID_RAT_POLYRAIL:
522a639,647
> 	virtual void DrawWidget(const Rect &r, int widget) const
> 	{
> 		if (widget == WID_RAT_POLYRAIL) {
> 			Dimension d = GetSpriteSize(SPR_BLOT);
> 			uint offset = this->IsWidgetLowered(WID_RAT_POLYRAIL) ? 1 : 0;
> 			DrawSprite(SPR_BLOT, PALETTE_TO_GREY, (r.left + r.right - d.width) / 2 + offset, (r.top + r.bottom - d.height) / 2 + offset);
> 		}
> 	}
> 
527d651
< 		_remove_button_clicked = false;
553a678,709
> 			case WID_RAT_POLYRAIL: {
> 				bool was_snap = GetRailSnapMode() == RSM_SNAP_TO_RAIL;
> 				bool was_open = this->IsWidgetLowered(WID_RAT_POLYRAIL);
> 				bool do_snap;
> 				bool do_open;
> 				/* "polyrail" hotkey     - activate polyline tool in snapping mode, close the tool if snapping mode is already active
> 				 * "new_polyrail" hotkey - activate polyline tool in non-snapping (new line) mode, close the tool if non-snapping mode is already active
> 				 * button ctrl-clicking  - switch between snapping and non-snapping modes, open the tool in non-snapping mode if it is closed
> 				 * button clicking       - open the tool in non-snapping mode, close the tool if it is opened */
> 				if (this->last_user_action == HOTKEY_POLYRAIL) {
> 					do_snap = true;
> 					do_open = !was_open || !was_snap;
> 				} else if (this->last_user_action == HOTKEY_NEW_POLYRAIL) {
> 					do_snap = false;
> 					do_open = !was_open || was_snap;
> 				} else if (citymania::_fn_mod) {
> 					do_snap = !was_open || !was_snap;
> 					do_open = true;
> 				} else {
> 					do_snap = false;
> 					do_open = !was_open;
> 				}
> 				/* close/open the tool */
> 				if (was_open != do_open) HandlePlacePushButton(this, WID_RAT_POLYRAIL, GetRailTypeInfo(railtype)->cursor.autorail, HT_RAIL | HT_POLY);
> 				/* set snapping mode */
> 				if (do_open) SetRailSnapMode(do_snap ? RSM_SNAP_TO_RAIL : RSM_NO_SNAP);
> 
> 				this->last_user_action = WID_RAT_POLYRAIL;
> 				if (was_open == do_open) return; // prevent switching the "remove" button state
> 				break;
> 			}
> 
560c716
< 				if (HandlePlacePushButton(this, WID_RAT_BUILD_DEPOT, GetRailTypeInfo(_cur_railtype)->cursor.depot, HT_RECT)) {
---
> 				if (HandlePlacePushButton(this, WID_RAT_BUILD_DEPOT, GetRailTypeInfo(_cur_railtype)->cursor.depot, HT_RECT | (HighLightStyle)_build_depot_direction)) {
574,577c730,747
< 			case WID_RAT_BUILD_STATION:
< 				if (HandlePlacePushButton(this, WID_RAT_BUILD_STATION, SPR_CURSOR_RAIL_STATION, HT_RECT)) {
< 					ShowStationBuilder(this);
< 					this->last_user_action = widget;
---
> 			case WID_RAT_BUILD_STATION: {
> 				bool dragdrop = (this->last_user_action == HOTKEY_BUILD_STATION_DRAGDROP);
> 
> 				if (dragdrop || this->last_user_action == HOTKEY_BUILD_STATION_SIZED) { /* hotkey */
> 					bool was_open = this->IsWidgetLowered(WID_RAT_BUILD_STATION);
> 					/* close the tool explicitly so it can be re-opened in different snapping mode */
> 					if (was_open) ResetObjectToPlace();
> 					if (!was_open || dragdrop != _settings_client.gui.station_dragdrop) {
> 						_settings_client.gui.station_dragdrop = dragdrop;
> 						if (HandlePlacePushButton(this, WID_RAT_BUILD_STATION, SPR_CURSOR_RAIL_STATION, HT_RECT))
> 							ShowStationBuilder(this);
> 					}
> 					this->last_user_action = WID_RAT_BUILD_STATION;
> 				} else { /* button */
> 					if (HandlePlacePushButton(this, WID_RAT_BUILD_STATION, SPR_CURSOR_RAIL_STATION, HT_RECT)) {
> 						ShowStationBuilder(this);
> 						this->last_user_action = WID_RAT_BUILD_STATION;
> 					}
579a750
> 			}
584c755
< 				if (started && _settings_client.gui.enable_signal_gui != _ctrl_pressed) {
---
> 				if (started && _settings_client.gui.enable_signal_gui != citymania::_fn_mod) {
601c772,773
< 				BuildRailClick_Remove(this);
---
> 				_remove_button_clicked = citymania::RailToolbar_RemoveModChanged(this, _cm_invert_remove, _remove_button_clicked, true);
> 				// BuildRailClick_Remove(this);
611,612c783,792
< 		this->UpdateRemoveWidgetStatus(widget);
< 		if (_ctrl_pressed) RailToolbar_CtrlChanged(this);
---
> 
> 		bool is_hotkey = (pt.x == 0 && pt.y == 0);
> 		if (widget != WID_RAT_REMOVE) {
> 			_cm_invert_remove = (!is_hotkey && citymania::RailToolbar_IsRemoveInverted(widget));
> 			_remove_button_clicked = _cm_invert_remove;
> 		}
> 
> 		citymania::RailToolbar_UpdateRemoveWidgetStatus(this, widget, _remove_button_clicked);
> 		// this->UpdateRemoveWidgetStatus(widget);
> 		// if (_ctrl_pressed) RailToolbar_CtrlChanged(this);
616a797
> 		// EventState es;
617a799,813
> 
> 		switch (hotkey) {
> 			/* Indicate to the OnClick that the action comes from a hotkey rather
> 			 * then from a click and that the CTRL state should be ignored. */
> 			case HOTKEY_POLYRAIL:
> 			case HOTKEY_NEW_POLYRAIL:
> 				this->last_user_action = hotkey;
> 				return this->Window::OnHotkey(WID_RAT_POLYRAIL);
> 
> 			case HOTKEY_BUILD_STATION_SIZED:
> 			case HOTKEY_BUILD_STATION_DRAGDROP:
> 				this->last_user_action = hotkey;
> 				return this->Window::OnHotkey(WID_RAT_BUILD_STATION);
> 		}
> 
622a819
> 		DiagDirection ddir;
640a838
> 			case WID_RAT_POLYRAIL:
649c847,851
< 				DoCommandP(tile, _cur_railtype, _build_depot_direction,
---
> 				ddir = _build_depot_direction;
> 				if (ddir == DIAGDIR_NW + 1) {
> 					ddir = AutodetectRailObjectDirection(tile);
> 				}
> 				DoCommandP(tile, _cur_railtype, ddir,
651a854,855
> 				if (citymania::_fn_mod == _settings_client.gui.persistent_depottools)
> 					ResetObjectToPlace();
713c917
< 					DoCommandP(end_tile, start_tile, _cur_railtype | (_ctrl_pressed ? 1 << 6 : 0), CMD_CONVERT_RAIL | CMD_MSG(STR_ERROR_CAN_T_CONVERT_RAIL), CcPlaySound_SPLAT_RAIL);
---
> 					DoCommandP(end_tile, start_tile, _cur_railtype | (citymania::_fn_mod ? 1 << 6 : 0), CMD_CONVERT_RAIL | CMD_MSG(STR_ERROR_CAN_T_CONVERT_RAIL), CcPlaySound_SPLAT_RAIL);
721c925
< 							DoCommandP(end_tile, start_tile, _ctrl_pressed ? 0 : 1, CMD_REMOVE_FROM_RAIL_STATION | CMD_MSG(STR_ERROR_CAN_T_REMOVE_PART_OF_STATION), CcPlaySound_SPLAT_RAIL);
---
> 							DoCommandP(end_tile, start_tile, citymania::_fn_mod ? 0 : 1, CMD_REMOVE_FROM_RAIL_STATION | CMD_MSG(STR_ERROR_CAN_T_REMOVE_PART_OF_STATION), CcPlaySound_SPLAT_RAIL);
728c932
< 							DoCommandP(end_tile, start_tile, _ctrl_pressed ? 0 : 1, CMD_REMOVE_FROM_RAIL_WAYPOINT | CMD_MSG(STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT), CcPlaySound_SPLAT_RAIL);
---
> 							DoCommandP(end_tile, start_tile, citymania::_fn_mod ? 0 : 1, CMD_REMOVE_FROM_RAIL_WAYPOINT | CMD_MSG(STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT), CcPlaySound_SPLAT_RAIL);
731c935
< 							uint32 p1 = _cur_railtype | (select_method == VPM_X_LIMITED ? AXIS_X : AXIS_Y) << 6 | ta.w << 8 | ta.h << 16 | _ctrl_pressed << 24;
---
> 							uint32 p1 = _cur_railtype | (select_method == VPM_X_LIMITED ? AXIS_X : AXIS_Y) << 6 | ta.w << 8 | ta.h << 16 | citymania::_fn_mod << 24;
756a961,962
> 
> 		citymania::AbortStationPlacement();
765c971
< 	EventState OnCTRLStateChange() override
---
> 	EventState CM_OnRemoveModStateChange() override
767,768c973,977
< 		/* do not toggle Remove button by Ctrl when placing station */
< 		if (!this->IsWidgetLowered(WID_RAT_BUILD_STATION) && !this->IsWidgetLowered(WID_RAT_BUILD_WAYPOINT) && RailToolbar_CtrlChanged(this)) return ES_HANDLED;
---
> 		auto new_remove = citymania::RailToolbar_RemoveModChanged(this, _cm_invert_remove, _remove_button_clicked, false);
> 		if (new_remove != _remove_button_clicked) {
> 			_remove_button_clicked = new_remove;
> 			return ES_HANDLED;
> 		}
789a999,1000
> const uint16 _railtoolbar_polyrail_keys[] = {'5' | WKC_CTRL, 'A' | WKC_CTRL | WKC_GLOBAL_HOTKEY, 0};
> const uint16 _railtoolbar_new_poly_keys[] = {'5' | WKC_CTRL | WKC_SHIFT, 'A' | WKC_CTRL | WKC_SHIFT | WKC_GLOBAL_HOTKEY, 0};
796a1008,1009
> 	Hotkey(_railtoolbar_polyrail_keys, "polyrail", HOTKEY_POLYRAIL),
> 	Hotkey(_railtoolbar_new_poly_keys, "new_polyrail", HOTKEY_NEW_POLYRAIL),
799a1013,1014
> 	Hotkey((uint16)0, "station_sized", HOTKEY_BUILD_STATION_SIZED),  // has to go before station hotkey to override it
> 	Hotkey((uint16)0, "station_dragdrop", HOTKEY_BUILD_STATION_DRAGDROP),
826a1042,1043
> 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_RAT_POLYRAIL),
> 						SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_AUTORAIL, STR_RAIL_TOOLBAR_TOOLTIP_BUILD_POLYRAIL),
883a1101,1105
> 	if (_settings_client.gui.cm_use_improved_station_join) {
> 		citymania::HandleStationPlacement(start, end);
> 		return;
> 	}
> 
890c1112
< 	uint32 p1 = _cur_railtype | _railstation.orientation << 6 | numtracks << 8 | platlength << 16 | _ctrl_pressed << 24;
---
> 	uint32 p1 = _cur_railtype | _railstation.orientation << 6 | numtracks << 8 | platlength << 16 | citymania::_fn_mod << 24;
1018c1240,1241
< 		if (_settings_client.gui.station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
---
> 		if (_settings_client.gui.cm_use_improved_station_join || _settings_client.gui.station_show_coverage)
> 			SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
1041a1265
> 		top = DrawStationAuthorityText(left, right, top) + WD_PAR_VSEP_NORMAL;
1322a1547
> 				citymania::MarkCoverageHighlightDirty();
1711c1936,1943
< 		if (!IsInsideMM(widget, WID_BRAD_DEPOT_NE, WID_BRAD_DEPOT_NW + 1)) return;
---
> 		switch (widget) {
> 			case WID_BRAD_DEPOT_NE:
> 			case WID_BRAD_DEPOT_SE:
> 			case WID_BRAD_DEPOT_SW:
> 			case WID_BRAD_DEPOT_NW:
> 				size->width  = ScaleGUITrad(64) + 2;
> 				size->height = ScaleGUITrad(48) + 2;
> 				break;
1713,1714c1945,1948
< 		size->width  = ScaleGUITrad(64) + 2;
< 		size->height = ScaleGUITrad(48) + 2;
---
> 			case WID_BRAD_DEPOT_AUTO:
> 				size->width  = ScaleGUITrad(128) + 6;
> 				break;
> 		}
1730a1965
> 			case WID_BRAD_DEPOT_AUTO:
1767a2003,2008
> 		NWidget(NWID_SPACER), SetMinimalSize(0, 2),
> 		NWidget(NWID_HORIZONTAL), SetPIP(2, 2, 2),
> 			NWidget(NWID_SPACER), SetFill(1, 0),
> 			NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BRAD_DEPOT_AUTO), SetMinimalSize(134, 12), SetDataTip(STR_STATION_BUILD_ORIENTATION_AUTO, STR_BUILD_DEPOT_TRAIN_ORIENTATION_AUTO_TOOLTIP),
> 			NWidget(NWID_SPACER), SetFill(1, 0),
> 		EndContainer(),
1888c2129
< 	_build_depot_direction = DIAGDIR_NW;
---
> 	_build_depot_direction = (DiagDirection)(DIAGDIR_NW + 1);
diff -r -B -X .diff-exclude vanilla/src/rev.cpp.in cmclient/src/rev.cpp.in
22c22
< 	return HasBit(_openttd_newgrf_version, 19);
---
>     return HasBit(_openttd_newgrf_version, 19);
38c38
< const char _openttd_revision[] = "!!VERSION!!";
---
> const char _openttd_revision[] = "1.10.3";
51c51
< const char _openttd_revision_hash[] = "!!GITHASH!!";
---
> const char _openttd_revision_hash[] = "baf5bf29fa68c908e7033e58465562d22ec97a07";
56c56
< const char _openttd_revision_year[] = "!!YEAR!!";
---
> const char _openttd_revision_year[] = "2020";
66c66
< const byte _openttd_revision_modified = !!MODIFIED!!;
---
> const byte _openttd_revision_modified = 0;
73c73
< const byte _openttd_revision_tagged = !!ISTAG!!;
---
> const byte _openttd_revision_tagged = 1;
88c88,90
< const uint32 _openttd_newgrf_version = 1 << 28 | 10 << 24 | 0 << 20 | !!ISSTABLETAG!! << 19 | 28004;
---
> const uint32 _openttd_newgrf_version = 1 << 28 | 10 << 24 | 0 << 20 | 1 << 19 | 28004;
> 
> const char _citymania_version[] = "!!VERSION!! !!DATE!!";
diff -r -B -X .diff-exclude vanilla/src/road_cmd.cpp cmclient/src/road_cmd.cpp
953c953
< static bool CanConnectToRoad(TileIndex tile, RoadType rt, DiagDirection dir)
---
> bool CanConnectToRoad(TileIndex tile, RoadType rt, DiagDirection dir)
diff -r -B -X .diff-exclude vanilla/src/road_func.h cmclient/src/road_func.h
161a162,163
> bool CanConnectToRoad(TileIndex tile, RoadType rt, DiagDirection dir);
> 
diff -r -B -X .diff-exclude vanilla/src/road_gui.cpp cmclient/src/road_gui.cpp
11a12
> #include "cmd_helper.h"
12a14
> #include "station_func.h"
29a32
> #include "industry.h"
38a42,44
> #include "citymania/cm_hotkeys.hpp"
> #include "citymania/cm_station_gui.hpp"
> 
67c73
< static DiagDirection _road_station_picker_orientation;
---
> DiagDirection _road_station_picker_orientation;
172a179,279
> 
> static RoadBits FindRoadsToConnect(TileIndex tile) {
> 	RoadBits bits = ROAD_NONE;
> 	DiagDirection ddir;
> 	auto cur_rtt = GetRoadTramType(_cur_roadtype);
> 	// Prioritize roadbits that head in this direction
> 	for (ddir = DIAGDIR_BEGIN; ddir < DIAGDIR_END; ddir++) {
> 		TileIndex cur_tile = TileAddByDiagDir(tile, ddir);
> 		if (GetAnyRoadBits(cur_tile, cur_rtt, true) &
> 			DiagDirToRoadBits(ReverseDiagDir(ddir)))
> 		{
> 			bits |= DiagDirToRoadBits(ddir);
> 		}
> 	}
> 	if (bits != ROAD_NONE) {
> 		return bits;
> 	}
> 	// Try to connect to any road passing by
> 	for (ddir = DIAGDIR_BEGIN; ddir < DIAGDIR_END; ddir++) {
> 		TileIndex cur_tile = TileAddByDiagDir(tile, ddir);
> 		if (GetTileType(cur_tile) == MP_ROAD && HasTileRoadType(cur_tile, cur_rtt) &&
> 				(GetRoadTileType(cur_tile) == ROAD_TILE_NORMAL)) {
> 			bits |= DiagDirToRoadBits(ddir);
> 		}
> 	}
> 	return bits;
> }
> 
> static DiagDirection RoadBitsToDiagDir(RoadBits bits) {
> 	if (bits < ROAD_SE) {
> 		return bits == ROAD_NW ? DIAGDIR_NW : DIAGDIR_SW;
> 	}
> 	return bits == ROAD_SE ? DIAGDIR_SE : DIAGDIR_NE;
> }
> 
> static DiagDirection TileFractCoordsToDiagDir() {
> 	bool diag = (_tile_fract_coords.x + _tile_fract_coords.y) < 16;
> 	if (_tile_fract_coords.x < _tile_fract_coords.y) {
> 		return diag ? DIAGDIR_NE : DIAGDIR_SE;
> 	}
> 	return diag ? DIAGDIR_NW : DIAGDIR_SW;
> }
> /*
>  * Selects orientation for road object (depot, terminal station)
>  */
> DiagDirection AutodetectRoadObjectDirection(TileIndex tile) {
> 	RoadBits bits = FindRoadsToConnect(tile);
> 	if (HasExactlyOneBit(bits)) {
> 		return RoadBitsToDiagDir(bits);
> 	}
> 	if (bits == ROAD_NONE){
> 		bits = ROAD_ALL;
> 	}
> 	RoadBits frac_bits = DiagDirToRoadBits(TileFractCoordsToDiagDir());
> 	if (HasExactlyOneBit(frac_bits & bits)) {
> 		return RoadBitsToDiagDir(frac_bits & bits);
> 	}
> 	frac_bits |= MirrorRoadBits(frac_bits);
> 	if (HasExactlyOneBit(frac_bits & bits)) {
> 		return RoadBitsToDiagDir(frac_bits & bits);
> 	}
> 	for (DiagDirection ddir = DIAGDIR_BEGIN; ddir < DIAGDIR_END; ddir++) {
> 		if (DiagDirToRoadBits(ddir) & bits) {
> 			return ddir;
> 		}
> 	}
> 	NOT_REACHED();
> }
> 
> bool CheckDriveThroughRoadStopDirection(TileArea area, RoadBits r) {
> 	TILE_AREA_LOOP(tile, area) {
> 		if (GetTileType(tile) != MP_ROAD) continue;
> 		if (GetRoadTileType(tile) != ROAD_TILE_NORMAL) continue;
> 		if (GetAllRoadBits(tile) & ~r) return false;
> 	}
> 	return true;
> }
> 
> 
> /*
>  * Automaticaly selects direction to use for road stop.
>  * @param area road stop area
>  * @return selected direction
>  */
> DiagDirection AutodetectDriveThroughRoadStopDirection(TileArea area) {
> 	bool se_suits, ne_suits;
> 
> 	// Check which direction is available
> 	// If both are not use SE, building will fail anyway
> 	se_suits = CheckDriveThroughRoadStopDirection(area, ROAD_Y);
> 	ne_suits = CheckDriveThroughRoadStopDirection(area, ROAD_X);
> 	if (!ne_suits) return DIAGDIR_SE;
> 	if (!se_suits) return DIAGDIR_NE;
> 
> 	// Build station along the longer direction
> 	if (area.w > area.h) return DIAGDIR_NE;
> 	if (area.w < area.h) return DIAGDIR_SE;
> 
> 	return AutodetectRoadObjectDirection(area.tile);
> }
> 
184a292,296
> 	if (_settings_client.gui.cm_use_improved_station_join) {
> 		citymania::PlaceRoadStop(start_tile, end_tile, p2, cmd);
> 		return;
> 	}
> 
186a299
> 	TileArea ta(start_tile, end_tile);
189,190c302,320
< 		SetBit(p2, 1); // It's a drive-through stop.
< 		ddir -= DIAGDIR_END; // Adjust picker result to actual direction.
---
> 		if (ddir < DIAGDIR_END + 2) {
> 			SetBit(p2, 1); // It's a drive-through stop.
> 			ddir -= DIAGDIR_END; // Adjust picker result to actual direction.
> 			// When placed on road autorotate anyway
> 			if (ddir == DIAGDIR_SE) {
> 				if (!CheckDriveThroughRoadStopDirection(ta, ROAD_Y))
> 					ddir = DIAGDIR_NE;
> 			} else {
> 				if (!CheckDriveThroughRoadStopDirection(ta, ROAD_X))
> 					ddir = DIAGDIR_SE;
> 			}
> 		}
> 		else if (ddir == DIAGDIR_END + 2) {
> 			ddir = AutodetectRoadObjectDirection(start_tile);
> 		}
> 		else if (ddir == DIAGDIR_END + 3) {
> 			SetBit(p2, 1); // It's a drive-through stop.
> 			ddir = AutodetectDriveThroughRoadStopDirection(ta);
> 		}
194d323
< 	TileArea ta(start_tile, end_tile);
260c389
< 		if (w->IsWidgetLowered(i)) {
---
> 		if (w->GetWidget<NWidgetCore>(i) && w->IsWidgetLowered(i)) {
413c542
< 		_remove_button_clicked = false;
---
> 		if (widget != WID_ROT_REMOVE) _remove_button_clicked = false;
464c593
< 				SetSelectionRed(false);
---
> 				// CM SetSelectionRed(false);
478c607,608
< 				if (this->IsWidgetDisabled(WID_ROT_REMOVE)) return;
---
> 				_remove_button_clicked = citymania::RoadToolbar_RemoveModChanged(this, _remove_button_clicked, true, RoadTypeIsRoad(this->roadtype));
> 				// if (this->IsWidgetDisabled(WID_ROT_REMOVE)) return;
480,482c610,612
< 				DeleteWindowById(WC_SELECT_STATION, 0);
< 				ToggleRoadButton_Remove(this);
< 				if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
---
> 				// DeleteWindowById(WC_SELECT_STATION, 0);
> 				// ToggleRoadButton_Remove(this);
> 				// if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
492,493c622,624
< 		this->UpdateOptionWidgetStatus((RoadToolbarWidgets)widget);
< 		if (_ctrl_pressed) RoadToolbar_CtrlChanged(this);
---
> 		citymania::RoadToolbar_UpdateOptionWidgetStatus(this, widget, _remove_button_clicked, RoadTypeIsRoad(this->roadtype));
> 		// this->UpdateOptionWidgetStatus((RoadToolbarWidgets)widget);
> 		// if (citymania::_remove_mod) RoadToolbar_CtrlChanged(this);
504c635,636
< 		_remove_button_clicked = this->IsWidgetLowered(WID_ROT_REMOVE);
---
> 		DiagDirection ddir;
> 		// CM _remove_button_clicked = this->IsWidgetLowered(WID_ROT_REMOVE);
531c663,667
< 				DoCommandP(tile, _cur_roadtype << 2 | _road_depot_orientation, 0,
---
> 				ddir = _road_depot_orientation;
> 				if (ddir == DIAGDIR_NW + 1) {
> 					ddir = AutodetectRoadObjectDirection(tile);
> 				}
> 				DoCommandP(tile, _cur_roadtype << 2 | ddir, 0,
532a669,670
> 				if (citymania::_fn_mod == _settings_client.gui.persistent_depottools)
> 					ResetObjectToPlace();
577a716,717
> 
> 		citymania::AbortStationPlacement();
622a763,776
> 	void TryToRemoveExtraRoadBits(TileIndex tile, RoadBits &rb) {
> 		for (DiagDirection dir = DIAGDIR_BEGIN; dir != DIAGDIR_END; dir++) {
> 			RoadBits dir_rb = DiagDirToRoadBits(dir);
> 			if (!(rb & dir_rb)) continue;
> 			if (CanConnectToRoad(tile, _cur_roadtype, dir)) continue;
> 			DoCommandP(tile, tile,
> 			    (dir_rb == ROAD_NW || dir_rb == ROAD_NE ? 0 : 3) |
> 			    (dir_rb & ROAD_X ? 0 : 4) |
> 			    (_cur_roadtype << 3),
> 			    CMD_REMOVE_LONG_ROAD);
> 			rb &= ~dir_rb;
> 		}
> 	}
> 
661c815
< 							DoCommandP(ta.tile, ta.w | ta.h << 8, (_ctrl_pressed << 1) | ROADSTOP_BUS, CMD_REMOVE_ROAD_STOP | CMD_MSG(this->rti->strings.err_remove_station[ROADSTOP_BUS]), CcPlaySound_SPLAT_OTHER);
---
> 							DoCommandP(ta.tile, ta.w | ta.h << 8, (citymania::_fn_mod ? 2 : 0) | ROADSTOP_BUS, CMD_REMOVE_ROAD_STOP | CMD_MSG(this->rti->strings.err_remove_station[ROADSTOP_BUS]), CcPlaySound_SPLAT_OTHER);
663c817
< 							PlaceRoadStop(start_tile, end_tile, _cur_roadtype << 5 | (_ctrl_pressed << 2) | ROADSTOP_BUS, CMD_BUILD_ROAD_STOP | CMD_MSG(this->rti->strings.err_build_station[ROADSTOP_BUS]));
---
> 							PlaceRoadStop(start_tile, end_tile, _cur_roadtype << 5 | (citymania::_fn_mod << 2) | ROADSTOP_BUS, CMD_BUILD_ROAD_STOP | CMD_MSG(this->rti->strings.err_build_station[ROADSTOP_BUS]));
673c827
< 							DoCommandP(ta.tile, ta.w | ta.h << 8, (_ctrl_pressed << 1) | ROADSTOP_TRUCK, CMD_REMOVE_ROAD_STOP | CMD_MSG(this->rti->strings.err_remove_station[ROADSTOP_TRUCK]), CcPlaySound_SPLAT_OTHER);
---
> 							DoCommandP(ta.tile, ta.w | ta.h << 8, (citymania::_fn_mod << 1) | ROADSTOP_TRUCK, CMD_REMOVE_ROAD_STOP | CMD_MSG(this->rti->strings.err_remove_station[ROADSTOP_TRUCK]), CcPlaySound_SPLAT_OTHER);
675c829
< 							PlaceRoadStop(start_tile, end_tile, _cur_roadtype << 5 | (_ctrl_pressed << 2) | ROADSTOP_TRUCK, CMD_BUILD_ROAD_STOP | CMD_MSG(this->rti->strings.err_build_station[ROADSTOP_TRUCK]));
---
> 							PlaceRoadStop(start_tile, end_tile, _cur_roadtype << 5 | (citymania::_fn_mod << 2) | ROADSTOP_TRUCK, CMD_BUILD_ROAD_STOP | CMD_MSG(this->rti->strings.err_build_station[ROADSTOP_TRUCK]));
693c847
< 	EventState OnCTRLStateChange() override
---
> 	EventState CM_OnRemoveModStateChange() override
695c849,853
< 		if (RoadToolbar_CtrlChanged(this)) return ES_HANDLED;
---
> 		auto new_remove = citymania::RoadToolbar_RemoveModChanged(this, _remove_button_clicked, false, RoadTypeIsRoad(this->roadtype));
> 		if (new_remove != _remove_button_clicked) {
> 			_remove_button_clicked = new_remove;
> 			return ES_HANDLED;
> 		}
971c1129
< 			for (int i = WID_BROD_DEPOT_NE; i <= WID_BROD_DEPOT_NW; i++) this->GetWidget<NWidgetCore>(i)->tool_tip = STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP;
---
> 			for (int i = WID_BROD_DEPOT_NE; i <= WID_BROD_DEPOT_AUTO; i++) this->GetWidget<NWidgetCore>(i)->tool_tip = STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP;
979,982c1137,1150
< 		if (!IsInsideMM(widget, WID_BROD_DEPOT_NE, WID_BROD_DEPOT_NW + 1)) return;
< 
< 		size->width  = ScaleGUITrad(64) + 2;
< 		size->height = ScaleGUITrad(48) + 2;
---
> 		switch (widget) {
> 			case WID_BROD_DEPOT_NW:
> 			case WID_BROD_DEPOT_NE:
> 			case WID_BROD_DEPOT_SW:
> 			case WID_BROD_DEPOT_SE:
> 				size->width  = ScaleGUITrad(64) + 2;
> 				size->height = ScaleGUITrad(48) + 2;
> 				break;
> 			case WID_BROD_DEPOT_AUTO:
> 				size->width = ScaleGUITrad(128) + 6;
> 				break;
> 			default:
> 				break;
> 		}
998a1167
> 			case WID_BROD_DEPOT_AUTO:
1037a1207,1212
> 		NWidget(NWID_SPACER), SetMinimalSize(0, 2),
> 		NWidget(NWID_HORIZONTAL), SetPIP(2, 2, 2),
> 			NWidget(NWID_SPACER), SetFill(1, 0),
> 			NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BROD_DEPOT_AUTO), SetMinimalSize(134, 12), SetDataTip(STR_STATION_BUILD_ORIENTATION_AUTO, STR_BUILD_DEPOT_ROAD_ORIENTATION_AUTO_TOOLTIP),
> 			NWidget(NWID_SPACER), SetFill(1, 0),
> 		EndContainer(),
1062a1238,1240
> 		if (RoadTypeIsTram(_cur_roadtype) && _road_station_picker_orientation == (DiagDirection)(DIAGDIR_END + 2)) {
> 			_road_station_picker_orientation = (DiagDirection)(DIAGDIR_END + 3);
> 		}
1066,1067c1244,1251
< 		for (uint i = RoadTypeIsTram(_cur_roadtype) ? WID_BROS_STATION_X : WID_BROS_STATION_NE; i < WID_BROS_LT_OFF; i++) {
< 			this->GetWidget<NWidgetCore>(i)->tool_tip = rti->strings.picker_tooltip[rs];
---
> 		if (RoadTypeIsTram(_cur_roadtype)) {
> 			this->GetWidget<NWidgetCore>(WID_BROS_STATION_X)->tool_tip = rti->strings.picker_tooltip[rs];
> 			this->GetWidget<NWidgetCore>(WID_BROS_STATION_Y)->tool_tip = rti->strings.picker_tooltip[rs];
> 			this->GetWidget<NWidgetCore>(WID_BROS_STATION_XY_AUTO)->tool_tip = rti->strings.picker_tooltip[rs];
> 		} else {
> 			for (uint i = WID_BROS_STATION_NE; i < WID_BROS_LT_OFF; i++) {
> 				this->GetWidget<NWidgetCore>(i)->tool_tip = rti->strings.picker_tooltip[rs];
> 			}
1088c1272,1273
< 		if (_settings_client.gui.station_show_coverage) {
---
> 		SetTileSelectSize(1, 1);
> 		if (_settings_client.gui.cm_use_improved_station_join || _settings_client.gui.station_show_coverage)
1090,1092d1274
< 		} else {
< 			SetTileSelectSize(1, 1);
< 		}
1101a1284
> 		top = DrawStationAuthorityText(back_nwi->pos_x + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, top) + WD_PAR_VSEP_NORMAL;
1112,1115c1295,1316
< 		if (!IsInsideMM(widget, WID_BROS_STATION_NE, WID_BROS_STATION_Y + 1)) return;
< 
< 		size->width  = ScaleGUITrad(64) + 2;
< 		size->height = ScaleGUITrad(48) + 2;
---
> 		switch (widget) {
> 			case WID_BROS_STATION_NE:
> 			case WID_BROS_STATION_SE:
> 			case WID_BROS_STATION_SW:
> 			case WID_BROS_STATION_NW:
> 			case WID_BROS_STATION_X:
> 			case WID_BROS_STATION_Y:
> 				size->width  = ScaleGUITrad(64) + 2;
> 				size->height = ScaleGUITrad(48) + 2;
> 				break;
> 			case WID_BROS_STATION_AUTO:
> 				size->width  = ScaleGUITrad(128) + 6;
> 				break;
> 			case WID_BROS_STATION_XY_AUTO:
> 				if (RoadTypeIsTram(_cur_roadtype))
> 					size->width  = ScaleGUITrad(128) + 6;
> 				else
> 					size->width  = ScaleGUITrad(64) + 2;
> 				break;
> 			default:
> 				break;
> 		}
1134a1336,1337
> 			case WID_BROS_STATION_AUTO:
> 			case WID_BROS_STATION_XY_AUTO:
1150a1354
> 				citymania::MarkCoverageHighlightDirty();
1186a1391,1397
> 		NWidget(NWID_SPACER), SetMinimalSize(0, 2),
> 		NWidget(NWID_HORIZONTAL), SetPIP(0, 2, 0),
> 			NWidget(NWID_SPACER), SetFill(1, 0),
> 			NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BROS_STATION_AUTO), SetMinimalSize(134, 12), SetDataTip(STR_STATION_BUILD_ORIENTATION_AUTO, STR_STATION_BUILD_ORIENTATION_AUTO_TOOLTIP),
> 			NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BROS_STATION_XY_AUTO), SetMinimalSize(66, 12), SetDataTip(STR_STATION_BUILD_ORIENTATION_AUTO, STR_STATION_BUILD_ORIENTATION_AUTO_TOOLTIP),
> 			NWidget(NWID_SPACER), SetFill(1, 0),
> 		EndContainer(),
1224a1436,1441
> 		NWidget(NWID_SPACER), SetMinimalSize(0, 2),
> 		NWidget(NWID_HORIZONTAL), SetPIP(0, 2, 0),
> 			NWidget(NWID_SPACER), SetFill(1, 0),
> 			NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BROS_STATION_XY_AUTO), SetMinimalSize(274, 12), SetDataTip(STR_STATION_BUILD_ORIENTATION_AUTO, STR_STATION_BUILD_ORIENTATION_AUTO_TOOLTIP),
> 			NWidget(NWID_SPACER), SetFill(1, 0),
> 		EndContainer(),
1227c1444
< 			NWidget(WWT_LABEL, COLOUR_DARK_GREEN, WID_BROS_INFO), SetMinimalSize(140, 14), SetDataTip(STR_STATION_BUILD_COVERAGE_AREA_TITLE, STR_NULL),
---
> 			NWidget(WWT_LABEL, COLOUR_DARK_GREEN, WID_BROS_INFO), SetMinimalSize(134, 14), SetDataTip(STR_STATION_BUILD_COVERAGE_AREA_TITLE, STR_NULL),
1256,1257c1473,1474
< 	_road_depot_orientation = DIAGDIR_NW;
< 	_road_station_picker_orientation = DIAGDIR_NW;
---
> 	_road_depot_orientation = (DiagDirection)(DIAGDIR_NW + 1);
> 	_road_station_picker_orientation = (DiagDirection)(DIAGDIR_END + 3);
diff -r -B -X .diff-exclude vanilla/src/roadveh_cmd.cpp cmclient/src/roadveh_cmd.cpp
1633c1633
< 	PerformanceAccumulator framerate(PFE_GL_ROADVEHS);
---
> 	// PerformanceAccumulator framerate(PFE_GL_ROADVEHS);
diff -r -B -X .diff-exclude vanilla/src/saveload/afterload.cpp cmclient/src/saveload/afterload.cpp
59a60,64
> #include "../story_base.h"
> #include "../game/game_text.hpp"
> #include "../table/control_codes.h"
> 
> #include "../citymania/cm_highlight.hpp"
536a542,580
> extern GameStrings *_current_data;
> 
> void AfterLoadFindBTProCBInfo() {
> 	if (_current_data == NULL) return;
> 
> 	char buf[15];
> 	char *p = buf;
> 	int pn;
> 	p += Utf8Encode(p, SCC_ENCODED);
> 	for (uint i = 0; i < _current_data->raw_strings.size(); i++) {
> 		auto ls = _current_data->raw_strings[i].get();
> 		if (!ls) continue;
> 		int string_id = 0;
> 		for (uint j = 0; j < ls->lines.size(); j++) {
> 			auto &s = ls->lines[j];
> 			if (!s.size() || s[0] == ';' || s[0] == '#' || s[0] == ' ' || s[0] == '\0') continue;
> 			if (strncmp(s.c_str(), "STR_TOWN_CLAIMED_CARGOS", strlen("STR_TOWN_CLAIMED_CARGOS")) == 0 ||
> 					strncmp(s.c_str(), "STR_TOWN_CARGOS_NEEDED_CB", strlen("STR_TOWN_CARGOS_NEEDED_CB")) == 0) {
> 				pn = p - buf + seprintf(p, lastof(buf), "%X:", string_id);
> 				bool with_decay = (strncmp(s.c_str(), "STR_TOWN_CLAIMED_CARGOS_DECAY",
> 					strlen("STR_TOWN_CLAIMED_CARGOS_DECAY")) == 0);
> 				for (StoryPageElement *se : StoryPageElement::Iterate()) {
> 					if (!se->text || strncmp(se->text, buf, pn) != 0) continue;
> 					uint req, cargomask, from, decay=0;
> 					if (with_decay) {
> 						sscanf(se->text + pn, "%X:%X:%X:%X", &req, &cargomask, &from, &decay);
> 				 	} else {
> 						sscanf(se->text + pn, "%X:%X:%X", &req, &cargomask, &from);
> 					}
> 					uint cargo_id = FindFirstBit(cargomask);
> 					if (!CB_Enabled()) CB_SetCB(true);
> 					CB_SetRequirements(cargo_id, req, from, decay);
> 				}
> 			}
> 			string_id++;
> 		}
> 	}
> }
> 
3149a3194,3198
> 	AfterLoadFindBTProCBInfo();
> 	citymania::InitializeZoningMap();
> 
> 	if ((!_networking || _network_server ) && _settings_client.gui.pause_after_load) _pause_mode = PM_PAUSED_NORMAL;
> 
diff -r -B -X .diff-exclude vanilla/src/saveload/storage_sl.cpp cmclient/src/saveload/storage_sl.cpp
11a12
> #include "../citymania/cm_saveload.hpp"
49c50
< 	{ 'PSAC', Save_PSAC, Load_PSAC, nullptr, nullptr, CH_ARRAY | CH_LAST},
---
> 	{ 'PSAC', citymania::Save_PSAC, citymania::Load_PSAC, nullptr, nullptr, CH_ARRAY | CH_LAST},
diff -r -B -X .diff-exclude vanilla/src/saveload/town_sl.cpp cmclient/src/saveload/town_sl.cpp
20a21,22
> #include "../citymania/cm_main.hpp"
> 
55a58
> 	citymania::Emit(citymania::event::TownCachesRebuilt());
diff -r -B -X .diff-exclude vanilla/src/script/api/game/game_window.hpp.sq cmclient/src/script/api/game/game_window.hpp.sq
941a942
> 	SQGSWindow.DefSQConst(engine, ScriptWindow::WID_RAT_POLYRAIL,                          "WID_RAT_POLYRAIL");
diff -r -B -X .diff-exclude vanilla/src/script/api/script_window.hpp cmclient/src/script/api/script_window.hpp
2047a2048
> 		WID_RAT_POLYRAIL                             = ::WID_RAT_POLYRAIL,                             ///< Polyline rail tool.
diff -r -B -X .diff-exclude vanilla/src/settings.cpp cmclient/src/settings.cpp
2283a2284,2290
> 
> // CM
> #include "statusbar_gui.h"
> static bool cm_v_RedrawStatusBar(int32 p1) {
> 	CM_RedrawStatusBar();
> 	return true;
> }
diff -r -B -X .diff-exclude vanilla/src/settings_gui.cpp cmclient/src/settings_gui.cpp
36a37
> #include "hotkeys.h"
592a594,595
> 
> 	static HotkeyList hotkeys;
678a682,694
> static EventState GameOptionsWindowGlobalHotkeys(int hotkey) {
> 	if (!ToggleFullScreen(!_fullscreen)) {
> 		ShowErrorMessage(STR_ERROR_FULLSCREEN_FAILED, INVALID_STRING_ID, WL_ERROR);
> 	}
> 	return ES_HANDLED;
> }
> 
> static Hotkey game_options_hotkeys[] = {
> 	Hotkey((uint16)0, "toggle_fullscreen", WID_GO_FULLSCREEN_BUTTON),
> 	HOTKEY_LIST_END
> };
> HotkeyList GameOptionsWindow::hotkeys("game_options", game_options_hotkeys, GameOptionsWindowGlobalHotkeys);
> 
683c699,700
< 	_nested_game_options_widgets, lengthof(_nested_game_options_widgets)
---
> 	_nested_game_options_widgets, lengthof(_nested_game_options_widgets),
> 	&GameOptionsWindow::hotkeys
1503a1521
> 			graphics->Add(new SettingEntry("gui.cm_shaded_trees"));
1527a1546,1550
> 				general->Add(new SettingEntry("gui.pause_after_load"));
> 				general->Add(new SettingEntry("gui.cm_fn_mod"));
> 				general->Add(new SettingEntry("gui.cm_remove_mod"));
> 				general->Add(new SettingEntry("gui.cm_estimate_mod"));
> 				general->Add(new SettingEntry("gui.cm_show_apm"));
1549a1573,1578
> 				viewports->Add(new SettingEntry("gui.cb_distance_check"));
> 				viewports->Add(new SettingEntry("gui.old_depot_train_length_calc"));
> 				viewports->Add(new SettingEntry("gui.cm_land_tooltips_for_industries"));
> 				viewports->Add(new SettingEntry("gui.cm_land_tooltips_for_stations"));
> 				viewports->Add(new SettingEntry("gui.cm_land_tooltips_for_houses"));
> 				// viewports->Add(new SettingEntry("gui.polyrail_double_click"));
1556a1586,1588
> 				construction->Add(new SettingEntry("gui.persistent_depottools"));
> 				construction->Add(new SettingEntry("gui.cm_open_vehicle_for_shared_clone"));
> 				construction->Add(new SettingEntry("gui.cm_open_orders_for_new_vehicles"));
1559a1592
> 				construction->Add(new SettingEntry("gui.cm_use_improved_station_join"));
1569a1603,1604
> 			interface->Add(new SettingEntry("gui.powerfund_money"));
> 			interface->Add(new SettingEntry("gui.powerfund_houses"));
1586a1622
> 			advisors->Add(new SettingEntry("gui.runway_too_short_warn"));
1629a1666,1685
> 			/** Vehicle control page */
> 			SettingsPage *veh_control = vehicles->Add(new SettingsPage(STR_CONFIG_SETTING_VEHICLES_CTRL));
> 			{
> 				veh_control->Add(new SettingEntry("gui.enable_ctrl_click_start_stop"));
> 				veh_control->Add(new SettingEntry("gui.new_nonstop"));
> 				veh_control->Add(new SettingEntry("gui.auto_noload_on_transfer"));
> 				veh_control->Add(new SettingEntry("gui.auto_noload_on_unloadall"));
> 			}
> 
> 			/** Order Shorcuts page */
> 			SettingsPage *orders = veh_control->Add(new SettingsPage(STR_CONFIG_SETTING_ORDER_SHORTCUTS));
> 			{
> 				orders->Add(new SettingEntry("gui.goto_shortcuts_ctrl_lclick"));
> 				orders->Add(new SettingEntry("gui.goto_shortcuts_shift_lclick"));
> 				orders->Add(new SettingEntry("gui.goto_shortcuts_ctrlshift_lclick"));
> 				orders->Add(new SettingEntry("gui.goto_shortcuts_alt_lclick"));
> 				orders->Add(new SettingEntry("gui.goto_shortcuts_altshift_lclick"));
> 				orders->Add(new SettingEntry("gui.goto_shortcuts_altctrl_lclick"));
> 			}
> 
diff -r -B -X .diff-exclude vanilla/src/settings_type.h cmclient/src/settings_type.h
22a23,24
> #include "citymania/cm_settings.hpp"
> 
88a91,99
> 	bool   enable_ctrl_click_start_stop;     ///< allow ctrl+click to start or stop vehicles
> 	uint8  goto_shortcuts_ctrl_lclick;       ///< goto action shortcut CTRL+LEFT-CLICK
> 	uint8  goto_shortcuts_shift_lclick;      ///< goto action shortcut SHIFT+LEFT-CLICK
> 	uint8  goto_shortcuts_ctrlshift_lclick;  ///< goto action shortcut CTRL+SHIFT+LEFT-CLICK
> 	uint8  goto_shortcuts_alt_lclick;        ///< goto action shortcut ALT+LEFT-CLICK
> 	uint8  goto_shortcuts_altshift_lclick;   ///< goto action shortcut ALT+SHIFT+LEFT-CLICK
> 	uint8  goto_shortcuts_altctrl_lclick;    ///< goto action shortcut ALT+CTRL+LEFT-CLICK
> 	bool   auto_noload_on_transfer;          ///< automatically set no-loading when ordering to transfer all cargo
> 	bool   auto_noload_on_unloadall;         ///< automatically set no-loading when ordering to unload all cargo
119a131
> 	bool   pause_after_load;                 ///< CM should we pause the game after loading save?
141a154,155
> 	bool   persistent_depottools;            ///< keep the depot building tools active after usage
> 	bool   cm_use_improved_station_join;     ///< use ctrl-clicking station tiles to join instead of popup window
168a183,204
> 	bool   old_depot_train_length_calc;      ///< display vehicle length in whole numbers - old style
> 	uint8  cb_distance_check;                ///< zoning cb distance
> 	bool   polyrail_double_click;            ///< finish polyrail with mouse double click
> 	bool   show_industry_forbidden_tiles;    ///< higlight areas where industry placement is forbidden regardless of terrain
> 	bool   runway_too_short_warn;            ///< warn about aircrafts using too short runways
> 
> 	uint32 powerfund_money;                  ///< minimum amount of money for powerfund to work
> 	uint16 powerfund_houses;                 ///< powerfunding maximum houses limit
> 
> 	bool cm_open_vehicle_for_shared_clone;
> 	bool cm_open_orders_for_new_vehicles;
> 	bool cm_land_tooltips_for_industries;
> 	bool cm_land_tooltips_for_stations;
> 	bool cm_land_tooltips_for_houses;
> 
> 	citymania::ModKey cm_fn_mod;
> 	citymania::ModKey cm_remove_mod;
> 	citymania::ModKey cm_estimate_mod;
> 
> 	uint8 cm_shaded_trees;
> 	bool cm_show_apm;
> 
560a597,598
> 
> 	citymania::Settings  citymania;
diff -r -B -X .diff-exclude vanilla/src/ship_cmd.cpp cmclient/src/ship_cmd.cpp
800c800
< 	PerformanceAccumulator framerate(PFE_GL_SHIPS);
---
> 	// PerformanceAccumulator framerate(PFE_GL_SHIPS);
diff -r -B -X .diff-exclude vanilla/src/signs_gui.cpp cmclient/src/signs_gui.cpp
33a34,35
> #include "citymania/cm_hotkeys.hpp"
> 
558c560
< 	if (_ctrl_pressed && (si->owner == _local_company || (si->owner == OWNER_DEITY && _game_mode == GM_EDITOR))) {
---
> 	if (citymania::_fn_mod && (si->owner == _local_company || (si->owner == OWNER_DEITY && _game_mode == GM_EDITOR))) {
diff -r -B -X .diff-exclude vanilla/src/smallmap_gui.cpp cmclient/src/smallmap_gui.cpp
31a32,34
> #include "citymania/cm_hotkeys.hpp"
> #include "citymania/cm_minimap.hpp"
> 
234a238
> 	_legend_from_industries,
267a272
> 	{nullptr, citymania::_yellow_map_heights,     lengthof(citymania::_yellow_map_heights),     MKCOLOUR_XXXX(0xC1)},
581a587,611
> static inline uint32 CM_GetSmallMapIMBAPixels(TileIndex tile, TileType t)
> {
> 	const SmallMapColourScheme *cs = &_heightmap_schemes[_settings_client.gui.smallmap_land_colour];
> 	switch (t) {
> 		// case MP_TREES:
> 		// 	if (GetTreeGround(tile) == TREE_GROUND_SNOW_DESERT || GetTreeGround(tile) == TREE_GROUND_ROUGH_SNOW) {
> 		// 		return (_settings_game.game_creation.landscape == LT_ARCTIC) ? MKCOLOUR_XYYX(PC_LIGHT_BLUE, PC_TREES) : MKCOLOUR_XYYX(PC_ORANGE, PC_TREES);
> 		// 	}
> 		// 	return MKCOLOUR_XYYX(PC_GRASS_LAND, PC_TREES);
> 
> 		case MP_CLEAR:
> 			if (IsClearGround(tile, CLEAR_FIELDS) || IsClearGround(tile, CLEAR_DESERT)) {
> 				const SmallMapColourScheme *cs = &_heightmap_schemes[3];
> 				return cs->height_colours[TileHeight(tile)];
> 			}
> 			// if (IsClearGround(tile, CLEAR_SNOW))
> 			// 	return _vegetation_clear_bits[GetClearGround(tile)];
> 			FALLTHROUGH;
> 
> 		default:
> 			const SmallMapColourScheme *cs = &_heightmap_schemes[_settings_client.gui.smallmap_land_colour];
> 			return ApplyMask(cs->height_colours[TileHeight(tile)], &_smallmap_vehicles_andor[t]);
> 	}
> }
> 
764c794
< 				if (this->map_type == SMT_INDUSTRY) {
---
> 				if (this->map_type == SMT_INDUSTRY || this->map_type == CM_SMT_IMBA) {
812a843,845
> 		case CM_SMT_IMBA:
> 			return CM_GetSmallMapIMBAPixels(tile, et);
> 
923c956
< 			DrawString(x, x + t->cache.sign.width_small, y, STR_SMALLMAP_TOWN);
---
> 			DrawString(x, x + t->cache.sign.width_small, y, t->larger_town ? STR_SMALLMAP_TOWN_LARGE : STR_SMALLMAP_TOWN);
1034a1068
> 		case CM_SMT_IMBA:
1066a1101
> 	this->SetWidgetDisabledState(WID_SM_SHOW_HEIGHT, this->map_type == CM_SMT_IMBA);
1139c1174
< 			if (i == SMT_INDUSTRY) {
---
> 			if (i == SMT_INDUSTRY || i == CM_SMT_IMBA) {
1222a1258
> 				case CM_SMT_IMBA:
1236c1272
< 				if (tbl->col_break || ((this->map_type == SMT_INDUSTRY || this->map_type == SMT_OWNER || this->map_type == SMT_LINKSTATS) && i++ >= number_of_rows)) {
---
> 				if (tbl->col_break || ((this->map_type == SMT_INDUSTRY || this->map_type == SMT_OWNER || this->map_type == SMT_LINKSTATS || this->map_type == CM_SMT_IMBA) && i++ >= number_of_rows)) {
1247a1284
> 					case CM_SMT_IMBA:
1286a1324,1330
> 			break;
> 		}
> 		case CM_WID_SM_IMBA: {
> 			uint offset = this->IsWidgetLowered(CM_WID_SM_IMBA) ? 1 : 0;
> 			Dimension d = GetSpriteSize(SPR_IMG_INDUSTRY);
> 			DrawSprite(SPR_IMG_INDUSTRY, PAL_NONE, (r.left + r.right - d.width) / 2 + offset, (r.top + r.bottom - d.height) / 2 + offset);
> 			break;
1304c1348
< 	if (map_type != SMT_INDUSTRY) this->BreakIndustryChainLink();
---
> 	if (map_type != SMT_INDUSTRY && map_type != CM_SMT_IMBA) this->BreakIndustryChainLink();
1337c1381
< 	if (_ctrl_pressed) {
---
> 	if (citymania::_fn_mod) {
1357a1402
> 	if (this->map_type == CM_SMT_IMBA) this->BreakIndustryChainLink();
1396c1441
< 	if (widget == WID_SM_LEGEND && this->map_type == SMT_INDUSTRY) {
---
> 	if (widget == WID_SM_LEGEND && (this->map_type == SMT_INDUSTRY || this->map_type == CM_SMT_IMBA)) {
1441a1487
> 		case CM_WID_SM_IMBA:
1461c1507
< 			if (this->map_type == SMT_INDUSTRY || this->map_type == SMT_LINKSTATS || this->map_type == SMT_OWNER) {
---
> 			if (this->map_type == SMT_INDUSTRY || this->map_type == SMT_LINKSTATS || this->map_type == SMT_OWNER || this->map_type == CM_SMT_IMBA) {
1466c1512
< 				if (this->map_type == SMT_INDUSTRY) {
---
> 				if (this->map_type == SMT_INDUSTRY || this->map_type == CM_SMT_IMBA) {
1489a1536
> 				case CM_SMT_IMBA:
1538c1585
< 			if (this->map_type != SMT_INDUSTRY) this->SwitchMapType(SMT_INDUSTRY);
---
> 			if (this->map_type != CM_SMT_IMBA) this->SwitchMapType(CM_SMT_IMBA);
1678c1725
< SmallMapWindow::SmallMapType SmallMapWindow::map_type = SMT_CONTOUR;
---
> SmallMapWindow::SmallMapType SmallMapWindow::map_type = CM_SMT_IMBA;
1775,1776c1822,1823
< 					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_BLANK),
< 							SetDataTip(SPR_DOT_SMALL, STR_NULL), SetFill(1, 1),
---
> 					NWidget(WWT_IMGBTN, COLOUR_BROWN, CM_WID_SM_IMBA),
> 							SetDataTip(SPR_IMG_SHOW_COUNTOURS, STR_CM_SMALLMAP_TOOLTIP_SHOW_IMBA_ON_MAP), SetFill(1, 1),
diff -r -B -X .diff-exclude vanilla/src/smallmap_gui.h cmclient/src/smallmap_gui.h
53a54
> 		CM_SMT_IMBA,
diff -r -B -X .diff-exclude vanilla/src/station_cmd.cpp cmclient/src/station_cmd.cpp
61a62,63
> #include "citymania/cm_station_gui.hpp"
> 
770a773
> 	citymania::OnStationTileSetChange(this, adding, type);
1467a1471
> 		citymania::OnStationPartBuilt(st, tile_org, p1, p2);
1951a1956
> 		if (st != nullptr) citymania::OnStationPartBuilt(st, tile, p1, p2);
2358a2364
> 		citymania::OnStationPartBuilt(st, tile, p1, p2);
2592a2599
> 		citymania::OnStationPartBuilt(st, tile, p1, p2);
diff -r -B -X .diff-exclude vanilla/src/station.cpp cmclient/src/station.cpp
20a21
> #include "town.h"
38a40,41
> Kdtree_StationXYFunc kd_station_func;
> StationKdtree _station_kdtree(kd_station_func);
40c43,45
< StationKdtree _station_kdtree(Kdtree_StationXYFunc);
---
> uint16 Kdtree_StationXYFunc::operator()(StationID stid, int dim) const {
>     return (dim == 0) ? TileX(BaseStation::Get(stid)->xy) : TileY(BaseStation::Get(stid)->xy);
> }
88a94,101
> 	for (Town *t : Town::Iterate()) {
> 		// Using poiter comparison instead of cycling cargos
> 		if (t->ad_ref_goods_entry >= this->goods &&
> 		 	   t->ad_ref_goods_entry < this->goods + NUM_CARGO) {
> 		    t->ad_ref_goods_entry = NULL;
> 		}
> 	}
> 
diff -r -B -X .diff-exclude vanilla/src/station_gui.cpp cmclient/src/station_gui.cpp
41a42,45
> #include "citymania/cm_hotkeys.hpp"
> #include "citymania/cm_station_gui.hpp"
> #include "citymania/cm_tooltips.hpp"
> 
80a85,101
> int DrawStationAuthorityText(int left, int right, int top) {
> 	TileIndex tile = TileVirtXY(_thd.pos.x, _thd.pos.y);
> 	Town *town = ClosestTownFromTile(tile, UINT_MAX);
> 	auto dist = DistanceManhattan(town->xy, tile);
> 
> 	SetDParam(0, town ? town->index : INVALID_TOWN);
> 	if (dist <= 10) {
> 		return DrawStringMultiLine(left, right, top, INT32_MAX, STR_CM_STATION_BUILD_TOWN_SMALL);
> 	} else if (dist <= 15) {
> 		return DrawStringMultiLine(left, right, top, INT32_MAX, STR_CM_STATION_BUILD_TOWN_MEDIUM);
> 	} else if (dist <= 20) {
> 		return DrawStringMultiLine(left, right, top, INT32_MAX, STR_CM_STATION_BUILD_TOWN_LARGE);
> 	} else {
> 		return DrawStringMultiLine(left, right, top, INT32_MAX, STR_CM_STATION_BUILD_TOWN);
> 	}
> }
> 
88c109
< 	if (_ctrl_pressed) {
---
> 	if (citymania::_fn_mod) {
127a149,152
> 	if (_settings_client.gui.cm_use_improved_station_join) {
> 		citymania::CheckRedrawStationCoverage();
> 		return;
> 	}
129,130c154,155
< 	static bool _last_ctrl_pressed;
< 	if (_ctrl_pressed != _last_ctrl_pressed) {
---
> 	static bool _last_fn_pressed;
> 	if (citymania::_fn_mod != _last_fn_pressed) {
132c157
< 		_last_ctrl_pressed = _ctrl_pressed;
---
> 		_last_fn_pressed = citymania::_fn_mod;
539c564
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
552c577
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
600c625
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
622c647
< 					if (_ctrl_pressed) {
---
> 					if (citymania::_fn_mod) {
1306a1332
> 	int ratings_list_y = 0;             ///< Y coordinate of first line in station ratings panel.
1844c1870
< 	int DrawCargoRatings(const Rect &r) const
---
> 	int DrawCargoRatings(const Rect &r)
1857a1884
> 		this->ratings_list_y = y;
1896c1923
< 		if (_ctrl_pressed) {
---
> 		if (citymania::_fn_mod) {
1921c1948
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
2094a2122,2143
> 	bool OnTooltip(Point pt, int widget, TooltipCloseCondition close_cond) override
> 	{
> 		if (widget != WID_SV_ACCEPT_RATING_LIST ||
> 		    	this->GetWidget<NWidgetCore>(WID_SV_ACCEPTS_RATINGS)->widget_data == STR_STATION_VIEW_RATINGS_BUTTON)
> 			return false;
> 
> 		int ofs_y = pt.y - this->ratings_list_y;
> 		if (ofs_y < 0) return false;
> 
> 		const Station *st = Station::Get(this->window_number);
> 		const CargoSpec *cs;
> 		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
> 			const GoodsEntry *ge = &st->goods[cs->Index()];
> 			if (!ge->HasRating()) continue;
> 			ofs_y -= FONT_HEIGHT_NORMAL;
> 			if (ofs_y < 0) {
> 				return citymania::ShowStationRatingTooltip(this, st, cs, close_cond);
> 			}
> 		}
> 		return false;
> 	}
> 
2266c2315
< struct SelectStationWindow : Window {
---
> struct SelectStationWindow : WindowPopup {
2272c2321
< 		Window(desc),
---
> 		WindowPopup(desc, WPUT_WIDGET_RELATIVE),
2275a2325
> 		this->wpu_widget = WID_JS_PANEL;
2429c2479
< 	if (!_ctrl_pressed) return false;
---
> 	if (!citymania::_fn_mod) return false;
diff -r -B -X .diff-exclude vanilla/src/station_gui.h cmclient/src/station_gui.h
25a26
> int DrawStationAuthorityText(int left, int right, int top);
diff -r -B -X .diff-exclude vanilla/src/station_kdtree.h cmclient/src/station_kdtree.h
18,19c18,23
< inline uint16 Kdtree_StationXYFunc(StationID stid, int dim) { return (dim == 0) ? TileX(BaseStation::Get(stid)->xy) : TileY(BaseStation::Get(stid)->xy); }
< typedef Kdtree<StationID, decltype(&Kdtree_StationXYFunc), uint16, int> StationKdtree;
---
> class Kdtree_StationXYFunc {
> public:
>     uint16 operator()(StationID stid, int dim) const;
> };
> 
> typedef Kdtree<StationID, Kdtree_StationXYFunc, uint16, int> StationKdtree;
diff -r -B -X .diff-exclude vanilla/src/statusbar_gui.cpp cmclient/src/statusbar_gui.cpp
34a35,36
> #include "citymania/cm_hotkeys.hpp"
> 
83a86
> 	GUITimer cm_epm_timer;
94a98
> 		this->cm_epm_timer.SetInterval(1000);
128a133,142
> 			case CM_WID_S_APM:
> 				if (!_settings_client.gui.cm_show_apm) {
> 					*size = Dimension(0, 0);
> 					return;
> 				}
> 				SetDParam(0, 999);
> 				SetDParam(1, 999);
> 				d = GetStringBoundingBox(STR_CM_STATUSBAR_APM);
> 				break;
> 
189a204,212
> 
> 			case CM_WID_S_APM:
> 				if (_settings_client.gui.cm_show_apm) {
> 					auto epm = citymania::GetEPM();
> 					SetDParam(0, epm.second);
> 					SetDParam(1, epm.first);
> 					DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, text_top, STR_CM_STATUSBAR_APM, TC_FROMSTRING, SA_HOR_CENTER);
> 				}
> 				break;
238a262,265
> 
> 		if (this->cm_epm_timer.CountElapsed(delta_ms)) {
> 			this->SetWidgetDirty(CM_WID_S_APM);
> 		}
244c271
< 		NWidget(WWT_PANEL, COLOUR_GREY, WID_S_LEFT), SetMinimalSize(140, 12), EndContainer(),
---
> 		NWidget(WWT_PANEL, COLOUR_GREY, WID_S_LEFT), SetMinimalSize(100, 12), EndContainer(),
246c273,274
< 		NWidget(WWT_PUSHBTN, COLOUR_GREY, WID_S_RIGHT), SetMinimalSize(140, 12),
---
> 		NWidget(WWT_PANEL, COLOUR_GREY, CM_WID_S_APM), SetMinimalSize(100, 12), EndContainer(),
> 		NWidget(WWT_PUSHBTN, COLOUR_GREY, WID_S_RIGHT), SetMinimalSize(100, 12),
271a300,304
> }
> 
> void CM_RedrawStatusBar() {
> 	StatusBarWindow *w = dynamic_cast<StatusBarWindow*>(FindWindowById(WC_STATUS_BAR, 0));
> 	w->ReInit();
diff -r -B -X .diff-exclude vanilla/src/statusbar_gui.h cmclient/src/statusbar_gui.h
25a26,27
> void CM_RedrawStatusBar();
> 
diff -r -B -X .diff-exclude vanilla/src/story_gui.cpp cmclient/src/story_gui.cpp
31a32,33
> #include "citymania/cm_hotkeys.hpp"
> 
388c390
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
diff -r -B -X .diff-exclude vanilla/src/subsidy_gui.cpp cmclient/src/subsidy_gui.cpp
25a26,27
> #include "citymania/cm_hotkeys.hpp"
> 
85,86c87,88
< 		if (_ctrl_pressed || !ScrollMainWindowToTile(xy)) {
< 			if (_ctrl_pressed) ShowExtraViewPortWindow(xy);
---
> 		if (citymania::_fn_mod || !ScrollMainWindowToTile(xy)) {
> 			if (citymania::_fn_mod) ShowExtraViewPortWindow(xy);
95c97
< 			if (_ctrl_pressed) {
---
> 			if (citymania::_fn_mod) {
diff -r -B -X .diff-exclude vanilla/src/table/settings.ini cmclient/src/table/settings.ini
49a50,51
> static bool cm_v_RedrawStatusBar(int32 p1);
> 
2675a2678,2685
> var      = gui.pause_after_load
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = false
> str      = STR_CM_CONFIG_SETTING_PAUSE_AFTER_LOAD
> strhelp  = STR_CM_CONFIG_SETTING_PAUSE_AFTER_LOAD_HELPTEXT
> cat      = SC_BASIC
> 
> [SDTC_BOOL]
2926a2937,2952
> var      = gui.cm_open_vehicle_for_shared_clone
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = false
> str      = STR_CM_CONFIG_SETTING_OPEN_VEHICLE_FOR_SHARED_CLONE
> strhelp  = STR_CM_CONFIG_SETTING_OPEN_VEHICLE_FOR_SHARED_CLONE_HELPTEXT
> cat      = SC_BASIC
> 
> [SDTC_BOOL]
> var      = gui.cm_open_orders_for_new_vehicles
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = false
> str      = STR_CM_CONFIG_SETTING_OPEN_ORDERS_FOR_NEW_VEHICLES
> strhelp  = STR_CM_CONFIG_SETTING_OPEN_ORDERS_FOR_NEW_VEHICLES_HELPTEXT
> cat      = SC_BASIC
> 
> [SDTC_BOOL]
3187a3214,3229
> var      = gui.persistent_depottools
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = false
> str      = STR_CONFIG_SETTING_PERSISTENT_DEPOTTOOLS
> strhelp  = STR_CONFIG_SETTING_PERSISTENT_DEPOTTOOLS_HELPTEXT
> cat      = SC_BASIC
> 
> [SDTC_BOOL]
> var      = gui.cm_use_improved_station_join
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = false
> str      = STR_CM_CONFIG_SETTING_IMPROVED_STATION_JOIN
> strhelp  = STR_CM_CONFIG_SETTING_IMPROVED_STATION_JOIN_HELPTEXT
> cat      = SC_BASIC
> 
> [SDTC_BOOL]
4011a4054,4297
> 
> ; //MODGUI *********************************
> [SDTC_BOOL]
> var      = gui.enable_ctrl_click_start_stop
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = true
> str      = STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP
> 
> [SDTC_BOOL]
> var      = gui.auto_noload_on_transfer
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = true
> str      = STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER
> 
> [SDTC_BOOL]
> var      = gui.auto_noload_on_unloadall
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = false
> str      = STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD
> 
> [SDTC_VAR]
> var      = gui.goto_shortcuts_ctrl_lclick
> type     = SLE_UINT8
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> guiflags = SGF_MULTISTRING
> def      = 1
> min      = 0
> max      = 6
> interval = 1
> str      = STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK
> strval   = STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE
> proc     = RedrawScreen
> cat      = SC_BASIC
> 
> [SDTC_VAR]
> var      = gui.goto_shortcuts_shift_lclick
> type     = SLE_UINT8
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> guiflags = SGF_MULTISTRING
> def      = 0
> min      = 0
> max      = 6
> interval = 1
> str      = STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK
> strval   = STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE
> proc     = RedrawScreen
> cat      = SC_BASIC
> 
> [SDTC_VAR]
> var      = gui.goto_shortcuts_ctrlshift_lclick
> type     = SLE_UINT8
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> guiflags = SGF_MULTISTRING
> def      = 0
> min      = 0
> max      = 6
> interval = 1
> str      = STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK
> strval   = STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE
> proc     = RedrawScreen
> cat      = SC_BASIC
> 
> [SDTC_VAR]
> var      = gui.goto_shortcuts_alt_lclick
> type     = SLE_UINT8
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> guiflags = SGF_MULTISTRING
> def      = 0
> min      = 0
> max      = 6
> interval = 1
> str      = STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_ALTLCLICK
> strval   = STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE
> proc     = RedrawScreen
> cat      = SC_BASIC
> 
> [SDTC_VAR]
> var      = gui.goto_shortcuts_altshift_lclick
> type     = SLE_UINT8
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> guiflags = SGF_MULTISTRING
> def      = 0
> min      = 0
> max      = 6
> interval = 1
> str      = STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_ALTSHIFTCLICK
> strval   = STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE
> proc     = RedrawScreen
> cat      = SC_BASIC
> 
> [SDTC_VAR]
> var      = gui.goto_shortcuts_altctrl_lclick
> type     = SLE_UINT8
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> guiflags = SGF_MULTISTRING
> def      = 0
> min      = 0
> max      = 6
> interval = 1
> str      = STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLALTLCLICK
> strval   = STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE
> proc     = RedrawScreen
> cat      = SC_BASIC
> 
> [SDTC_BOOL]
> var      = gui.old_depot_train_length_calc
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = true
> str      = STR_OLD_DEPOT_TRAINT_LENGTH
> 
> [SDTC_VAR]
> var      = gui.cb_distance_check
> type     = SLE_UINT8
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = 25
> min      = 0
> max      = 100
> interval = 5
> str      = STR_CB_DISTANCE_CHECK
> strval   = STR_JUST_COMMA
> proc     = RedrawScreen
> 
> [SDTC_BOOL]
> var      = gui.cm_land_tooltips_for_industries
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = true
> str      = STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_INDUSTRIES
> strhelp  = STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_INDUSTRIES_HELPTEXT
> 
> [SDTC_BOOL]
> var      = gui.cm_land_tooltips_for_stations
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = true
> str      = STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_STATIONS
> strhelp  = STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_STATIONS_HELPTEXT
> 
> [SDTC_BOOL]
> var      = gui.cm_land_tooltips_for_houses
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = false
> str      = STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_HOUSES
> strhelp  = STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_HOUSES_HELPTEXT
> 
> [SDTC_BOOL]
> var      = gui.polyrail_double_click
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = false
> str      = STR_CONFIG_SETTING_POLYRAIL_DOUBLECLICK_TOOLTIPS
> 
> [SDTC_BOOL]
> var      = gui.show_industry_forbidden_tiles
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = false
> cat      = SC_BASIC
> 
> [SDTC_BOOL]
> var      = gui.runway_too_short_warn
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = true
> str      = STR_CONFIG_SETTING_WARN_IF_RUNWAY_IS_TOO_SHORT
> 
> [SDTC_VAR]
> var      = gui.powerfund_money
> type     = SLE_UINT
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> guiflags = SGF_CURRENCY
> def      = 200000
> min      = 0
> max      = 2000000
> str      = STR_CONFIG_SETTING_POWERFUND_MONEY
> strval   = STR_JUST_CURRENCY_LONG
> 
> [SDTC_VAR]
> var      = gui.powerfund_houses
> type     = SLE_UINT16
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = 10000
> min      = 0
> max      = 10000
> interval = 10
> str      = STR_CONFIG_SETTING_POWERFUND_HOUSES
> strval   = STR_JUST_COMMA
> 
> [SDTC_VAR]
> var      = gui.cm_fn_mod
> type     = SLE_UINT8
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> guiflags = SGF_MULTISTRING
> def      = 2
> min      = 0
> max      = 3
> str      = STR_CM_CONFIG_SETTING_MODIFIER_FN
> strhelp  = STR_CM_CONFIG_SETTING_MODIFIER_FN_HELPTEXT
> strval   = STR_CM_CONFIG_SETTING_MODIFIER_NONE
> cat      = SC_ADVANCED
> 
> [SDTC_VAR]
> var      = gui.cm_remove_mod
> type     = SLE_UINT8
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> guiflags = SGF_MULTISTRING
> def      = 2
> min      = 0
> max      = 3
> str      = STR_CM_CONFIG_SETTING_MODIFIER_REMOVE
> strhelp  = STR_CM_CONFIG_SETTING_MODIFIER_REMOVE_HELPTEXT
> strval   = STR_CM_CONFIG_SETTING_MODIFIER_NONE
> cat      = SC_ADVANCED
> 
> [SDTC_VAR]
> var      = gui.cm_estimate_mod
> type     = SLE_UINT8
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> guiflags = SGF_MULTISTRING
> def      = 1
> min      = 0
> max      = 3
> str      = STR_CM_CONFIG_SETTING_MODIFIER_ESTIMATE
> strhelp  = STR_CM_CONFIG_SETTING_MODIFIER_ESTIMATE_HELPTEXT
> strval   = STR_CM_CONFIG_SETTING_MODIFIER_NONE
> cat      = SC_ADVANCED
> 
> [SDTC_VAR]
> var      = gui.cm_shaded_trees
> type     = SLE_UINT8
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> guiflags = SGF_MULTISTRING
> def      = 2
> min      = 0
> max      = 2
> str      = STR_CM_CONFIG_SETTING_SHADED_TREES
> strhelp  = STR_CM_CONFIG_SETTING_SHADED_TREES_HELPTEXT
> strval   = STR_CM_CONFIG_SETTING_SHADED_TREES_OFF
> cat      = SC_ADVANCED
> proc     = RedrawScreen
> 
> [SDTC_BOOL]
> var      = gui.cm_show_apm
> flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
> def      = false
> str      = STR_CM_CONFIG_SETTING_SHOW_APM
> strhelp  = STR_CM_CONFIG_SETTING_SHOW_APM_HELPTEXT
> cat      = SC_ADVANCED
> proc     = cm_v_RedrawStatusBar
diff -r -B -X .diff-exclude vanilla/src/table/sprites.h cmclient/src/table/sprites.h
303a304,344
> /* zoning stuff */
> static const SpriteID SPR_INNER_HIGHLIGHT_BASE      = SPR_PALETTE_BASE + PALETTE_SPRITE_COUNT;
> static const SpriteID SPR_IMG_COMPANY_CARGO         = SPR_INNER_HIGHLIGHT_BASE + 19;
> static const SpriteID SPR_IMG_COMPANY_GOAL          = SPR_INNER_HIGHLIGHT_BASE + 20;
> static const SpriteID SPR_IMG_HOUSE_NEW             = SPR_INNER_HIGHLIGHT_BASE + 21;
> static const SpriteID SPR_PALETTE_ZONING_RED        = SPR_INNER_HIGHLIGHT_BASE + 22;
> static const SpriteID SPR_PALETTE_ZONING_GREEN      = SPR_INNER_HIGHLIGHT_BASE + 23;
> static const SpriteID SPR_PALETTE_ZONING_BLACK      = SPR_INNER_HIGHLIGHT_BASE + 24;
> static const SpriteID SPR_PALETTE_ZONING_LIGHT_BLUE = SPR_INNER_HIGHLIGHT_BASE + 25;
> static const SpriteID SPR_PALETTE_ZONING_ORANGE     = SPR_INNER_HIGHLIGHT_BASE + 26;
> static const SpriteID SPR_PALETTE_ZONING_WHITE      = SPR_INNER_HIGHLIGHT_BASE + 27;
> static const SpriteID SPR_PALETTE_ZONING_YELLOW     = SPR_INNER_HIGHLIGHT_BASE + 28;
> static const SpriteID SPR_PALETTE_ZONING_PURPLE     = SPR_INNER_HIGHLIGHT_BASE + 29;
> static const SpriteID SPR_INNER_HIGHLIGHT_COUNT     = 30;
> 
> static const SpriteID SPR_BORDER_HIGHLIGHT_BASE     = SPR_INNER_HIGHLIGHT_BASE + SPR_INNER_HIGHLIGHT_COUNT + 1;
> static const SpriteID SPR_BORDER_HIGHLIGHT_COUNT    = 19 * 19;
> static const SpriteID PALETTE_TINT_BASE             = SPR_BORDER_HIGHLIGHT_BASE + SPR_BORDER_HIGHLIGHT_COUNT;
> static const SpriteID PALETTE_TINT_RED_DEEP         = PALETTE_TINT_BASE;
> static const SpriteID PALETTE_TINT_ORANGE_DEEP      = PALETTE_TINT_BASE + 1;
> static const SpriteID PALETTE_TINT_GREEN_DEEP       = PALETTE_TINT_BASE + 2;
> static const SpriteID PALETTE_TINT_CYAN_DEEP        = PALETTE_TINT_BASE + 3;
> static const SpriteID PALETTE_TINT_RED              = PALETTE_TINT_BASE + 4;
> static const SpriteID PALETTE_TINT_ORANGE           = PALETTE_TINT_BASE + 5;
> static const SpriteID PALETTE_TINT_YELLOW           = PALETTE_TINT_BASE + 6;
> static const SpriteID PALETTE_TINT_YELLOW_WHITE     = PALETTE_TINT_BASE + 7;
> static const SpriteID PALETTE_TINT_WHITE            = PALETTE_TINT_BASE + 8;
> static const SpriteID PALETTE_TINT_GREEN            = PALETTE_TINT_BASE + 9;
> static const SpriteID PALETTE_TINT_CYAN             = PALETTE_TINT_BASE + 10;
> static const SpriteID PALETTE_TINT_CYAN_WHITE       = PALETTE_TINT_BASE + 11;
> static const SpriteID PALETTE_TINT_BLUE             = PALETTE_TINT_BASE + 12;
> static const SpriteID PALETTE_SHADE_N              = PALETTE_TINT_BASE + 13;
> static const SpriteID PALETTE_SHADE_NE               = PALETTE_TINT_BASE + 14;
> static const SpriteID PALETTE_SHADE_E               = PALETTE_TINT_BASE + 15;
> static const SpriteID PALETTE_SHADE_SE               = PALETTE_TINT_BASE + 16;
> static const SpriteID PALETTE_SHADE_S               = PALETTE_TINT_BASE + 17;
> static const SpriteID PALETTE_SHADE_SW               = PALETTE_TINT_BASE + 18;
> static const SpriteID PALETTE_SHADE_W               = PALETTE_TINT_BASE + 19;
> static const SpriteID PALETTE_SHADE_NW               = PALETTE_TINT_BASE + 20;
> static const SpriteID PALETTE_TINT_COUNT            = 13 + 8;
> 
305c346
< static const SpriteID SPR_NEWGRFS_BASE = SPR_PALETTE_BASE + PALETTE_SPRITE_COUNT;
---
> static const SpriteID SPR_NEWGRFS_BASE = PALETTE_TINT_BASE + PALETTE_TINT_COUNT;
diff -r -B -X .diff-exclude vanilla/src/terraform_gui.cpp cmclient/src/terraform_gui.cpp
38a39,40
> #include "citymania/cm_hotkeys.hpp"
> 
61c63
< 		SetTropicZone(tile, (_ctrl_pressed) ? TROPICZONE_NORMAL : TROPICZONE_DESERT);
---
> 		SetTropicZone(tile, citymania::_fn_mod ? TROPICZONE_NORMAL : TROPICZONE_DESERT);
117c119,176
< 			DoCommandP(end_tile, start_tile, _ctrl_pressed ? 1 : 0, CMD_CLEAR_AREA | CMD_MSG(STR_ERROR_CAN_T_CLEAR_THIS_AREA), CcPlaySound_EXPLOSION);
---
> 			DoCommandP(end_tile, start_tile, citymania::_fn_mod ? 1 : 0, CMD_CLEAR_AREA | CMD_MSG(STR_ERROR_CAN_T_CLEAR_THIS_AREA), CcPlaySound_EXPLOSION);
> 			break;
> 		case DDSP_DEMOLISH_TREES:
> 			// loop through every tile and send a demolish command for each tree
> 			// orthogonal area
> 			TileIndex tree_start_tile, tree_recent_tile, prev_tile;
> 			tree_start_tile = tree_recent_tile = prev_tile = 0;
> 			if (!citymania::_fn_mod) {
> 				OrthogonalTileArea square_area = OrthogonalTileArea(start_tile, end_tile);
> 				TILE_AREA_LOOP(curr_tile, square_area) {
> 					// if we're on a non-consecutive tile or we've hit a black-marked tile
> 					// safe tiles are: TREES or non-FIELD clear tiles (because they're expensive to demolish)
> 					if (tree_start_tile != 0 &&
> 							(curr_tile != prev_tile + 1 ||
> 							(!IsTileType(curr_tile, MP_TREES) && (!IsTileType(curr_tile, MP_CLEAR) || IsClearGround(curr_tile, CLEAR_FIELDS))))) {
> 						DoCommandP(tree_start_tile, tree_recent_tile, 0, CMD_CLEAR_AREA | CMD_MSG(STR_ERROR_CAN_T_CLEAR_THIS_AREA), CcPlaySound_EXPLOSION);
> 						tree_start_tile = tree_recent_tile = 0;
> 					}
> 					// if current tile is a tree
> 					if (IsTileType(curr_tile, MP_TREES)) {
> 						if (tree_start_tile == 0) {
> 							tree_start_tile = curr_tile;
> 						}
> 						tree_recent_tile = curr_tile;
> 					}
> 					prev_tile = curr_tile;
> 				}
> 				// one last ride to flavortown
> 				if (tree_start_tile != 0) {
> 					DoCommandP(tree_start_tile, tree_recent_tile, 0, CMD_CLEAR_AREA | CMD_MSG(STR_ERROR_CAN_T_CLEAR_THIS_AREA), CcPlaySound_EXPLOSION);
> 				}
> 			} else {  // diagonal area
> 				DiagonalTileArea diagonal_area = DiagonalTileArea(start_tile, end_tile);
> 				DIAGONAL_TILE_AREA_LOOP(curr_tile, diagonal_area) {
> 					// same as above but with a different criteria for consecutive tiles
> 					TileIndexDiffC tile_diff = TileIndexToTileIndexDiffC(curr_tile, prev_tile);
> 					// if we're on a non-consecutive tile or we've hit a black-marked tile
> 					// safe tiles are: TREES or non-FIELD clear tiles (because they're expensive to demolish)
> 					if (tree_start_tile != 0 &&
> 							(!((tile_diff.x == 1 && tile_diff.y == 1) || (tile_diff.x == -1 && tile_diff.y == -1)) ||
> 							(!IsTileType(curr_tile, MP_TREES) && (!IsTileType(curr_tile, MP_CLEAR) || IsClearGround(curr_tile, CLEAR_FIELDS))))) {
> 						DoCommandP(tree_start_tile, tree_recent_tile, 1, CMD_CLEAR_AREA | CMD_MSG(STR_ERROR_CAN_T_CLEAR_THIS_AREA), CcPlaySound_EXPLOSION);
> 						tree_start_tile = tree_recent_tile = 0;
> 					}
> 					// if current tile is a tree
> 					if (IsTileType(curr_tile, MP_TREES)) {
> 						if (tree_start_tile == 0) {
> 							tree_start_tile = curr_tile;
> 						}
> 						tree_recent_tile = curr_tile;
> 					}
> 					prev_tile = curr_tile;
> 				}
> 				// one last ride to flavortown
> 				if (tree_start_tile != 0) {
> 					DoCommandP(tree_start_tile, tree_recent_tile, 1, CMD_CLEAR_AREA | CMD_MSG(STR_ERROR_CAN_T_CLEAR_THIS_AREA), CcPlaySound_EXPLOSION);
> 				}
> 			}
120c179
< 			DoCommandP(end_tile, start_tile, LM_RAISE << 1 | (_ctrl_pressed ? 1 : 0), CMD_LEVEL_LAND | CMD_MSG(STR_ERROR_CAN_T_RAISE_LAND_HERE), CcTerraform);
---
> 			DoCommandP(end_tile, start_tile, LM_RAISE << 1 | (citymania::_fn_mod ? 1 : 0), CMD_LEVEL_LAND | CMD_MSG(STR_ERROR_CAN_T_RAISE_LAND_HERE), CcTerraform);
123c182
< 			DoCommandP(end_tile, start_tile, LM_LOWER << 1 | (_ctrl_pressed ? 1 : 0), CMD_LEVEL_LAND | CMD_MSG(STR_ERROR_CAN_T_LOWER_LAND_HERE), CcTerraform);
---
> 			DoCommandP(end_tile, start_tile, LM_LOWER << 1 | (citymania::_fn_mod ? 1 : 0), CMD_LEVEL_LAND | CMD_MSG(STR_ERROR_CAN_T_LOWER_LAND_HERE), CcTerraform);
126c185
< 			DoCommandP(end_tile, start_tile, LM_LEVEL << 1 | (_ctrl_pressed ? 1 : 0), CMD_LEVEL_LAND | CMD_MSG(STR_ERROR_CAN_T_LEVEL_LAND_HERE), CcTerraform);
---
> 			DoCommandP(end_tile, start_tile, LM_LEVEL << 1 | (citymania::_fn_mod ? 1 : 0), CMD_LEVEL_LAND | CMD_MSG(STR_ERROR_CAN_T_LEVEL_LAND_HERE), CcTerraform);
165a225,248
> 	void DrawWidget(const Rect &r, int widget) const override
> 	{
> 		if (widget == WID_TT_DEMOLISH_TREES) {
> 			uint offset = this->IsWidgetLowered(WID_TT_DEMOLISH_TREES) ? 1 : 0;
> 			ZoomLevel temp_zoom;
> 			switch (_gui_zoom) {
> 				case ZOOM_LVL_NORMAL:
> 					temp_zoom = ZOOM_LVL_OUT_2X;
> 					break;
> 				case ZOOM_LVL_OUT_2X:
> 					temp_zoom = ZOOM_LVL_OUT_4X;
> 					break;
> 				case ZOOM_LVL_OUT_4X:
> 					temp_zoom = ZOOM_LVL_OUT_8X;
> 					break;
> 				default:
> 					temp_zoom = ZOOM_LVL_OUT_8X;
> 					break;
> 			}
> 			Dimension d = GetSpriteSize(SPR_IMG_PLANTTREES, (Point *)0, temp_zoom);
> 			DrawSprite(SPR_IMG_PLANTTREES, PAL_NONE, (r.left + r.right - d.width) / 2 + offset, (r.top + r.bottom - d.height) / 2 + offset, nullptr, temp_zoom);
> 		}
> 	}
> 
197a281,285
> 			case WID_TT_DEMOLISH_TREES: // Demolish aka dynamite button
> 				HandlePlacePushButton(this, WID_TT_DEMOLISH_TREES, ANIMCURSOR_DEMOLISH, HT_RECT | HT_DIAGONAL);
> 				this->last_user_action = widget;
> 				break;
> 
238a327,330
> 			case WID_TT_DEMOLISH_TREES: // Demolish trees only
> 				VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_DEMOLISH_TREES);
> 				break;
> 
268a361
> 				case DDSP_DEMOLISH_TREES:
303a397
> 	Hotkey('D' | WKC_CTRL | WKC_GLOBAL_HOTKEY, "treedozer", WID_TT_DEMOLISH_TREES),
329a424,425
>         NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_DEMOLISH_TREES), SetMinimalSize(22, 22),
> 								SetFill(0, 1), SetDataTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_TREES),
diff -r -B -X .diff-exclude vanilla/src/tilearea_type.h cmclient/src/tilearea_type.h
233a234,235
> #define DIAGONAL_TILE_AREA_LOOP(var, ta) for (DiagonalTileIterator var(ta); var != INVALID_TILE; ++var)
> 
diff -r -B -X .diff-exclude vanilla/src/tile_cmd.h cmclient/src/tile_cmd.h
64a65
> 	uint16 population;          ///< CM
diff -r -B -X .diff-exclude vanilla/src/tilehighlight_func.h cmclient/src/tilehighlight_func.h
13a14
> #include "tilearea_type.h"
14a16,17
> #include "track_type.h"
> #include "industry_type.h"
29a33,39
> 
> RailSnapMode GetRailSnapMode();
> void SetRailSnapMode(RailSnapMode mode);
> 
> void StoreRailPlacementEndpoints(TileIndex start_tile, TileIndex end_tile, Track start_track, bool bidirectional = true);
> void StoreRailStationPlacementEndpoints(const TileArea &ta, Axis station_axis);
> void ResetRailPlacementEndpoints();
diff -r -B -X .diff-exclude vanilla/src/tilehighlight_type.h cmclient/src/tilehighlight_type.h
12a13,14
> #include "citymania/cm_highlight_type.hpp"
> 
28a31
> 	HT_POLY      = 0x400, ///< polyline mode; connect highlighted track with previous one
40a44
> 	CM_HT_DIR_AUTO = 4,
43a48,53
> /** Methods of rail track snapping. */
> enum RailSnapMode {
> 	RSM_NO_SNAP,      ///< Not snapping.
> 	RSM_SNAP_TO_TILE, ///< Snap to a tile.
> 	RSM_SNAP_TO_RAIL, ///< Snap to other rail tracks.
> };
56a67
> 	Point new_offs;      ///< New value for \a offs; used to determine whether to redraw the selection.
61a73,75
> 	Point selstart2;     ///< The location where the second segment of a polyline track starts.
> 	Point selend2;       ///< The location where the second segment of a polyline track ends.
> 	HighLightStyle dir2; ///< Direction of the second segment of a polyline track, HT_DIR_END if second segment is not selected. HT_LINE drawstyle.
75a90,92
> 
> 	citymania::ObjectHighlight cm;
> 	citymania::ObjectHighlight cm_new;
diff -r -B -X .diff-exclude vanilla/src/timetable_gui.cpp cmclient/src/timetable_gui.cpp
30a31,32
> #include "citymania/cm_hotkeys.hpp"
> 
532c534
< 				ShowSetDateWindow(this, v->index | (v->orders.list->IsCompleteTimetable() && _ctrl_pressed ? 1U << 20 : 0), _date, _cur_year, _cur_year + 15, ChangeTimetableStartCallback);
---
> 				ShowSetDateWindow(this, v->index | (v->orders.list->IsCompleteTimetable() && citymania::_fn_mod ? 1U << 20 : 0), _date, _cur_year, _cur_year + 15, ChangeTimetableStartCallback);
598c600
< 				if (_ctrl_pressed) SetBit(p2, 1);
---
> 				if (citymania::_fn_mod) SetBit(p2, 1);
diff -r -B -X .diff-exclude vanilla/src/toolbar_gui.cpp cmclient/src/toolbar_gui.cpp
57a58,64
> #include "cargo_table_gui.h"
> #include "object_type.h"
> #include "zoning.h"
> #include "watch_gui.h"
> 
> #include "citymania/cm_locations.hpp"
> #include "citymania/cm_main.hpp"
82a90
> 	CBF_BUILD_HQ,
267a275,286
> /* hq hotkey */
> static CallBackFunction BuildCompanyHQ(){
> 	if (_last_started_action == CBF_BUILD_HQ) {
> 		ResetObjectToPlace();
> 		return CBF_NONE;
> 	} else {
> 		SetObjectToPlace(SPR_CURSOR_HQ, PAL_NONE, HT_RECT, WC_MAIN_TOOLBAR, 0);
> 		SetTileSelectSize(2, 2);
> 		return CBF_BUILD_HQ;
> 	}
> }
> 
300a320
> 	OME_ZONING,
328a349
> 	list.emplace_back(new DropDownListStringItem(STR_SETTINGS_MENU_ZONING,                   OME_ZONING, false));
358a380
> 		case OME_ZONING:               ShowZoningToolbar();                             break;
593a616,646
> /* --- CARGOS button menu --- */
> 
> static CallBackFunction ToolbarCargosClick(Window *w)
> {
> 	PopupMainCompanyToolbMenu(w, WID_TN_CARGOS);
> 	return CBF_NONE;
> }
> 
> static CallBackFunction MenuClickCargos(int index)
> {
> 	ShowCompanyCargos((CompanyID)index);
> 	return CBF_NONE;
> }
> 
> /* --- WATCH button menu --- */
> 
> static CallBackFunction ToolbarWatchClick(Window *w)
> {
> 	PopupMainCompanyToolbMenu(w, WID_TN_WATCH);
> 	return CBF_NONE;
> }
> 
> static CallBackFunction MenuClickWatch(int index)
> {
> 	if(Company::IsValidID((CompanyID)index)){
> 		ShowWatchWindow((CompanyID)index, 0);
> 	}
> 	else ShowWatchWindow(INVALID_COMPANY, 0);
> 	return CBF_NONE;
> }
> 
737c790,792
< 	PopupMainToolbMenu(w, WID_TN_INDUSTRIES, STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY, (_local_company == COMPANY_SPECTATOR) ? 2 : 3);
---
> 	// CM don't disable
> 	// PopupMainToolbMenu(w, WID_TN_INDUSTRIES, STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY, (_local_company == COMPANY_SPECTATOR) ? 2 : 3);
> 	PopupMainToolbMenu(w, WID_TN_INDUSTRIES, STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY, 3);
1070c1125
< 	PopupMainToolbMenu(w, _game_mode == GM_EDITOR ? (int)WID_TE_HELP : (int)WID_TN_HELP, STR_ABOUT_MENU_LAND_BLOCK_INFO, _settings_client.gui.newgrf_developer_tools ? 10 : 7);
---
> 	PopupMainToolbMenu(w, _game_mode == GM_EDITOR ? (int)WID_TE_HELP : (int)WID_TN_HELP, STR_ABOUT_MENU_LAND_BLOCK_INFO, _settings_client.gui.newgrf_developer_tools ? 11 : 8);
1160,1168c1215,1230
< 		case  0: return PlaceLandBlockInfo();
< 		case  2: IConsoleSwitch();                 break;
< 		case  3: ShowAIDebugWindow();              break;
< 		case  4: ShowScreenshotWindow();           break;
< 		case  5: ShowFramerateWindow();            break;
< 		case  6: ShowAboutWindow();                break;
< 		case  7: ShowSpriteAlignerWindow();        break;
< 		case  8: ToggleBoundingBoxes();            break;
< 		case  9: ToggleDirtyBlocks();              break;
---
> 		case 0: return PlaceLandBlockInfo();
> 		case 1:
> 			extern bool _novahost;
> 			if (_networking && _novahost){
> 				ShowCommandsToolbar();
> 			}
> 			break;
> 		case  2: ShowLoginWindow();                break;
> 		case  3: IConsoleSwitch();                 break;
> 		case  4: ShowAIDebugWindow();              break;
> 		case  5: ShowScreenshotWindow();           break;
> 		case  6: ShowFramerateWindow();            break;
> 		case  7: ShowAboutWindow();                break;
> 		case  8: ShowSpriteAlignerWindow();        break;
> 		case  9: ToggleBoundingBoxes();            break;
> 		case  10: ToggleDirtyBlocks();              break;
1333a1396
> 	MenuClickCargos,      // 8.5
1336a1400
> 	MenuClickWatch,       // 11.5
1795a1860
> 			WID_TN_CARGOS,
1798a1864
> 			WID_TN_WATCH,
1966a2033
> 	ToolbarCargosClick,
1969a2037
> 	ToolbarWatchClick,
2030a2099,2109
> 	MTHK_BUILD_HQ,
> 	MTHK_COMMANDS_GUI,
> 	MTHK_CARGOTABLE,
> 	MTHK_TREES,
> 	MTHK_ZONING,
> 	MTHK_LOGINWINDOW,
> 	MTHK_SETTINGS_ADV,
> 	MTHK_NEWGRF,
> 	MTHK_LANDINFO,
> 	CM_MTHK_SMALLMAP_TOGGLE,
> 	CM_LOCATION_HOTKEYS,
2063c2142
< 		this->SetWidgetsDisabledState(Company::GetNumItems() == 0, WID_TN_STATIONS, WID_TN_FINANCES, WID_TN_TRAINS, WID_TN_ROADVEHS, WID_TN_SHIPS, WID_TN_AIRCRAFT, WIDGET_LIST_END);
---
> 		this->SetWidgetsDisabledState(Company::GetNumItems() == 0, WID_TN_STATIONS, WID_TN_FINANCES, WID_TN_CARGOS, WID_TN_WATCH, WID_TN_TRAINS, WID_TN_ROADVEHS, WID_TN_SHIPS, WID_TN_AIRCRAFT, WIDGET_LIST_END);
2075a2155,2162
> 	void DrawWidget(const Rect &r, int widget) const override {
> 		if (widget == WID_TN_WATCH) {
> 			Dimension d = GetSpriteSize(SPR_CENTRE_VIEW_VEHICLE);
> 			uint offset = this->IsWidgetLowered(WID_TN_WATCH) ? 1 : 0;
> 			DrawSprite(SPR_CENTRE_VIEW_VEHICLE, PAL_NONE, (r.left + r.right - d.width) / 2 + offset, (r.top + r.bottom - d.height) / 2 + offset);
> 		}
> 	}
> 
2124c2211
< 			case MTHK_CHEATS: if (!_networking) ShowCheatWindow(); break;
---
> 			case MTHK_CHEATS: ShowCheatWindow(); break;
2127a2215,2218
> 			case MTHK_COMMANDS_GUI: extern bool _novahost; if (_networking && _novahost){ ShowCommandsToolbar(); } break;
> 			case MTHK_BUILD_HQ: if(_current_company != COMPANY_SPECTATOR){ _last_started_action = BuildCompanyHQ(); } break;
> 			case MTHK_CARGOTABLE: if(_current_company != COMPANY_SPECTATOR){ ShowCompanyCargos(_current_company); } break;
> 			case MTHK_TREES: if(_current_company != COMPANY_SPECTATOR){ BuildTreesWindow(); } break;
2129c2220,2226
< 			default: return ES_NOT_HANDLED;
---
> 			case MTHK_ZONING: ShowZoningToolbar(); break;
> 			case MTHK_LOGINWINDOW: ShowLoginWindow(); break;
> 			case MTHK_SETTINGS_ADV: ShowGameSettings(); break;
> 			case MTHK_NEWGRF: ShowNewGRFSettings(!_networking && _settings_client.gui.UserIsAllowedToChangeNewGRFs(), true, true, &_grfconfig); break;
> 			case MTHK_LANDINFO: _last_started_action = PlaceLandBlockInfo(); break;
> 			case CM_MTHK_SMALLMAP_TOGGLE: citymania::ToggleSmallMap(); break;
> 			default: return citymania::HandleToolbarHotkey(hotkey);
2133a2231,2248
> 	virtual void BuildTreesWindow(){
> 		ShowBuildTreesToolbar();
> 		Window *w = FindWindowById(WC_BUILD_TREES, 0);
> 		if(w != NULL){
> 			if(w->IsWidgetLowered(WID_BT_TYPE_RANDOM)){
> 				w->RaiseWidget(WID_BT_TYPE_RANDOM);
> 				ResetObjectToPlace();
> 			}
> 			else{
> 				w->OnHotkey(WID_BT_TYPE_RANDOM);
> 			}
> 
> 		}
> 		/*
> 		if (!w->IsWidgetLowered(WID_BT_TYPE_RANDOM))
> 			w->OnClick(Point(), WID_BT_TYPE_RANDOM, 1);*/
> 	}
> 
2142c2257,2264
< 				ShowLandInfo(tile);
---
> 				VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_MEASURE);
> 				break;
> 
> 			case CBF_BUILD_HQ:
> 				if(DoCommandP(tile, OBJECT_HQ, 0, CMD_BUILD_OBJECT | CMD_MSG(STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS))){
> 					ResetObjectToPlace();
> 					this->RaiseButtons();
> 				}
2153a2276,2281
> 	void OnPlaceDrag(ViewportPlaceMethod select_method, ViewportDragDropSelectionProcess select_proc, Point pt) override
> 	{
> 		VpSelectTilesWithMethod(pt.x, pt.y, select_method);
> 	}
> 
> 
2239a2368,2375
> 	Hotkey('N', "nova_commands", MTHK_COMMANDS_GUI),
> 	Hotkey(WKC_CTRL | WKC_F2, "cargo_table", MTHK_CARGOTABLE),
> 	Hotkey(WKC_CTRL  | 'H', "build_hq", MTHK_BUILD_HQ),
> 	Hotkey('I', "trees", MTHK_TREES),
> 	Hotkey((uint16)0, "zoning", MTHK_ZONING),
> 	Hotkey((uint16)0, "login_window", MTHK_LOGINWINDOW),
> 	Hotkey((uint16)0, "settings_adIanced", MTHK_SETTINGS_ADV),
> 	Hotkey((uint16)0, "newgrf_window", MTHK_NEWGRF),
2240a2377,2379
> 	Hotkey((uint16)0, "land_info", MTHK_LANDINFO),
> 	Hotkey((uint16)0, "cm_smallmap_toggle", CM_MTHK_SMALLMAP_TOGGLE),
> 	CM_LOCATION_HOTKEYS_DECL,
2257a2397
> 		SPR_IMG_COMPANY_CARGO,   // WID_TN_CARGOS
2260a2401
> 		0,                       // WID_TN_WATCH
2391a2533
> 	CM_MTEHK_SMALLMAP_TOGGLE,
2500a2643
> 			case CM_MTEHK_SMALLMAP_TOGGLE:     citymania::ToggleSmallMap(); break;
2515c2658
< 				ShowLandInfo(tile);
---
> 				VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_MEASURE);
2604a2748
> 	Hotkey((uint16)0, "cm_smallmap_toggle", CM_MTEHK_SMALLMAP_TOGGLE),
diff -r -B -X .diff-exclude vanilla/src/town_cmd.cpp cmclient/src/town_cmd.cpp
54a55,57
> #include "citymania/cm_highlight.hpp"
> #include "citymania/cm_main.hpp"
> 
56a60,67
> bool _cb_enabled = false;
> uint _cb_storage = 0;
> uint CBREQ[NUM_CARGO] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};//CB
> uint CBFROM[NUM_CARGO] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};//CB
> uint CBDECAY[NUM_CARGO] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};//CB
> uint days_in_month[] = {31, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};//CB
> void CB_UpdateTownStorage(Town *t); //CB
> 
200a212,231
>  /**
>  * Updates the town label of the town after changes in rating. The colour scheme is:
>  * Red: Appalling and Very poor ratings.
>  * Orange: Poor and mediocre ratings.
>  * Yellow: Good rating.
>  * White: Very good rating (standard).
>  * Green: Excellent and outstanding ratings.
>  */
> void Town::UpdateLabel()
> {
> 	if (!(_game_mode == GM_EDITOR) && (_local_company < MAX_COMPANIES)) {
> 		int r = this->ratings[_local_company];
> 		if     (r < RATING_VERYPOOR) this->town_label = 0; // Appalling and Very Poor, RED
> 		else if(r < RATING_MEDIOCRE) this->town_label = 1; // Poor and Mediocre, ORANGE
> 		else if(r < RATING_GOOD)     this->town_label = 2; // Good, YELLOW
> 		else if(r < RATING_VERYGOOD) this->town_label = 3; // Very Good, WHITE
> 		else                         this->town_label = 4; // Excellent and Outstanding, GREEN
> 	}
> }
> 
227c258
< static bool BuildTownHouse(Town *t, TileIndex tile);
---
> static bool BuildTownHouse(Town *t, TileIndex tile, bool is_rebuilding = false);
397a429
> 	this->UpdateLabel();
410a443
> 	SetWindowDirty(WC_CB_TOWN, this->index);
496c530,533
< 		ChangePopulation(Town::GetByTile(tile), HouseSpec::Get(GetHouseType(tile))->population);
---
> 		HouseID house_id = GetHouseType(tile);
> 		auto hs = HouseSpec::Get(house_id);
> 		Town *town = Town::GetByTile(tile);
> 		ChangePopulation(Town::GetByTile(tile), hs->population);
497a535,537
> 
> 		if (hs->building_flags & BUILDING_HAS_1_TILE)
> 			citymania::Emit(citymania::event::HouseCompleted{town, tile, house_id, hs});
632c672,674
< 		if (GB(r, 24, 8) >= 12) BuildTownHouse(t, tile);
---
> 		bool rebuild_res = false;
> 		if (GB(r, 24, 8) >= 12) rebuild_res = BuildTownHouse(t, tile, true);
> 		citymania::Emit(citymania::event::HouseRebuilt{t, tile, rebuild_res});
660a703
> 		citymania::Emit(citymania::event::HouseDestroyed{_current_company, t, tile});
749a793
> 	td->population = hs->population;
788a833,930
> bool TownNeedsFunding(Town *t) {
> 	bool fund_regularly = HasBit(t->fund_regularly, _local_company);
> 	bool do_powerfund = HasBit(t->do_powerfund, _local_company);
> 
> 	if (do_powerfund && (_settings_client.gui.powerfund_money > Company::Get(_local_company)->money ||
> 		    _settings_client.gui.powerfund_houses < t->cache.num_houses)) {
> 	    do_powerfund = false;
> 	}
> 
> 	if (!fund_regularly && !do_powerfund)
> 		return false;
> 
> 
> 	bool is_growing = HasBit(t->flags, TOWN_IS_GROWING);
> 
> 	if (HasBit(t->flags, TOWN_CUSTOM_GROWTH)) {
> 		if (!is_growing)
> 			return false;
> 
> 		if (do_powerfund && t->grow_counter > 2 * TOWN_GROWTH_TICKS)
> 			return true;
> 
> 		return (fund_regularly &&
> 		        t->fund_buildings_months == 0 && (
> 			     	t->growth_rate <= 2 * TOWN_GROWTH_TICKS ||
>                 	t->grow_counter > 2 * TOWN_GROWTH_TICKS
>                 ));
> 	}
> 
> 	if (!is_growing)
> 		return true;
> 
> 	if (do_powerfund && t->grow_counter > 2 * TOWN_GROWTH_TICKS)
> 		return true;
> 
> 	return (fund_regularly &&
> 	        t->fund_buildings_months == 0 &&
> 		    t->growth_rate >= TOWN_GROWTH_TICKS && (
> 		    	t->growth_rate <= 2 * TOWN_GROWTH_TICKS ||
>             	t->grow_counter > 2 * TOWN_GROWTH_TICKS
>             ));
> }
> 
> static void DoRegularFunding(Town *t)
> {
> 	if (_local_company == COMPANY_SPECTATOR)
> 		return;
> 
> 	if (!TownNeedsFunding(t))
> 		return;
> 
> 	/* never fund faster than every TOWN_GROWTH_TICKS */
> 	if (_tick_counter < t->last_funding) {
> 		if (UINT32_MAX - t->last_funding + _tick_counter < TOWN_GROWTH_TICKS) return;
> 	} else if (_tick_counter - t->last_funding < TOWN_GROWTH_TICKS) return;
> 
> 	CompanyID old = _current_company;
> 	_current_company = _local_company;
> 	DoCommandP(t->xy, t->index, HK_FUND, CMD_DO_TOWN_ACTION | CMD_NO_ESTIMATE);
> 	t->last_funding = _tick_counter;
> 	_current_company = old;
> }
> 
> static void DoRegularAdvertising(Town *t) {
> 	if (!HasBit(t->advertise_regularly, _local_company))
> 		return;
> 
> 	if (t->ad_ref_goods_entry == NULL) {
> 		// Pick as ref station and cargo with min rating
> 		for (Station *st : Station::Iterate()) {
> 			if (st->owner == _local_company && DistanceManhattan(t->xy, st->xy) <= 20) {
> 				for (CargoID i = 0; i < NUM_CARGO; i++)
> 					if (st->goods[i].HasRating() && (t->ad_ref_goods_entry == NULL ||
> 					    	t->ad_ref_goods_entry->rating < st->goods[i].rating)) {
> 						t->ad_ref_goods_entry = &st->goods[i];
> 					}
> 			}
> 		}
> 
> 		if (t->ad_ref_goods_entry == NULL)
> 			return;
> 	}
> 
> 	if (t->ad_ref_goods_entry->rating >= t->ad_rating_goal)
> 		return;
> 
> 	// don't advertise faster that once per 30 ticks
> 	if (_tick_counter < t->last_advertisement) {
> 		if (UINT32_MAX - t->last_advertisement + _tick_counter < 30) return;
> 	} else if (_tick_counter - t->last_advertisement < 30) return;
> 	t->last_advertisement = _tick_counter;
> 
>     CompanyID old = _current_company;
>     _current_company = _local_company;
>     DoCommandP(t->xy, t->index, HK_LADVERT, CMD_DO_TOWN_ACTION | CMD_NO_ESTIMATE);
>     _current_company = old;
> }
> 
792a935
> 		uint16 houses_prev = t->cache.num_houses;
802a946,947
> 	DoRegularFunding(t);
> 	DoRegularAdvertising(t);
1479a1625
> 	uint16 prev_houses = t->cache.num_houses;
1485c1631,1634
< 		if (_grow_town_result == GROWTH_SUCCEED) return true;
---
> 		if (_grow_town_result == GROWTH_SUCCEED) {
> 			citymania::Emit(citymania::event::TownGrowthSucceeded{t, tile, prev_houses});
> 			return true;
> 		}
1490c1639,1642
< 		if (cur_rb == ROAD_NONE) return false;
---
> 		if (cur_rb == ROAD_NONE) {
> 			citymania::Emit(citymania::event::TownGrowthFailed{t, tile});
> 			return false;
> 		}
1499c1651,1654
< 				if (cur_rb == ROAD_NONE) return false;
---
> 				if (cur_rb == ROAD_NONE) {
> 					citymania::Emit(citymania::event::TownGrowthFailed{t, tile});
> 					return false;
> 				}
1512a1668
> 				citymania::Emit(citymania::event::TownGrowthFailed{t, tile});
1524a1681
> 	citymania::Emit(citymania::event::TownGrowthFailed{t, tile});
1593a1751
> 					citymania::Emit(citymania::event::TownGrowthSucceeded{t, tile, t->cache.num_houses});
1601a1760
> 	citymania::Emit(citymania::event::TownGrowthFailed{t, tile});
1606a1766
> 	auto prev_tz0 = t->cache.squared_town_zone_radius[0];
1645a1806,1807
>   	if (!_generating_world)
> 		citymania::UpdateTownZoning(t, prev_tz0);
1656a1819,1928
> //CB
> 
> bool CB_Enabled(){
> 	return _cb_enabled;
> }
> void CB_SetCB(bool cb){
> 	_cb_enabled = cb;
> 	if(!_cb_enabled){
> 		CB_ResetRequirements();
> 	}
> }
> 
> uint CB_GetStorage() {
> 	return _cb_storage;
> }
> 
> void CB_SetStorage(uint storage){
> 	_cb_storage = storage;
> }
> 
> void CB_SetRequirements(CargoID cargo, uint req, uint from, uint decay){
> 	CBREQ[cargo] = req;
> 	CBFROM[cargo] = from;
> 	CBDECAY[cargo] = decay;
> }
> void CB_ResetRequirements() {
> 	for(CargoID cargo = 0; cargo < NUM_CARGO; cargo++){
> 		CB_SetRequirements(cargo, 0, 0, 0);
> 	}
> }
> uint CB_GetReq(CargoID cargo){
> 	return CBREQ[cargo];
> }
> uint CB_GetFrom(CargoID cargo){
> 	return CBFROM[cargo];
> }
> uint CB_GetDecay(CargoID cargo){
> 	return CBDECAY[cargo];
> }
> int CB_GetTownReq(uint population, uint req, uint from, bool from_non_important, bool prev_month)
> {
> 	if (req > 0 && (population >= from || from_non_important)) {
> 		uint leap = 0;
> 		Month month = _cur_month;
> 		if (!prev_month) month++;
> 		if(month == 2){
> 			if((_cur_year % 4 == 0 && _cur_year % 100 != 0) || _cur_year % 400 == 0) leap = 1;
> 		}
> 		uint days_this_month = days_in_month[month] + leap;
> 		// x cargo for 1000 people
> 		return population * req * days_this_month / 31000; // 31 days divide by 1000 (pop)
> 	}
> 	return 0;
> }
> uint CB_GetMaxTownStorage(uint32 population, uint req)
> {
> 	return req > 0 ? (population * req * _cb_storage / 1000) : 0;
> }
> 
> uint CB_GetMaxTownStorage(Town *town, uint cargo) {
> 	return CBREQ[cargo] > 0 ? (town->cache.population * CBREQ[cargo] * _cb_storage / 1000) : 0;
> }
> 
> void CB_UpdateTownStorage(Town *t)
> {
> 	// InvalidateWindowData(WC_CB_TOWN, t->index);
> 	// t->growing = true;
> 	// if (!HasBit(t->flags, TOWN_IS_GROWING)) { //dont grow if not funded or missing transportation
> 	// 	t->growing = false;
> 	// }
> 	// for (uint i = 0; i < NUM_CARGO ; i++) {
> 	// 	if(CBREQ[i] == 0) continue;
> 
> 	// 	t->storage[i] += t->new_act_cargo[i]; // add accumulated last month
> 	// 	t->storage[i] -= CB_GetTownReq(t->cache.population, CBREQ[i], CBFROM[i], false, true); //subtract monthly req
> 	// 	t->storage[i] = min((int)CB_GetMaxTownStorage(t->cache.population, CBREQ[i]), t->storage[i]); //check max storage
> 
> 	// 	if (t->storage[i] < 0) {
> 	// 		t->growing = false;
> 	// 		t->delivered_enough[i] = false;
> 	// 		t->storage[i] = 0;
> 	// 	}
> 	// 	else t->delivered_enough[i] = true;
> 
> 	// 	if (CBDECAY[i] == 100 && t->storage[i] > 0) {
> 	// 		t->storage[i] = 0;
> 	// 	}
> 	// 	else {
> 	// 		t->storage[i] *= (100 - CBDECAY[i]);
> 	// 		t->storage[i] /= 100;
> 	// 	}
> 	// 	t->act_cargo[i] = t->new_act_cargo[i];
> 	// 	t->new_act_cargo[i] = 0;
> 	// }
> 
> 	// if (_settings_game.game_creation.landscape == LT_TROPIC) {
> 	// 	if (GetTropicZone(t->xy) == TROPICZONE_DESERT && (t->received[TE_FOOD].old_act <= 0 || t->received[TE_WATER].old_act <= 0) && t->cache.population > 60) {
> 	// 		t->growing = false;
> 	// 	}
> 	// }
> 	// else if (_settings_game.game_creation.landscape == LT_ARCTIC) {
> 	// 	if (TilePixelHeight(t->xy) >= GetSnowLine() && t->received[TE_FOOD].old_act <= 0 && t->cache.population > 90) {
> 	// 		t->growing = false;
> 	// 	}
> 	// }
> }
> //CB
> 
> extern TileIndex _closest_cache_ref;
> 
1696a1969,1983
> 	//CB
> 	t->cb.growth_state = TownGrowthState::NOT_GROWING;
> 	for (uint i = 0; i < NUM_CARGO ; i++) {
> 		t->cb.stored[i] = 0;
> 		t->cb.delivered[i] = 0;
> 		t->cb.required[i] = 0;
> 		t->cb.delivered_last_month[i] = 0;
> 		t->cb.required_last_month[i] = 0;
> 	}
> 	t->fund_regularly = 0;
> 	t->do_powerfund = 0;
> 	t->advertise_regularly = 0;
> 	t->ad_rating_goal = 95;
> 	t->ad_ref_goods_entry = NULL;
> 	//CB
1716a2004
> 	t->town_label = 3;
1737a2026
> 	_closest_cache_ref = INVALID_TILE;
1741a2031
> 	citymania::Emit(citymania::event::TownBuilt{t});
2373c2663
< static bool BuildTownHouse(Town *t, TileIndex tile)
---
> static bool BuildTownHouse(Town *t, TileIndex tile, bool is_rebuilding)
2499a2790
> 		bool completed = false;
2507a2799
> 				completed = true;
2512a2805,2806
> 		citymania::UpdateZoningTownHouses(t, t->cache.num_houses - 1);
> 
2516a2811,2815
> 		if (!_generating_world) {
> 			citymania::Emit(citymania::event::HouseBuilt{t, tile, house, hs, is_rebuilding});
> 			if (completed) citymania::Emit(citymania::event::HouseCompleted{t, tile, house, hs});
> 		}
> 
2578c2877,2878
< 	if (IsHouseCompleted(tile)) {
---
> 	bool is_completed = IsHouseCompleted(tile);
> 	if (is_completed) {
2599a2900,2902
> 	citymania::UpdateZoningTownHouses(t, t->cache.num_houses + 1);
> 
> 	citymania::Emit(citymania::event::HouseCleared{t, tile, house, hs, is_completed});
2744a3048
> 		InvalidateWindowData(WC_CB_TOWN, p1);
3080a3385
> 		SetWindowDirty(WC_CB_TOWN, t->index);
3135a3441
> 				t->UpdateVirtCoord();
3278a3585
> 	t->UpdateVirtCoord();
3366a3674,3675
> 	SetWindowDirty(WC_CB_TOWN, t->index);
> 	t->cm.growing_by_chance = false;
3389a3699
> 		SetWindowDirty(WC_CB_TOWN, t->index);
3393c3703,3706
< 	if (t->fund_buildings_months == 0 && CountActiveStations(t) == 0 && !Chance16(1, 12)) return;
---
> 	if (t->fund_buildings_months == 0 && CountActiveStations(t) == 0) {
> 		if(!Chance16(1, 12)) return;
> 		t->cm.growing_by_chance = true;
> 	}
3396a3710
> 	SetWindowDirty(WC_CB_TOWN, t->index);
3405a3720
> 	SetWindowDirty(WC_CB_TOWN, t->index);
3564a3880
> 		t->UpdateVirtCoord();
3614a3931,3932
> 		if (CB_Enabled() && !t->larger_town) CB_UpdateTownStorage(t); //CB
> 
3618a3937,3938
> 
> 		DoRegularFunding(t);
diff -r -B -X .diff-exclude vanilla/src/town_gui.cpp cmclient/src/town_gui.cpp
18a19
> #include "goal_base.h"
41a43,62
> #include "hotkeys.h"
> #include <list>
> #include "console_func.h"
> 
> #include "citymania/cm_hotkeys.hpp"
> 
> struct CargoX {
> 	int id;
> 	int from;
> };
> void ShowCBTownWindow(uint town);
> static void DrawExtraTownInfo (const Rect &r, uint &y, Town *town, uint line, bool show_house_states_info=false);
> 
> bool TownExecuteAction(const Town *town, uint action){
> 	if(!(action == HK_STATUE && HasBit(town->statues, _current_company))){ //don't built statue when there is one
> 		return DoCommandP(town->xy, town->index, action, CMD_DO_TOWN_ACTION | CMD_MSG(STR_ERROR_CAN_T_DO_THIS));
> 	}
> 	return false;
> }
> 
169a191
> 				SetDParam(3, this->town->ratings[c->index]);
174c196
< 				DrawString(text_left, text_right, y, STR_LOCAL_AUTHORITY_COMPANY_RATING);
---
> 				DrawString(text_left, text_right, y, STR_LOCAL_AUTHORITY_COMPANY_RATING_NUM);
298a321,328
> 
> 	virtual EventState OnHotkey(int hotkey)
> 	{
> 		TownExecuteAction(this->town, hotkey);
> 		return ES_HANDLED;
> 	}
> 
> 	static HotkeyList hotkeys;
300a331,340
> static Hotkey town_hotkeys[] = {
> 	Hotkey((uint16)0, "small_advert", HK_SADVERT),
> 	Hotkey((uint16)0, "medium_advert", HK_MADVERT),
> 	Hotkey(WKC_CTRL | 'D', "large_advert", HK_LADVERT),
> 	Hotkey(WKC_CTRL | 'S', "build_statue", HK_STATUE),
> 	Hotkey(WKC_CTRL | 'F', "fund_buildings", HK_FUND),
> 	HOTKEY_LIST_END
> };
> HotkeyList TownAuthorityWindow::hotkeys("town_gui", town_hotkeys);
> 
305c345,346
< 	_nested_town_authority_widgets, lengthof(_nested_town_authority_widgets)
---
> 	_nested_town_authority_widgets, lengthof(_nested_town_authority_widgets),
> 	&TownAuthorityWindow::hotkeys
312a354,356
> // static int TownTicksToDays(int ticks) {
> //  	return (ticks * TOWN_GROWTH_TICKS + DAY_TICKS / 2) / DAY_TICKS;
> // }
320a365
> 	bool wcb_disable;
336a382,385
> 		// extern bool _novahost;
> 		// this->wcb_disable = !_networking || !_novahost || this->town->larger_town || _game_mode == GM_EDITOR;
> 		// this->wcb_disable = (_game_mode == GM_EDITOR);
> 		this->SetWidgetDisabledState(WID_TV_CB, _game_mode == GM_EDITOR);
346c395,406
< 		if (widget == WID_TV_CAPTION) SetDParam(0, this->town->index);
---
> 		if (widget == WID_TV_CAPTION){
> 			SetDParam(0, this->town->index);
> 		}
> 		if (widget == WID_TV_CB){
> 			// if(this->wcb_disable) SetDParam(0, STR_EMPTY);
> 			// else
> 			SetDParam(0, STR_BUTTON_CB_YES);
> 		}
> 	}
> 
> 	virtual void OnHundrethTick() {
> 		this->SetDirty();
376a437,438
> 		DrawExtraTownInfo(r, y, this->town, FONT_HEIGHT_NORMAL, true); //CB
> 
447c509
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
479a542,546
> 			case WID_TV_CB:
> 				// if(_networking)
> 				ShowCBTownWindow(this->window_number);
> 				break;
> 
491a559,561
> 			// case WID_TV_CB:
> 				// if(this->wcb_disable || !CB_Enabled()) size->width = 0;
> 				// break;
501c571
< 		uint aimed_height = 3 * FONT_HEIGHT_NORMAL + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
---
> 		uint aimed_height = 8 * FONT_HEIGHT_NORMAL + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
564a635,646
> 
> 	virtual EventState OnHotkey(int hotkey)
> 	{
> 		if(hotkey == WID_TV_CB) ShowCBTownWindow(this->window_number);
> 		else if (hotkey == HK_STATUE + 0x80){
> 			TownExecuteAction(this->town, HK_STATUE);
> 			return ES_NOT_HANDLED;
> 		}
> 		return Window::OnHotkey(hotkey);
> 	}
> 
> 	static HotkeyList hotkeys;
566a649,657
> static Hotkey town_window_hotkeys[] = {
> 	Hotkey((uint16)0, "location", WID_TV_CENTER_VIEW),
> 	Hotkey((uint16)0, "local_authority", WID_TV_SHOW_AUTHORITY),
> 	Hotkey((uint16)0, "cb_window", WID_TV_CB),
> 	Hotkey(WKC_CTRL | 'S', "build_statue", HK_STATUE + 0x80),
> 	HOTKEY_LIST_END
> };
> HotkeyList TownViewWindow::hotkeys("town_window", town_window_hotkeys);
> 
582,583c673,674
< 		NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
< 			NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP),
---
> 		NWidget(NWID_HORIZONTAL), //, NC_EQUALSIZE
> 			NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(60, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP),
585c676,677
< 			NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP),
---
> 			NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetMinimalSize(60, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP),
> 			NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CB), SetMinimalSize(20, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_CB, 0),
596c688,689
< 	_nested_town_game_view_widgets, lengthof(_nested_town_game_view_widgets)
---
> 	_nested_town_game_view_widgets, lengthof(_nested_town_game_view_widgets),
> 	&TownViewWindow::hotkeys
618a712
> 			NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CB), SetMinimalSize(20, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_CB, 0),
644c738
< 		NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_TOWN_DIRECTORY_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
---
> 		NWidget(WWT_CAPTION, COLOUR_BROWN, TDW_CAPTION_TEXT), SetDataTip(STR_TOWN_DIRECTORY_CAPTION_EXTRA, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
724a819,836
> 	/** Sort by real population (default descending, as big towns are of the most interest). */
> 	static bool TownRealPopulationSorter(const Town * const &a, const Town * const &b)
> 	{
> 		uint32 a_population = a->cm.real_population;
> 		uint32 b_population = b->cm.real_population;
> 		if (a_population == b_population) return TownDirectoryWindow::TownNameSorter(a, b);
> 		return a_population < b_population;
> 	}
> 
> 	/** Sort by number of houses (default descending, as big towns are of the most interest). */
> 	static bool TownHousesSorter(const Town * const &a, const Town * const &b)
> 	{
> 		uint32 a_houses = a->cache.num_houses;
> 		uint32 b_houses = b->cache.num_houses;
> 		if (a_houses == b_houses) return TownDirectoryWindow::TownPopulationSorter(a, b);
> 		return a_houses < b_houses;
> 	}
> 
774a887,897
> 			case TDW_CAPTION_TEXT: {
> 				uint16 town_number = 0;
> 				uint16 city_number = 0;
> 				for (Town *t : Town::Iterate()) {
> 					if(t->larger_town) city_number++;
> 					town_number++;
> 				}
> 				SetDParam(0, city_number);
> 				SetDParam(1, town_number);
> 				break;
> 			}
826c949,952
< 					DrawString(text_left, text_right, y + (this->resize.step_height - FONT_HEIGHT_NORMAL) / 2, GetTownString(t));
---
> 					SetDParam(2, t->cm.real_population);
> 					SetDParam(3, t->cache.num_houses);
> 					/* CITIES DIFFERENT COLOUR*/
> 					DrawString(text_left, text_right, y + (this->resize.step_height - FONT_HEIGHT_NORMAL) / 2, t->larger_town ? STR_TOWN_DIRECTORY_CITY_COLOUR : STR_TOWN_DIRECTORY_TOWN_COLOUR);
865c991,992
< 					d = maxdim(d, GetStringBoundingBox(GetTownString(t)));
---
> 					SetDParamMaxDigits(2, 5);
> 					d = maxdim(d, GetStringBoundingBox(STR_TOWN_DIRECTORY_TOWN_COLOUR));
915c1042
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
989a1117,1118
> 	STR_SORT_BY_REAL_POPULATION,
> 	STR_SORT_BY_HOUSES,
997a1127,1128
> 	&TownRealPopulationSorter,
> 	&TownHousesSorter,
1172c1303
< 		if (success && !_shift_pressed) this->RandomTownName();
---
> 		if (success && !citymania::_estimate_mod) this->RandomTownName();
1258a1390,1831
> }
> 
> //CB
> static void DrawExtraTownInfo (const Rect &r, uint &y, Town *town, uint line, bool show_house_states_info) {
> 	//real pop and rating
> 	SetDParam(0, town->cm.real_population);
> 	SetDParam(1, town->ratings[_current_company]);
> 	DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += line, STR_TOWN_VIEW_REALPOP_RATE);
> 	//town stats
> 	// int grow_rate = 0;
> 	// if(town->growth_rate == TOWN_GROW_RATE_CUSTOM_NONE) grow_rate = 0;
> 	// else grow_rate = TownTicksToDays((town->growth_rate & ~TOWN_GROW_RATE_CUSTOM) + 1);
> 
> 	SetDParam(0, town->growth_rate);
> 	SetDParam(1, HasBit(town->flags, TOWN_CUSTOM_GROWTH) ? STR_TOWN_VIEW_GROWTH_RATE_CUSTOM : STR_EMPTY);
> 	// SetDParam(2, town->grow_counter < 16000 ? TownTicksToDays(town->grow_counter + 1) : -1);
> 	SetDParam(2, town->grow_counter);
> 	SetDParam(3, town->time_until_rebuild);
> 	SetDParam(4, HasBit(town->flags, TOWN_IS_GROWING) ? 1 : 0);
> 	SetDParam(5, town->fund_buildings_months);
> 	DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += line, STR_TOWN_VIEW_GROWTH);
> 
> 	if (show_house_states_info) {
> 		SetDParam(0, town->cm.houses_constructing);
> 		SetDParam(1, town->cm.houses_reconstructed_last_month);
> 		SetDParam(2, town->cm.houses_demolished_last_month);
> 		DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += line, STR_TOWN_VIEW_HOUSE_STATE);
> 	}
> 
> 	///houses stats
> 	SetDParam(0, town->cm.hs_total);
> 	SetDParam(1, town->cm.hs_last_month);
> 	SetDParam(2, town->cm.cs_total);
> 	SetDParam(3, town->cm.cs_last_month);
> 	SetDParam(4, town->cm.hr_total);
> 	SetDParam(5, town->cm.hr_last_month);
> 	DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += line, STR_TOWN_VIEW_GROWTH_TILES);
> }
> 
> bool CB_sortCargoesByFrom(CargoX first, CargoX second){
> 	return (first.from < second.from) ? true : false;
> }
> 
> struct CBTownWindow : Window {
> private:
> 	Town *town;
> 	std::list<CargoX> cargoes;
> 
> 	enum CBTownWindowPlanes {
> 		CBTWP_MP_GOALS = 0,
> 		CBTWP_MP_CB,
> 	};
> 
> public:
> 	CBTownWindow(WindowDesc *desc, WindowNumber window_number) : Window(desc)
> 	{
> 		for (uint i = 0; i < NUM_CARGO ; i++) {
> 			CargoX c;
> 			c.id = i;
> 			c.from = CB_GetFrom(i);
> 			this->cargoes.push_back(c);
> 		}
> 		cargoes.sort(CB_sortCargoesByFrom);
> 		this->town = Town::Get(window_number);
> 		this->InitNested(window_number);
> 
> 		if(HasBit(this->town->fund_regularly, _local_company)) this->LowerWidget(WID_CB_FUND_REGULAR);
> 		if(HasBit(this->town->do_powerfund, _local_company)) this->LowerWidget(WID_CB_POWERFUND);
> 		if(HasBit(this->town->advertise_regularly, _local_company)) this->LowerWidget(WID_CB_ADVERT_REGULAR);
> 	}
> 
> 	virtual void OnClick(Point pt, int widget, int click_count)
> 	{
> 		switch (widget) {
> 			case WID_CB_LOCATION:
> 			case WID_CB_CENTER_VIEW: // scroll to location
> 				if (citymania::_fn_mod) {
> 					ShowExtraViewPortWindow(this->town->xy);
> 				}
> 				else {
> 					ScrollMainWindowToTile(this->town->xy);
> 				}
> 				break;
> 			case WID_CB_ADVERT:
> 				TownExecuteAction(this->town, HK_LADVERT);
> 				break;
> 			case WID_CB_FUND:
> 				TownExecuteAction(this->town, HK_FUND);
> 				break;
> 			case WID_CB_FUND_REGULAR:
> 				ToggleBit(this->town->fund_regularly, _local_company);
> 				this->SetWidgetLoweredState(widget, HasBit(this->town->fund_regularly, _local_company));
> 				this->SetWidgetDirty(widget);
> 				break;
> 			case WID_CB_POWERFUND:
> 				ToggleBit(this->town->do_powerfund, _local_company);
> 				this->SetWidgetLoweredState(widget, HasBit(this->town->do_powerfund, _local_company));
> 				this->SetWidgetDirty(widget);
> 				break;
> 			case WID_CB_ADVERT_REGULAR:
> 				if (!this->town->advertise_regularly) {
> 					SetDParam(0, ToPercent8(this->town->ad_rating_goal));
> 					ShowQueryString(STR_JUST_INT, STR_CB_ADVERT_REGULAR_RATING_TO_KEEP,
> 					                4, this, CS_NUMERAL, QSF_ACCEPT_UNCHANGED);
> 				} else this->OnQueryTextFinished(NULL);
> 				break;
> 			case WID_CB_TOWN_VIEW: // Town view window
> 				ShowTownViewWindow(this->window_number);
> 				break;
> 			case WID_CB_SHOW_AUTHORITY: // town authority
> 				ShowTownAuthorityWindow(this->window_number);
> 				break;
> 		}
> 	}
> 
> 	virtual void OnQueryTextFinished(char *str)
> 	{
> 		if (str != NULL) SetBit(this->town->advertise_regularly, _local_company);
> 		else ClrBit(this->town->advertise_regularly, _local_company);
> 		this->town->ad_ref_goods_entry = NULL;
> 		this->SetWidgetLoweredState(WID_CB_ADVERT_REGULAR, HasBit(this->town->advertise_regularly, _local_company));
> 		this->SetWidgetDirty(WID_CB_ADVERT_REGULAR);
> 
> 		if (str == NULL)
> 			return;
> 		uint val = Clamp(StrEmpty(str) ? 0 : strtol(str, NULL, 10), 1, 100);
> 		this->town->ad_rating_goal = ((val << 8) + 255) / 101;
> 	}
> 
> 	virtual void SetStringParameters(int widget) const
> 	{
> 		if (widget == WID_TV_CAPTION){
> 			SetDParam(0, this->town->index);
> 		}
> 	}
> 
> 	const Company *GetCompany() const {
> 		for (Company *c : Company::Iterate()) {
> 			if (c->location_of_HQ != INVALID_TILE
> 			    	&& DistanceMax(c->location_of_HQ, this->town->xy) < 11)
> 				return c;
> 		}
> 		return nullptr;
> 	}
> 
> 	void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
> 	{
> 		static const uint EXP_TOPPADDING = 5;
> 		static const uint EXP_LINESPACE  = 2; // Amount of vertical space for a horizontal (sub-)total line.
> 
> 		switch(widget){
> 			case WID_CB_DETAILS:
> 				size->height = (FONT_HEIGHT_NORMAL + EXP_LINESPACE) * 5;
> 				break;
> 			case WID_CB_GOALS: {
> 				uint desired_height = 0;
> 				auto company = GetCompany();
> 				if (company) {
> 					for(const Goal *g : Goal::Iterate()) {
> 						if (g->company == company->index) {
> 							desired_height++;
> 						}
> 					}
> 				}
> 				if (desired_height > 0)
> 					size->height = desired_height * (FONT_HEIGHT_NORMAL + EXP_LINESPACE) + EXP_TOPPADDING - EXP_LINESPACE;
> 				break;
> 			}
> 			case WID_CB_CARGO_NAME:
> 			case WID_CB_CARGO_AMOUNT:
> 			case WID_CB_CARGO_REQ:
> 			case WID_CB_CARGO_STORE:
> 			case WID_CB_CARGO_STORE_PCT:
> 			case WID_CB_CARGO_FROM:
> 			case WID_CB_CARGO_PREVIOUS: {
> 				uint desired_height = 0;
> 				for(CargoID cargo = 0; cargo < NUM_CARGO; cargo++){
> 					if(CB_GetReq(cargo) > 0) desired_height++;
> 				}
> 				if (desired_height > 0)
> 					size->height = desired_height * (FONT_HEIGHT_NORMAL + EXP_LINESPACE) + EXP_TOPPADDING - EXP_LINESPACE;
> 				break;
> 			}
> 		}
> 	}
> 
> 	void DrawWidget(const Rect &r, int widget) const
> 	{
> 		static const uint EXP_LINESPACE  = FONT_HEIGHT_NORMAL + 2;
> 		uint y = r.top + WD_FRAMERECT_TOP;
> 		switch(widget){
> 			case WID_CB_DETAILS:{
> 				//growing
> 				if(this->town->cb.growth_state == TownGrowthState::GROWING) DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y, STR_TOWN_CB_GROWING );
> 				else DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y, STR_TOWN_CB_NOT_GROWING );
> 				//population
> 				SetDParam(0, this->town->cache.population);
> 				SetDParam(1, this->town->cache.num_houses);
> 				DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += EXP_LINESPACE, STR_TOWN_VIEW_POPULATION_HOUSES);
> 
> 				DrawExtraTownInfo(r, y, this->town, EXP_LINESPACE, false);
> 				//regular funding
> 				if(this->town->fund_regularly != 0){
> 					DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += EXP_LINESPACE, STR_CB_FUNDED_REGULARLY);
> 				}
> 				break;
> 			}
> 			case WID_CB_GOALS: {
> 				auto company = GetCompany();
> 				if (!company) break;
> 				for(const Goal *g : Goal::Iterate()) {
> 					if (g->company != company->index)
> 						continue;
> 					SetDParamStr(0, g->text);
> 					DrawString(r.left + WD_FRAMERECT_LEFT,
> 					           r.right - WD_FRAMERECT_RIGHT,
> 					           y, STR_GOALS_TEXT);
> 					y += EXP_LINESPACE;
> 				}
> 				break;
> 			}
> 			/* Citybuilder things*/
> 			case WID_CB_CARGO_NAME:
> 			case WID_CB_CARGO_AMOUNT:
> 			case WID_CB_CARGO_REQ:
> 			case WID_CB_CARGO_STORE:
> 			case WID_CB_CARGO_STORE_PCT:
> 			case WID_CB_CARGO_FROM:
> 			case WID_CB_CARGO_PREVIOUS: {
> 				if (this->town->larger_town) break;
> 				uint delivered;
> 				uint requirements;
> 				uint from;
> 				StringID string_to_draw;
> 
> 				//for cycle
> 				std::list<CargoX> cargoes2 = this->cargoes;
> 				std::list<CargoX>::iterator it2;
> 				for (it2 = cargoes2.begin(); it2 != cargoes2.end(); ++it2) {
> 					CargoX cargox;
> 					cargox = *it2;
> 					if (it2 == cargoes2.begin()) { //header
> 						DrawString(r.left + WD_FRAMERECT_LEFT + 14, r.right - WD_FRAMERECT_LEFT, y,
> 							(STR_TOWN_GROWTH_HEADER_CARGO + widget - WID_CB_CARGO_NAME), TC_FROMSTRING,
> 							(widget == WID_CB_CARGO_NAME) ? SA_LEFT : SA_RIGHT);
> 
> 						y += (FONT_HEIGHT_NORMAL + 2);
> 					}
> 
> 					const CargoSpec *cargos = CargoSpec::Get(cargox.id);
> 					//cargo needed?
> 					if (!cargos->IsValid() || CB_GetReq(cargos->Index()) == 0) continue;
> 
> 					from = CB_GetFrom(cargos->Index());
> 
> 					switch(widget) {
> 						case WID_CB_CARGO_NAME: {
> 							int rect_x = (r.left + WD_FRAMERECT_LEFT);
> 							GfxFillRect(rect_x, y + 1, rect_x + 8, y + 6, 0);
> 							GfxFillRect(rect_x + 1, y + 2, rect_x + 7, y + 5, cargos->legend_colour);
> 
> 							SetDParam(0, cargos->name);
> 							DrawString(r.left + WD_FRAMERECT_LEFT + 14, r.right - WD_FRAMERECT_LEFT, y, STR_TOWN_CB_CARGO_NAME);
> 							break;
> 						}
> 						case WID_CB_CARGO_AMOUNT: {
> 							delivered = this->town->cb.delivered[cargos->Index()];
> 							requirements = CB_GetTownReq(this->town->cache.population, CB_GetReq(cargos->Index()), from, true);
> 							SetDParam(0, delivered);
> 
> 							//when required
> 							if (this->town->cache.population >= from) {
> 								if((delivered + (uint)this->town->cb.stored[cargos->Index()]) >= requirements) string_to_draw = STR_TOWN_CB_CARGO_AMOUNT_GOOD;
> 								else string_to_draw = STR_TOWN_CB_CARGO_AMOUNT_BAD;
> 							}
> 							//when not required -> all faded
> 							else string_to_draw = STR_TOWN_CB_CARGO_AMOUNT_NOT;
> 
> 							DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y, string_to_draw, TC_FROMSTRING, SA_RIGHT);
> 							break;
> 						}
> 						case WID_CB_CARGO_REQ: {
> 							requirements = CB_GetTownReq(this->town->cache.population, CB_GetReq(cargos->Index()), from, true);
> 							SetDParam(0, requirements);
> 							 //when required
> 							string_to_draw = (this->town->cache.population >= from) ? STR_TOWN_CB_CARGO_REQ_YES : STR_TOWN_CB_CARGO_REQ_NOT;
> 							DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y, string_to_draw, TC_FROMSTRING, SA_RIGHT);
> 							break;
> 						}
> 						case WID_CB_CARGO_PREVIOUS: {
> 							requirements = CB_GetTownReq(this->town->cache.population, CB_GetReq(cargos->Index()), from, true);
> 							SetDParam(0, this->town->cb.delivered_last_month[cargos->Index()]);
> 							if (this->town->cache.population >= from){
> 								// if (this->town->delivered_enough[cargos->Index()]) {
> 									string_to_draw = (this->town->cb.delivered_last_month[cargos->Index()] >= requirements) ? STR_TOWN_CB_CARGO_PREVIOUS_YES : STR_TOWN_CB_CARGO_PREVIOUS_EDGE;
> 								// }
> 								// else string_to_draw = STR_TOWN_CB_CARGO_PREVIOUS_BAD;
> 							}
> 							else string_to_draw = STR_TOWN_CB_CARGO_PREVIOUS_NOT;
> 
> 							DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y, string_to_draw, TC_FROMSTRING, SA_RIGHT);
> 							break;
> 						}
> 						case WID_CB_CARGO_STORE: {
> 							SetDParam(0, this->town->cb.stored[cargos->Index()]);
> 							if (CB_GetDecay(cargos->Index()) == 100) string_to_draw = STR_TOWN_CB_CARGO_STORE_DECAY;  //when 100% decay
> 							else {
> 								if (this->town->cache.population >= from) string_to_draw = STR_TOWN_CB_CARGO_STORE_YES;  //when required
> 								else string_to_draw = STR_TOWN_CB_CARGO_STORE_NOT;
> 							}
> 
> 							DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y, string_to_draw, TC_FROMSTRING, SA_RIGHT);
> 							break;
> 						}
> 						case WID_CB_CARGO_STORE_PCT: {
> 							uint max_storage = CB_GetMaxTownStorage(this->town, cargos->Index());
> 							if (CB_GetDecay(cargos->Index()) == 100 || !max_storage) string_to_draw = STR_TOWN_CB_CARGO_STORE_DECAY;  //when 100% decay
> 							else {
> 								SetDParam(0, 100 * this->town->cb.stored[cargos->Index()] / max_storage);
> 								if (this->town->cache.population >= from) string_to_draw = STR_TOWN_CB_CARGO_STORE_PCT_YES;  //when required
> 								else string_to_draw = STR_TOWN_CB_CARGO_STORE_PCT_NOT;
> 							}
> 
> 							DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y, string_to_draw, TC_FROMSTRING, SA_RIGHT);
> 							break;
> 						}
> 						case WID_CB_CARGO_FROM: {
> 							SetDParam(0, from);
> 							string_to_draw = (this->town->cache.population >= from) ? STR_TOWN_CB_CARGO_FROM_YES : STR_TOWN_CB_CARGO_FROM_NOT; //when required
> 
> 							DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, string_to_draw, TC_FROMSTRING, SA_RIGHT);
> 							break;
> 						}
> 						//last case
> 					}
> 					//switch
> 					y += (FONT_HEIGHT_NORMAL + 2);
> 					//cargo needed?
> 				}
> 				//for cycle
> 			}
> 			break;
> 		}
> 		/* Citybuilder things enabled*/
> 	}
> 
> 	virtual void OnPaint() {
> 		if (!this->IsShaded()) {
> 			int plane = CB_Enabled() ? CBTWP_MP_CB : CBTWP_MP_GOALS;
> 			NWidgetStacked *wi = this->GetWidget<NWidgetStacked>(WID_CB_SELECT_REQUIREMENTS);
> 			if (plane != wi->shown_plane) {
> 				wi->SetDisplayedPlane(plane);
> 				this->InvalidateData();
> 				return;
> 			}
> 		}
> 		this->DrawWidgets();
> 	}
> 
> 
> 	virtual EventState OnHotkey(int hotkey)
> 	{
> 		TownExecuteAction(this->town, hotkey);
> 		return ES_HANDLED;
> 	}
> 
> 	static HotkeyList hotkeys;
> };
> 
> HotkeyList CBTownWindow::hotkeys("town_gui", town_hotkeys);
> 
> static const NWidgetPart _nested_cb_town_widgets[] = {
> 	NWidget(NWID_HORIZONTAL),
> 		NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
> 		NWidget(WWT_CAPTION, COLOUR_BROWN, WID_TV_CAPTION), SetDataTip(STR_TOWN_VIEW_CB_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
> 		NWidget(WWT_SHADEBOX, COLOUR_BROWN),
> 		NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),
> 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
> 	EndContainer(),
> 	NWidget(WWT_PANEL, COLOUR_BROWN),
> 		NWidget(NWID_VERTICAL),
> 			NWidget(NWID_SPACER), SetMinimalSize(0, 5),  SetResize(1, 0), SetFill(1, 0),
> 			NWidget(NWID_HORIZONTAL),
> 				NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_DETAILS), SetMinimalSize(66, 0), SetResize(1, 0), SetFill(1, 0),
> 				NWidget(NWID_VERTICAL),
> 					NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
> 						NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CB_ADVERT),SetMinimalSize(33, 12),SetFill(1, 0), SetDataTip(STR_CB_LARGE_ADVERTISING_CAMPAIGN, 0),
> 						NWidget(NWID_SPACER), SetMinimalSize(2, 0),
> 						NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CB_FUND),SetMinimalSize(33, 12),SetFill(1, 0), SetDataTip(STR_CB_NEW_BUILDINGS, 0),
> 						NWidget(NWID_SPACER), SetMinimalSize(4, 0),
> 					EndContainer(),
> 					NWidget(NWID_SPACER), SetMinimalSize(0, 2),
> 					NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
> 						NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_CB_ADVERT_REGULAR),SetMinimalSize(33, 12),SetFill(1, 0), SetDataTip(STR_CB_ADVERT_REGULAR, STR_CB_ADVERT_REGULAR_TT),
>  						NWidget(NWID_SPACER), SetMinimalSize(2, 0),
> 						NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_CB_FUND_REGULAR),SetMinimalSize(33, 12),SetFill(1, 0), SetDataTip(STR_CB_FUND_REGULAR, STR_CB_FUND_REGULAR_TT),
> 						NWidget(NWID_SPACER), SetMinimalSize(4, 0),
> 					EndContainer(),
> 					NWidget(NWID_SPACER), SetMinimalSize(0, 2),
> 					NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
>   						NWidget(NWID_SPACER), SetMinimalSize(33, 0), SetFill(1, 0),
>   						NWidget(NWID_SPACER), SetMinimalSize(2, 0),
> 						NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_CB_POWERFUND),SetMinimalSize(33, 12),SetFill(1, 0), SetDataTip(STR_CB_POWERFUND, STR_CB_POWERFUND_TT),
> 						NWidget(NWID_SPACER), SetMinimalSize(4, 0),
> 					EndContainer(),
> 				EndContainer(),
> 			EndContainer(),
> 			NWidget(NWID_SPACER), SetMinimalSize(0, 5),  SetResize(1, 0), SetFill(1, 0),
> 			NWidget(NWID_SELECTION, INVALID_COLOUR, WID_CB_SELECT_REQUIREMENTS),
> 				NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_GOALS),SetMinimalSize(50 + 35 + 35 + 40 + 35 + 30, 0), SetResize(1, 0), SetFill(1, 0),
> 				NWidget(NWID_HORIZONTAL),
> 					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_NAME),SetMinimalSize(50, 0), SetResize(0, 0), SetFill(1, 0),
> 					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_AMOUNT),SetMinimalSize(35, 0), SetResize(1, 0), SetFill(0, 0),
> 					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_REQ),SetMinimalSize(35, 0), SetResize(1, 0), SetFill(0, 0),
> 					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_PREVIOUS),SetMinimalSize(40, 0),  SetResize(1, 0), SetFill(0, 0),
> 					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_STORE),SetMinimalSize(35, 0), SetResize(1, 0), SetFill(0, 0),
> 					NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CB_CARGO_STORE_PCT),SetMinimalSize(30, 0), SetResize(1, 0), SetFill(0, 0),
> 				EndContainer(),
> 			EndContainer(),
> 			NWidget(NWID_SPACER), SetMinimalSize(0, 0), SetResize(1, 0), SetFill(1, 1),
> 		EndContainer(),
> 	EndContainer(),
> 	NWidget(NWID_HORIZONTAL),
> 		NWidget(NWID_HORIZONTAL),
> 			NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CB_CENTER_VIEW), SetMinimalSize(30, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP),
> 			NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CB_TOWN_VIEW), SetMinimalSize(40, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_CB_GUI_TOWN_VIEW_BUTTON, STR_CB_GUI_TOWN_VIEW_TOOLTIP),
> 			NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CB_SHOW_AUTHORITY), SetMinimalSize(40, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON, STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP),
> 		EndContainer(),
> 		NWidget(WWT_RESIZEBOX, COLOUR_BROWN),
> 	EndContainer(),
> };
> 
> static WindowDesc _cb_town_desc(
> 	WDP_AUTO, "cb_town", 160, 30,
> 	WC_CB_TOWN, WC_NONE,
> 	0,
> 	_nested_cb_town_widgets, lengthof(_nested_cb_town_widgets),
> 	&CBTownWindow::hotkeys
> );
> 
> void ShowCBTownWindow(uint town) {
> 	AllocateWindowDescFront<CBTownWindow>(&_cb_town_desc, town);
diff -r -B -X .diff-exclude vanilla/src/town.h cmclient/src/town.h
15a16,19
> #include "station_base.h"
> #include "openttd.h"
> #include "table/strings.h"
> #include "company_func.h"
18a23,25
> #include <map>
> 
> #include "citymania/extensions/cmext_town.hpp"
48a56,77
> enum class TownGrowthState: uint8 {
>     NOT_GROWING = 0,
>     GROWING = 1,
>     SHRINKING = 2,
> };
> 
> struct CBTownInfo {
> 	uint32 pax_delivered;
> 	uint32 mail_delivered;
> 	uint32 pax_delivered_last_month;
> 	uint32 mail_delivered_last_month;
> 	TownGrowthState growth_state;
> 	uint8 shrink_effeciency;
> 	uint16 shrink_rate;
> 	uint16 shrink_counter;
> 	uint32 stored[NUM_CARGO];
> 	uint32 delivered[NUM_CARGO];
> 	uint32 required[NUM_CARGO];
> 	uint32 delivered_last_month[NUM_CARGO];
> 	uint32 required_last_month[NUM_CARGO];
> };
> 
78a108,117
> 	StringID town_label;                ///< Label dependent on _local_company rating.
> 	CBTownInfo cb;
> 	CompanyMask fund_regularly;          ///< funds buildings regularly when previous fund ends
> 	CompanyMask do_powerfund;            ///< funds buildings when grow counter is maximal (results in fastest funding possible)
> 	uint32 last_funding = 0;             ///< when town was funded the last time
> 	CompanyMask advertise_regularly;     ///< advertised regularly to keep stations rating on desired value
> 	uint32 last_advertisement = 0;
> 	uint8 ad_rating_goal;                ///< value to keep rating at (for regular advertisement) (0..255)
> 	const GoodsEntry *ad_ref_goods_entry;      ///< poiter to goods entry of some station, used to check rating for regular advertisement
> 
99a139,140
> 	citymania::ext::Town cm;
> 
110a152,177
> 	void UpdateLabel();
> 
> 	/* Returns the correct town label, based on rating. */
> 	//FORCEINLINE StringID Label() const{
> 	StringID Label() const{
> 		if (!_settings_client.gui.population_in_label)
> 			return STR_VIEWPORT_TOWN;
> 		if (!(_game_mode == GM_EDITOR) && (_local_company < MAX_COMPANIES)) {
> 			return STR_VIEWPORT_TOWN_POP_VERY_POOR_RATING + this->town_label;
> 		}
> 		else {
> 			return STR_VIEWPORT_TOWN_POP;
> 		}
> 	}
> 
> 	/* Returns the correct town small label, based on rating. */
> 	//FORCEINLINE StringID SmallLabel() const{
> 	StringID SmallLabel() const{
> 		if (!(_game_mode == GM_EDITOR) && (_local_company < MAX_COMPANIES)) {
> 			return STR_VIEWPORT_TOWN_TINY_VERY_POOR_RATING + this->town_label;
> 		}
> 		else {
> 			return STR_VIEWPORT_TOWN_TINY_WHITE;
> 		}
> 	}
> 
206a274,286
> 
> bool CB_Enabled();
> void CB_SetCB(bool cb);
> uint CB_GetStorage();
> void CB_SetStorage(uint storage);
> void CB_SetRequirements(CargoID cargo, uint req, uint from, uint decay);
> void CB_ResetRequirements();
> uint CB_GetReq(CargoID cargo);
> uint CB_GetFrom(CargoID cargo);
> uint CB_GetDecay(CargoID cargo);
> int CB_GetTownReq(uint population, uint req, uint from, bool from_non_important, bool prev_month = false);
> uint CB_GetMaxTownStorage(Town *town, uint cargo);
> bool TownExecuteAction(const Town *town, uint action);
diff -r -B -X .diff-exclude vanilla/src/train_cmd.cpp cmclient/src/train_cmd.cpp
3897c3897
< 	PerformanceAccumulator framerate(PFE_GL_TRAINS);
---
> //	PerformanceAccumulator framerate(PFE_GL_TRAINS);
4019a4020,4023
> }
> 
> namespace citymania {
> 	auto GetDefaultTrainSprite = &::GetDefaultTrainSprite;
diff -r -B -X .diff-exclude vanilla/src/transparency_gui.cpp cmclient/src/transparency_gui.cpp
20a21,22
> #include "citymania/cm_hotkeys.hpp"
> 
73c75
< 			if (_ctrl_pressed) {
---
> 			if (citymania::_fn_mod) {
diff -r -B -X .diff-exclude vanilla/src/tree_cmd.cpp cmclient/src/tree_cmd.cpp
29a30,31
> #include "citymania/cm_highlight.hpp"
> 
509a512,513
> 	PaletteID shade_pal = citymania::GetTreeShadePal(ti->tile);
> 
524c528
< 		AddSortableSpriteToDraw(te[mi].sprite, te[mi].pal, ti->x + te[mi].x, ti->y + te[mi].y, 16 - te[mi].x, 16 - te[mi].y, 0x30, z, IsTransparencySet(TO_TREES), -te[mi].x, -te[mi].y);
---
> 		AddSortableSpriteToDraw(te[mi].sprite, te[mi].pal != PAL_NONE ? te[mi].pal : shade_pal, ti->x + te[mi].x, ti->y + te[mi].y, 16 - te[mi].x, 16 - te[mi].y, 0x30, z, IsTransparencySet(TO_TREES), -te[mi].x, -te[mi].y);
diff -r -B -X .diff-exclude vanilla/src/vehicle_gui.cpp cmclient/src/vehicle_gui.cpp
38a39,41
> #include "hotkeys.h"
> 
> #include "citymania/cm_hotkeys.hpp"
901c904
< 					if (_ctrl_pressed) this->num_vehicles = UINT8_MAX;
---
> 					if (citymania::_fn_mod) this->num_vehicles = UINT8_MAX;
924c927
< 				if (!_ctrl_pressed) {
---
> 				if (!citymania::_fn_mod) {
1629c1632
< 					if (_ctrl_pressed) {
---
> 					if (citymania::_fn_mod) {
1750c1753
< 	 * if _ctrl_pressed, do the opposite action (Advanced list x Normal list)
---
> 	 * if citymania::_fn_mod, do the opposite action (Advanced list x Normal list)
1753c1756
< 	if ((_settings_client.gui.advanced_vehicle_list > (uint)(company != _local_company)) != _ctrl_pressed) {
---
> 	if ((_settings_client.gui.advanced_vehicle_list > (uint)(company != _local_company)) != citymania::_fn_mod) {
2175c2178
< 				int mod = _ctrl_pressed ? 5 : 10;
---
> 				int mod = citymania::_fn_mod ? 5 : 10;
2308,2314d2310
< /** Vehicle view window descriptor for all vehicles but trains. */
< static WindowDesc _vehicle_view_desc(
< 	WDP_AUTO, "view_vehicle", 250, 116,
< 	WC_VEHICLE_VIEW, WC_NONE,
< 	0,
< 	_nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets)
< );
2316,2325d2311
< /**
<  * Vehicle view window descriptor for trains. Only minimum_height and
<  *  default_height are different for train view.
<  */
< static WindowDesc _train_view_desc(
< 	WDP_AUTO, "view_vehicle_train", 250, 134,
< 	WC_VEHICLE_VIEW, WC_NONE,
< 	0,
< 	_nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets)
< );
2418a2405,2415
> void CcCloneVehicleWithOrderIndex(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
> {
> 	if (result.Failed()) return;
> 	if (p2 != 1) CcCloneVehicle(result, tile, p1, p2, cmd);
> 	Vehicle *cloned = Vehicle::GetIfValid(p1);
> 	if (!cloned || !cloned->IsPrimaryVehicle()) return;
> 	const Vehicle *v = Vehicle::Get(_new_vehicle_id);
> 	if (cloned->cur_implicit_order_index == v->cur_implicit_order_index) return;
> 	DoCommandP(v->tile, v->index, cloned->cur_implicit_order_index, CMD_SKIP_TO_ORDER);
> }
> 
2673c2670
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
2685c2682
< 				if (_ctrl_pressed && mainwindow->viewport->zoom <= ZOOM_LVL_OUT_4X) {
---
> 				if (citymania::_fn_mod && mainwindow->viewport->zoom <= ZOOM_LVL_OUT_4X) {
2694c2691
< 				DoCommandP(v->tile, v->index | (_ctrl_pressed ? DEPOT_SERVICE : 0U), 0, GetCmdSendToDepot(v));
---
> 				DoCommandP(v->tile, v->index | (citymania::_fn_mod ? DEPOT_SERVICE : 0U), 0, GetCmdSendToDepot(v));
2700c2697
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
2707c2704
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
2718c2715
< 				DoCommandP(v->tile, v->index, _ctrl_pressed ? 1 : 0,
---
> 				DoCommandP(v->tile, v->index, citymania::_fn_mod ? 1 : 0,
2720c2717
< 										_ctrl_pressed ? nullptr : CcCloneVehicle);
---
> 										CcCloneVehicleWithOrderIndex);
2791a2789,2796
> 
> 	virtual EventState OnHotkey(int hotkey)
> 	{
> 		if (this->owner != _local_company) return ES_NOT_HANDLED;
> 		return Window::OnHotkey(hotkey);
> 	}
> 
> 	static HotkeyList hotkeys;
2793a2799,2827
> static Hotkey vehiclegui_hotkeys[] = {
> 	Hotkey('G', "vehicle_orders", WID_VV_SHOW_ORDERS),
> 	Hotkey('F', "vehicle_go", WID_VV_START_STOP),
> 	Hotkey((uint16)0, "vehicle_refit", WID_VV_REFIT),
> 	Hotkey((uint16)0, "vehicle_clone", WID_VV_CLONE),
> 	HOTKEY_LIST_END
> };
> HotkeyList VehicleViewWindow::hotkeys("vehiclegui", vehiclegui_hotkeys);
> 
> /** Vehicle view window descriptor for all vehicles but trains. */
> static WindowDesc _vehicle_view_desc(
> 	WDP_AUTO, "view_vehicle", 250, 116,
> 	WC_VEHICLE_VIEW, WC_NONE,
> 	0,
> 	_nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets),
> 	&VehicleViewWindow::hotkeys
> );
> 
> /**
>  * Vehicle view window descriptor for trains. Only minimum_height and
>  *  default_height are different for train view.
>  */
> static WindowDesc _train_view_desc(
> 	WDP_AUTO, "view_vehicle_train", 250, 134,
> 	WC_VEHICLE_VIEW, WC_NONE,
> 	0,
> 	_nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets),
> 	&VehicleViewWindow::hotkeys
> );
2840a2875,2877
> 
> 	if (_settings_client.gui.cm_open_orders_for_new_vehicles)
> 		ShowOrdersWindow(v);
diff -r -B -X .diff-exclude vanilla/src/video/allegro_v.cpp cmclient/src/video/allegro_v.cpp
30a31,32
> #include "../../citymania/cm_hotkeys.hpp"
> 
511c513,514
< 			if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
---
> 			// CM if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
> 			citymania::UpdateModKeys(_shift_pressed, _ctrl_pressed, _alt_pressed);
diff -r -B -X .diff-exclude vanilla/src/video/cocoa/event.mm cmclient/src/video/cocoa/event.mm
39a40,41
> #include "../../citymania/cm_hotkeys.hpp"
> 
700c702,703
< 			if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
---
> 			// CM if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
> 			citymania::UpdateModKeys(_shift_pressed, _ctrl_pressed, _alt_pressed);
diff -r -B -X .diff-exclude vanilla/src/video/sdl2_v.cpp cmclient/src/video/sdl2_v.cpp
30a31,32
> #include "../citymania/cm_hotkeys.hpp"
> 
744a747
> 			_alt_pressed = !!(mod & KMOD_ALT);
752c755,756
< 			if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
---
> 			// CM if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
> 			citymania::UpdateModKeys(_shift_pressed, _ctrl_pressed, _alt_pressed);
diff -r -B -X .diff-exclude vanilla/src/video/sdl_v.cpp cmclient/src/video/sdl_v.cpp
29a30,31
> #include "../../citymania/cm_hotkeys.hpp"
> 
466c468,476
< 	AS(SDLK_PERIOD,  WKC_PERIOD)
---
> 	AS(SDLK_PERIOD,  WKC_PERIOD),
> 
> 	AS(0x7B,            WKC_L_BRACE),
> 	AS(0x7D,            WKC_R_BRACE),
> 	AS(SDLK_LEFTPAREN,  WKC_L_PAREN),
> 	AS(SDLK_RIGHTPAREN, WKC_R_PAREN),
> 	AS(SDLK_PLUS,       WKC_PLUS),
> 	AS(SDLK_EXCLAIM,    WKC_EXCLAIM),
> 	AS(SDLK_ASTERISK,   WKC_ASTERISK),
726a737
> 			_alt_pressed = !!(mod & KMOD_ALT);
742c753,754
< 			if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
---
> 			// CM if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
> 			citymania::UpdateModKeys(_shift_pressed, _ctrl_pressed, _alt_pressed);
diff -r -B -X .diff-exclude vanilla/src/video/win32_v.cpp cmclient/src/video/win32_v.cpp
31a32,33
> #include "../citymania/cm_hotkeys.hpp"
> 
1241a1244
> 			_alt_pressed = _wnd.has_focus && GetAsyncKeyState(VK_MENU)<0;
1255c1258,1259
< 			if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
---
> 			// CM if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
> 			citymania::UpdateModKeys(_shift_pressed, _ctrl_pressed, _alt_pressed);
diff -r -B -X .diff-exclude vanilla/src/viewport.cpp cmclient/src/viewport.cpp
63a64,66
> #include "math.h"
> #include "core/math_func.hpp"
> #include "core/smallvec_type.hpp"
86c89
< #include "bridge_map.h"
---
> #include "tunnelbridge_map.h"
91a95
> #include <forward_list>
92a97
> #include <stack>
95a101,105
> #include "zoning.h"
> #include "industry_type.h"
> 
> #include "citymania/cm_highlight.hpp"
> #include "citymania/cm_hotkeys.hpp"
159a170,191
> /**
>  * Snapping point for a track.
>  *
>  * Point where a track (rail/road/other) can be snapped to while selecting tracks with polyline
>  * tool (HT_POLY). Besides of x/y coordinates expressed in tile "units" it contains a set of
>  * allowed line directions.
>  */
> struct LineSnapPoint : Point {
> 	uint8 dirs; ///< Allowed line directions, set of #Direction bits.
> };
> 
> typedef std::vector<LineSnapPoint> LineSnapPoints; ///< Set of snapping points
> 
> /** Coordinates of a polyline track made of 2 connected line segments. */
> struct RailPolyline {
> 	Point start;           ///< The point where the first segment starts (as given in LineSnapPoint).
> 	Direction first_dir;   ///< Direction of the first line segment.
> 	uint first_len;        ///< Length of the first segment - number of track pieces.
> 	Direction second_dir;  ///< Direction of the second line segment.
> 	uint second_len;       ///< Length of the second segment - number of track pieces.
> };
> 
177a210,211
> 
> 	citymania::TileHighlight cm_highlight;
190a225,232
> static RailSnapMode _rail_snap_mode = RSM_NO_SNAP; ///< Type of rail track snapping (polyline tool).
> static LineSnapPoints _tile_snap_points; ///< Tile to which a rail track will be snapped to (polyline tool).
> static LineSnapPoints _rail_snap_points; ///< Set of points where a rail track will be snapped to (polyline tool).
> static LineSnapPoint _current_snap_lock; ///< Start point and direction at which selected track is locked on currently (while dragging in polyline mode).
> 
> static TileIndex GetRailSnapTile();
> static void SetRailSnapTile(TileIndex tile);
> 
523c565
< static void AddChildSpriteToFoundation(SpriteID image, PaletteID pal, const SubSprite *sub, FoundationPart foundation_part, int extra_offs_x, int extra_offs_y)
---
> void AddChildSpriteToFoundation(SpriteID image, PaletteID pal, const SubSprite *sub, FoundationPart foundation_part, int extra_offs_x, int extra_offs_y)
556c598
< 
---
> 	if (_vd.cm_highlight.ground_pal) pal = _vd.cm_highlight.ground_pal;
664a707,708
> 	if (_vd.cm_highlight.structure_pal) pal = _vd.cm_highlight.structure_pal;
> 
731d774
< 	ps.comparison_done = false;
789c832
<  * Checks whether a point is inside the selected a diagonal rectangle given by _thd.size and _thd.pos
---
>  * Checks whether a point is inside the selected rectangle given by _thd.size, _thd.pos and _thd.diagonal
794c837
< bool IsInsideRotatedRectangle(int x, int y)
---
> bool IsInsideSelectedRectangle(int x, int y)
795a839,842
> 	if (!_thd.diagonal) {
> 		return IsInsideBS(x, _thd.pos.x, _thd.size.x) && IsInsideBS(y, _thd.pos.y, _thd.size.y);
> 	}
> 
873c920
< static void DrawSelectionSprite(SpriteID image, PaletteID pal, const TileInfo *ti, int z_offset, FoundationPart foundation_part)
---
> void DrawSelectionSprite(SpriteID image, PaletteID pal, const TileInfo *ti, int z_offset, FoundationPart foundation_part)
914c961
< static bool IsPartOfAutoLine(int px, int py)
---
> static HighLightStyle GetPartOfAutoLine(int px, int py, const Point &selstart, const Point &selend, HighLightStyle dir)
916,917c963,964
< 	px -= _thd.selstart.x;
< 	py -= _thd.selstart.y;
---
> 	if (!IsInRangeInclusive(selstart.x & ~TILE_UNIT_MASK, selend.x & ~TILE_UNIT_MASK, px)) return HT_DIR_END;
> 	if (!IsInRangeInclusive(selstart.y & ~TILE_UNIT_MASK, selend.y & ~TILE_UNIT_MASK, py)) return HT_DIR_END;
919c966,967
< 	if ((_thd.drawstyle & HT_DRAG_MASK) != HT_LINE) return false;
---
> 	px -= selstart.x & ~TILE_UNIT_MASK;
> 	py -= selstart.y & ~TILE_UNIT_MASK;
921,929c969,976
< 	switch (_thd.drawstyle & HT_DIR_MASK) {
< 		case HT_DIR_X:  return py == 0; // x direction
< 		case HT_DIR_Y:  return px == 0; // y direction
< 		case HT_DIR_HU: return px == -py || px == -py - 16; // horizontal upper
< 		case HT_DIR_HL: return px == -py || px == -py + 16; // horizontal lower
< 		case HT_DIR_VL: return px == py || px == py + 16; // vertical left
< 		case HT_DIR_VR: return px == py || px == py - 16; // vertical right
< 		default:
< 			NOT_REACHED();
---
> 	switch (dir) {
> 		case HT_DIR_X: return (py == 0) ? HT_DIR_X : HT_DIR_END;
> 		case HT_DIR_Y: return (px == 0) ? HT_DIR_Y : HT_DIR_END;
> 		case HT_DIR_HU: return (px == -py) ? HT_DIR_HU : (px == -py - (int)TILE_SIZE) ? HT_DIR_HL : HT_DIR_END;
> 		case HT_DIR_HL: return (px == -py) ? HT_DIR_HL : (px == -py + (int)TILE_SIZE) ? HT_DIR_HU : HT_DIR_END;
> 		case HT_DIR_VL: return (px ==  py) ? HT_DIR_VL : (px ==  py + (int)TILE_SIZE) ? HT_DIR_VR : HT_DIR_END;
> 		case HT_DIR_VR: return (px ==  py) ? HT_DIR_VR : (px ==  py - (int)TILE_SIZE) ? HT_DIR_VL : HT_DIR_END;
> 		default: NOT_REACHED(); break;
931d977
< }
933,941c979,980
< /* [direction][side] */
< static const HighLightStyle _autorail_type[6][2] = {
< 	{ HT_DIR_X,  HT_DIR_X },
< 	{ HT_DIR_Y,  HT_DIR_Y },
< 	{ HT_DIR_HU, HT_DIR_HL },
< 	{ HT_DIR_HL, HT_DIR_HU },
< 	{ HT_DIR_VL, HT_DIR_VR },
< 	{ HT_DIR_VR, HT_DIR_VL }
< };
---
> 	return HT_DIR_END;
> }
949c988,989
<  * @param autorail_type Offset into _AutorailTilehSprite[][]
---
>  * @param autorail_type \c HT_DIR_XXX, offset into _AutorailTilehSprite[][]
>  * @param pal Palette to use, -1 to autodetect
951c991
< static void DrawAutorailSelection(const TileInfo *ti, uint autorail_type)
---
> static void DrawAutorailSelection(const TileInfo *ti, HighLightStyle autorail_type, PaletteID pal = -1)
954d993
< 	PaletteID pal;
960c999
< 		static const uint _lower_rail[4] = { 5U, 2U, 4U, 3U };
---
> 		static const HighLightStyle _lower_rail[CORNER_END] = { HT_DIR_VR, HT_DIR_HU, HT_DIR_VL, HT_DIR_HL }; // CORNER_W, CORNER_S, CORNER_E, CORNER_N
968a1008
> 	assert(autorail_type < HT_DIR_END);
972c1012
< 		pal = PAL_NONE;
---
> 		if (pal == (PaletteID)-1) pal = _thd.make_square_red ? PALETTE_SEL_TILE_RED : PAL_NONE;
975c1015
< 		pal = PALETTE_SEL_TILE_RED;
---
> 		if (pal == (PaletteID)-1) pal = PALETTE_SEL_TILE_RED;
978c1018
< 	DrawSelectionSprite(image, _thd.make_square_red ? PALETTE_SEL_TILE_RED : pal, ti, 7, foundation_part);
---
> 	DrawSelectionSprite(image, pal, ti, 7, foundation_part);
981,986c1021,1027
< enum TileHighlightType {
< 	THT_NONE,
< 	THT_WHITE,
< 	THT_BLUE,
< 	THT_RED,
< };
---
> // CM moved to cm_highlight.hpp
> // enum TileHighlightType {
> // 	THT_NONE,
> // 	THT_WHITE,
> // 	THT_BLUE,
> // 	THT_RED,
> // };
997a1039
> #if 0  // taken over by citymania highlight
1002c1044
< 
---
> #endif
1090,1091c1132
< 	/* No tile selection active? */
< 	if ((_thd.drawstyle & HT_DRAG_MASK) == HT_NONE) return;
---
> 	if (citymania::DrawTileSelection(ti, tht)) return;
1093,1096c1134,1135
< 	if (_thd.diagonal) { // We're drawing a 45 degrees rotated (diagonal) rectangle
< 		if (IsInsideRotatedRectangle((int)ti->x, (int)ti->y)) goto draw_inner;
< 		return;
< 	}
---
> 	switch (_thd.drawstyle & HT_DRAG_MASK) {
> 		default: break; // No tile selection active?
1098,1117c1137,1146
< 	/* Inside the inner area? */
< 	if (IsInsideBS(ti->x, _thd.pos.x, _thd.size.x) &&
< 			IsInsideBS(ti->y, _thd.pos.y, _thd.size.y)) {
< draw_inner:
< 		if (_thd.drawstyle & HT_RECT) {
< 			if (!is_redsq) DrawTileSelectionRect(ti, _thd.make_square_red ? PALETTE_SEL_TILE_RED : PAL_NONE);
< 		} else if (_thd.drawstyle & HT_POINT) {
< 			/* Figure out the Z coordinate for the single dot. */
< 			int z = 0;
< 			FoundationPart foundation_part = FOUNDATION_PART_NORMAL;
< 			if (ti->tileh & SLOPE_N) {
< 				z += TILE_HEIGHT;
< 				if (RemoveHalftileSlope(ti->tileh) == SLOPE_STEEP_N) z += TILE_HEIGHT;
< 			}
< 			if (IsHalftileSlope(ti->tileh)) {
< 				Corner halftile_corner = GetHalftileSlopeCorner(ti->tileh);
< 				if ((halftile_corner == CORNER_W) || (halftile_corner == CORNER_E)) z += TILE_HEIGHT;
< 				if (halftile_corner != CORNER_S) {
< 					foundation_part = FOUNDATION_PART_HALFTILE;
< 					if (IsSteepSlope(ti->tileh)) z -= TILE_HEIGHT;
---
> 		case HT_RECT:
> 			if (!is_redsq) {
> 				if (IsInsideSelectedRectangle(ti->x, ti->y)) {
> 					DrawTileSelectionRect(ti, _thd.make_square_red ? PALETTE_SEL_TILE_RED : PAL_NONE);
> 				} else if (_thd.outersize.x > 0 &&
> 						/* Check if it's inside the outer area? */
> 						IsInsideBS(ti->x, _thd.pos.x + _thd.offs.x, _thd.size.x + _thd.outersize.x) &&
> 						IsInsideBS(ti->y, _thd.pos.y + _thd.offs.y, _thd.size.y + _thd.outersize.y)) {
> 					/* Draw a blue rect. */
> 					DrawTileSelectionRect(ti, PALETTE_SEL_TILE_BLUE);
1120,1129c1149
< 			DrawSelectionSprite(_cur_dpi->zoom <= ZOOM_LVL_DETAIL ? SPR_DOT : SPR_DOT_SMALL, PAL_NONE, ti, z, foundation_part);
< 		} else if (_thd.drawstyle & HT_RAIL) {
< 			/* autorail highlight piece under cursor */
< 			HighLightStyle type = _thd.drawstyle & HT_DIR_MASK;
< 			assert(type < HT_DIR_END);
< 			DrawAutorailSelection(ti, _autorail_type[type][0]);
< 		} else if (IsPartOfAutoLine(ti->x, ti->y)) {
< 			/* autorail highlighting long line */
< 			HighLightStyle dir = _thd.drawstyle & HT_DIR_MASK;
< 			uint side;
---
> 			break;
1131,1135c1151,1168
< 			if (dir == HT_DIR_X || dir == HT_DIR_Y) {
< 				side = 0;
< 			} else {
< 				TileIndex start = TileVirtXY(_thd.selstart.x, _thd.selstart.y);
< 				side = Delta(Delta(TileX(start), TileX(ti->tile)), Delta(TileY(start), TileY(ti->tile)));
---
> 		case HT_POINT:
> 			if (IsInsideSelectedRectangle(ti->x, ti->y)) {
> 				/* Figure out the Z coordinate for the single dot. */
> 				int z = 0;
> 				FoundationPart foundation_part = FOUNDATION_PART_NORMAL;
> 				if (ti->tileh & SLOPE_N) {
> 					z += TILE_HEIGHT;
> 					if (RemoveHalftileSlope(ti->tileh) == SLOPE_STEEP_N) z += TILE_HEIGHT;
> 				}
> 				if (IsHalftileSlope(ti->tileh)) {
> 					Corner halftile_corner = GetHalftileSlopeCorner(ti->tileh);
> 					if ((halftile_corner == CORNER_W) || (halftile_corner == CORNER_E)) z += TILE_HEIGHT;
> 					if (halftile_corner != CORNER_S) {
> 						foundation_part = FOUNDATION_PART_HALFTILE;
> 						if (IsSteepSlope(ti->tileh)) z -= TILE_HEIGHT;
> 					}
> 				}
> 				DrawSelectionSprite(_cur_dpi->zoom <= ZOOM_LVL_DETAIL ? SPR_DOT : SPR_DOT_SMALL, PAL_NONE, ti, z, foundation_part);
1136a1170
> 			break;
1138,1141c1172,1177
< 			DrawAutorailSelection(ti, _autorail_type[dir][side]);
< 		}
< 		return;
< 	}
---
> 		case HT_RAIL:
> 			if (ti->tile == TileVirtXY(_thd.pos.x, _thd.pos.y)) {
> 				assert((_thd.drawstyle & HT_DIR_MASK) < HT_DIR_END);
> 				DrawAutorailSelection(ti, _thd.drawstyle & HT_DIR_MASK);
> 			}
> 			break;
1143,1149c1179,1188
< 	/* Check if it's inside the outer area? */
< 	if (!is_redsq && (tht == THT_NONE || tht == THT_RED) && _thd.outersize.x > 0 &&
< 			IsInsideBS(ti->x, _thd.pos.x + _thd.offs.x, _thd.size.x + _thd.outersize.x) &&
< 			IsInsideBS(ti->y, _thd.pos.y + _thd.offs.y, _thd.size.y + _thd.outersize.y)) {
< 		/* Draw a blue rect. */
< 		DrawTileSelectionRect(ti, PALETTE_SEL_TILE_BLUE);
< 		return;
---
> 		case HT_LINE: {
> 			HighLightStyle type = GetPartOfAutoLine(ti->x, ti->y, _thd.selstart, _thd.selend, _thd.drawstyle & HT_DIR_MASK);
> 			if (type < HT_DIR_END) {
> 				DrawAutorailSelection(ti, type);
> 			} else if (_thd.dir2 < HT_DIR_END) {
> 				type = GetPartOfAutoLine(ti->x, ti->y, _thd.selstart2, _thd.selend2, _thd.dir2);
> 				if (type < HT_DIR_END) DrawAutorailSelection(ti, type, PALETTE_SEL_TILE_BLUE);
> 			}
> 			break;
> 		}
1273a1313
> 				_vd.cm_highlight = citymania::GetTileHighlight(&tile_info);
1276c1316,1321
< 				if (tile_info.tile != INVALID_TILE) DrawTileSelection(&tile_info);
---
> 
> 				if (tile_info.tile != INVALID_TILE){
> 					DrawTileZoning(&tile_info);
> 					citymania::DrawTileZoning(&tile_info, _vd.cm_highlight);
> 					DrawTileSelection(&tile_info);
> 				}
1279a1325
> 	_vd.cm_highlight = citymania::TileHighlight();
1324c1370
< static Rect ExpandRectWithViewportSignMargins(Rect r, ZoomLevel zoom)
---
> Rect ExpandRectWithViewportSignMargins(Rect r, ZoomLevel zoom)
1505c1551
< /** Sort parent sprites pointer array */
---
> /** Sort parent sprites pointer array replicating the way original sorter did it. */
1508,1511c1554
< 	auto psdvend = psdv->end();
< 	auto psd = psdv->begin();
< 	while (psd != psdvend) {
< 		ParentSpriteToDraw *ps = *psd;
---
> 	if (psdv->size() < 2) return;
1513,1514c1556,1594
< 		if (ps->comparison_done) {
< 			psd++;
---
> 	/* We rely on sprites being, for the most part, already ordered.
> 	 * So we don't need to move many of them and can keep track of their
> 	 * order effecienty by using stack. We always move sprites to the front
> 	 * of the current position, i.e. to the top of the stack.
> 	 * Also use special constants to indicate sorting state without
> 	 * adding extra fields to ParentSpriteToDraw structure.
> 	 */
> 	const uint32 ORDER_COMPARED = UINT32_MAX; // Sprite was compared but we still need to compare the ones preceding it
> 	const uint32 ORDER_RETURNED = UINT32_MAX - 1; // Makr sorted sprite in case there are other occurences of it in the stack
> 	std::stack<ParentSpriteToDraw *> sprite_order;
> 	uint32 next_order = 0;
> 
> 	std::forward_list<std::pair<int64, ParentSpriteToDraw *>> sprite_list;  // We store sprites in a list sorted by xmin+ymin
> 
> 	/* Initialize sprite list and order. */
> 	for (auto p = psdv->rbegin(); p != psdv->rend(); p++) {
> 		sprite_list.push_front(std::make_pair((*p)->xmin + (*p)->ymin, *p));
> 		sprite_order.push(*p);
> 		(*p)->order = next_order++;
> 	}
> 
> 	sprite_list.sort();
> 
> 	std::vector<ParentSpriteToDraw*> preceding;  // Temporarily stores sprites that precede current and their position in the list
> 	auto preceding_prev = sprite_list.begin(); // Store iterator in case we need to delete a single preciding sprite
> 	auto out = psdv->begin();  // Iterator to output sorted sprites
> 
> 	while (!sprite_order.empty()) {
> 
> 		auto s = sprite_order.top();
> 		sprite_order.pop();
> 
> 		/* Sprite is already sorted, ignore it. */
> 		if (s->order == ORDER_RETURNED) continue;
> 
> 		/* Sprite was already compared, just need to output it. */
> 		if (s->order == ORDER_COMPARED) {
> 			*(out++) = s;
> 			s->order = ORDER_RETURNED;
1518c1598
< 		ps->comparison_done = true;
---
> 		preceding.clear();
1520,1521c1600,1617
< 		for (auto psd2 = psd + 1; psd2 != psdvend; psd2++) {
< 			ParentSpriteToDraw *ps2 = *psd2;
---
> 		/* We only need sprites with xmin <= s->xmax && ymin <= s->ymax && zmin <= s->zmax
> 		 * So by iterating sprites with xmin + ymin <= s->xmax + s->ymax
> 		 * we get all we need and some more that we filter out later.
> 		 * We don't include zmin into the sum as there are usually more neighbors on x and y than z
> 		 * so including it will actually increase the amount of false posistives.
> 		 * Also min coordinates can be > xmax so use max(xmin, xmax) + max(ymin, ymax)
> 		 * to ensure we terate the current sprite as we need to remove it from the list.
> 		 */
> 		auto ssum = max(s->xmax, s->xmin) + max(s->ymax, s->ymin);
> 		auto prev = sprite_list.before_begin();
> 		auto x = sprite_list.begin();
> 		while(x != sprite_list.end() && ((*x).first <= ssum)) {
> 			auto p = (*x).second;
> 			if (p == s) {
> 				/* We found the current sprite, remove it and move on. */
> 				x = sprite_list.erase_after(prev);
> 				continue;
> 			}
1523c1619,1620
< 			if (ps2->comparison_done) continue;
---
> 			auto p_prev = prev;
> 			prev = x++;
1525,1548c1622,1627
< 			/* Decide which comparator to use, based on whether the bounding
< 			 * boxes overlap
< 			 */
< 			if (ps->xmax >= ps2->xmin && ps->xmin <= ps2->xmax && // overlap in X?
< 					ps->ymax >= ps2->ymin && ps->ymin <= ps2->ymax && // overlap in Y?
< 					ps->zmax >= ps2->zmin && ps->zmin <= ps2->zmax) { // overlap in Z?
< 				/* Use X+Y+Z as the sorting order, so sprites closer to the bottom of
< 				 * the screen and with higher Z elevation, are drawn in front.
< 				 * Here X,Y,Z are the coordinates of the "center of mass" of the sprite,
< 				 * i.e. X=(left+right)/2, etc.
< 				 * However, since we only care about order, don't actually divide / 2
< 				 */
< 				if (ps->xmin + ps->xmax + ps->ymin + ps->ymax + ps->zmin + ps->zmax <=
< 						ps2->xmin + ps2->xmax + ps2->ymin + ps2->ymax + ps2->zmin + ps2->zmax) {
< 					continue;
< 				}
< 			} else {
< 				/* We only change the order, if it is definite.
< 				 * I.e. every single order of X, Y, Z says ps2 is behind ps or they overlap.
< 				 * That is: If one partial order says ps behind ps2, do not change the order.
< 				 */
< 				if (ps->xmax < ps2->xmin ||
< 						ps->ymax < ps2->ymin ||
< 						ps->zmax < ps2->zmin) {
---
> 			if (s->xmax < p->xmin || s->ymax < p->ymin || s->zmax < p->zmin) continue;
> 			if (s->xmin <= p->xmax && // overlap in X?
> 					s->ymin <= p->ymax && // overlap in Y?
> 					s->zmin <= p->zmax) { // overlap in Z?
> 				if (s->xmin + s->xmax + s->ymin + s->ymax + s->zmin + s->zmax <=
> 						p->xmin + p->xmax + p->ymin + p->ymax + p->zmin + p->zmax) {
1551a1631,1640
> 			preceding.push_back(p);
> 			preceding_prev = p_prev;
> 		}
> 
> 		if (preceding.empty()) {
> 			/* No preceding sprites, add current one to the output */
> 			*(out++) = s;
> 			s->order = ORDER_RETURNED;
> 			continue;
> 		}
1553,1556c1642,1652
< 			/* Move ps2 in front of ps */
< 			ParentSpriteToDraw *temp = ps2;
< 			for (auto psd3 = psd2; psd3 > psd; psd3--) {
< 				*psd3 = *(psd3 - 1);
---
> 		/* Optimization for the case when we only have 1 sprite to move. */
> 		if (preceding.size() == 1) {
> 			auto p = preceding[0];
> 			/* We can only output the preceding sprite if there can't be any other sprites preceding it. */
> 			if (p->xmax <= s->xmax && p->ymax <= s->ymax && p->zmax <= s->zmax) {
> 				p->order = ORDER_RETURNED;
> 				s->order = ORDER_RETURNED;
> 				sprite_list.erase_after(preceding_prev);
> 				*(out++) = p;
> 				*(out++) = s;
> 				continue;
1558c1654,1666
< 			*psd = temp;
---
> 		}
> 
> 		/* Sort all preceding sprites by order and assign new orders in reverse (as original sorter did). */
> 		std::sort(preceding.begin(), preceding.end(), [](const ParentSpriteToDraw *a, const ParentSpriteToDraw *b) {
> 			return a->order >  b->order;
> 		});
> 
> 		s->order = ORDER_COMPARED;
> 		sprite_order.push(s);  // Still need to output so push it back for now
> 
> 		for (auto p: preceding) {
> 			p->order = next_order++;
> 			sprite_order.push(p);
1964c2073
< 		if (_thd.outersize.x != 0) {
---
> 		if (_thd.outersize.x != 0 || _thd.outersize.y != 0) {
2080c2189
< static bool CheckClickOnViewportSign(const ViewPort *vp, int x, int y, const ViewportSign *sign)
---
> bool CheckClickOnViewportSign(const ViewPort *vp, int x, int y, const ViewportSign *sign)
2163c2272,2273
< 		ShowTownViewWindow(last_t->index);
---
> 		if (citymania::_fn_mod) TownExecuteAction(last_t, 4); //CM build statue
> 		else ShowTownViewWindow(last_t->index);
2299c2409
< bool HandleViewportClicked(const ViewPort *vp, int x, int y)
---
> bool HandleViewportClicked(const ViewPort *vp, int x, int y, bool double_click)
2308a2419,2430
> 		if (_thd.place_mode & HT_POLY) {
> 			/* In polyline mode double-clicking on a single white line, finishes current polyline.
> 			 * If however the user double-clicks on a line that has a white and a blue section,
> 			 * both lines (white and blue) will be constructed consecutively. */
> 			static bool stop_snap_on_double_click = false;
> 			if (double_click && stop_snap_on_double_click) {
> 				SetRailSnapMode(RSM_NO_SNAP);
> 				return true;
> 			}
> 			stop_snap_on_double_click = !(_thd.drawstyle & HT_LINE) || (_thd.dir2 == HT_DIR_END);
> 		}
> 
2320,2321c2442,2444
< 			if (_ctrl_pressed && v->owner == _local_company) {
< 				StartStopVehicle(v, true);
---
> 			if (citymania::_fn_mod && v->owner == _local_company) {
> 				if (_settings_client.gui.enable_ctrl_click_start_stop)
> 					StartStopVehicle(v, true);
2433,2434c2556,2557
< 	_thd.offs.x = ox * TILE_SIZE;
< 	_thd.offs.y = oy * TILE_SIZE;
---
> 	_thd.new_offs.x = ox * TILE_SIZE;
> 	_thd.new_offs.y = oy * TILE_SIZE;
2462c2585
< 	return (this->place_mode & HT_DIAGONAL) != 0 && _ctrl_pressed && _left_button_down;
---
> 	return (this->place_mode & HT_DIAGONAL) != 0 && citymania::_fn_mod && _left_button_down;
2473a2597
> static HighLightStyle CalcPolyrailDrawstyle(Point pt, bool dragging);
2474a2599,2627
> /** Update size of the area occupied by the blue part of rail track highlight (polyline mode). */
> static inline void CalcNewPolylineOutersize()
> {
> 	/* use the 'outersize' to mark the second (blue) part of a polyline selection */
> 	if (_thd.dir2 < HT_DIR_END) {
> 		/* get bounds of the second part */
> 		int outer_x1 = _thd.selstart2.x & ~TILE_UNIT_MASK;
> 		int outer_y1 = _thd.selstart2.y & ~TILE_UNIT_MASK;
> 		int outer_x2 = _thd.selend2.x & ~TILE_UNIT_MASK;
> 		int outer_y2 = _thd.selend2.y & ~TILE_UNIT_MASK;
> 		if (outer_x1 > outer_x2) Swap(outer_x1, outer_x2);
> 		if (outer_y1 > outer_y2) Swap(outer_y1, outer_y2);
> 		/* include the first part */
> 		outer_x1 = min<int>(outer_x1, _thd.new_pos.x);
> 		outer_y1 = min<int>(outer_y1, _thd.new_pos.y);
> 		outer_x2 = max<int>(outer_x2, _thd.new_pos.x + _thd.new_size.x - TILE_SIZE);
> 		outer_y2 = max<int>(outer_y2, _thd.new_pos.y + _thd.new_size.y - TILE_SIZE);
> 		/* write new values */
> 		_thd.new_offs.x = outer_x1 - _thd.new_pos.x;
> 		_thd.new_offs.y = outer_y1 - _thd.new_pos.y;
> 		_thd.new_outersize.x = outer_x2 - outer_x1 + TILE_SIZE - _thd.new_size.x;
> 		_thd.new_outersize.y = outer_y2 - outer_y1 + TILE_SIZE - _thd.new_size.y;
> 	} else {
> 		_thd.new_offs.x = 0;
> 		_thd.new_offs.y = 0;
> 		_thd.new_outersize.x = 0;
> 		_thd.new_outersize.y = 0;
> 	}
> }
2533,2535d2685
< 					/* Draw one highlighted tile in any direction */
< 					new_drawstyle = GetAutorailHT(pt.x, pt.y);
< 					break;
2536a2687,2721
> 					/* HT_POLY */
> 					if (_thd.place_mode & HT_POLY) {
> 						RailSnapMode snap_mode = GetRailSnapMode();
> 						if (snap_mode == RSM_NO_SNAP ||
> 								(snap_mode == RSM_SNAP_TO_TILE && GetRailSnapTile() == TileVirtXY(pt.x, pt.y))) {
> 							new_drawstyle = GetAutorailHT(pt.x, pt.y);
> 							_thd.new_offs.x = 0;
> 							_thd.new_offs.y = 0;
> 							_thd.new_outersize.x = 0;
> 							_thd.new_outersize.y = 0;
> 							_thd.dir2 = HT_DIR_END;
> 						} else {
> 							new_drawstyle = CalcPolyrailDrawstyle(pt, false);
> 							if (new_drawstyle != HT_NONE) {
> 								x1 = _thd.selstart.x & ~TILE_UNIT_MASK;
> 								y1 = _thd.selstart.y & ~TILE_UNIT_MASK;
> 								int x2 = _thd.selend.x & ~TILE_UNIT_MASK;
> 								int y2 = _thd.selend.y & ~TILE_UNIT_MASK;
> 								if (x1 > x2) Swap(x1, x2);
> 								if (y1 > y2) Swap(y1, y2);
> 								_thd.new_pos.x = x1;
> 								_thd.new_pos.y = y1;
> 								_thd.new_size.x = x2 - x1 + TILE_SIZE;
> 								_thd.new_size.y = y2 - y1 + TILE_SIZE;
> 							}
> 						}
> 						break;
> 					}
> 					/* HT_RAIL */
> 					if (_thd.place_mode & HT_RAIL) {
> 						/* Draw one highlighted tile in any direction */
> 						new_drawstyle = GetAutorailHT(pt.x, pt.y);
> 						break;
> 					}
> 					/* HT_LINE */
2554a2740,2742
> 					_thd.selend.x = x1;
> 					_thd.selend.y = y1;
> 					_thd.dir2 = HT_DIR_END;
2563a2752,2754
> 	if (new_drawstyle & HT_LINE) CalcNewPolylineOutersize();
> 	new_drawstyle = citymania::UpdateTileSelection(new_drawstyle);
> 
2567a2759
> 			_thd.offs.x != _thd.new_offs.x || _thd.offs.y != _thd.new_offs.y ||
2576a2769
> 		_thd.offs = _thd.new_offs;
2595d2787
< 	if (!_settings_client.gui.measure_tooltip) return;
2630a2823,2827
> 		_current_snap_lock.x = -1;
> 		if ((_thd.place_mode & HT_POLY) != 0 && GetRailSnapMode() == RSM_NO_SNAP) {
> 			SetRailSnapMode(RSM_SNAP_TO_TILE);
> 			SetRailSnapTile(tile);
> 		}
2659c2856
< 	if (distance > 1) {
---
> 	if (distance > 1  && _settings_client.gui.measure_tooltip) {
2826c3023,3055
< static const StringID measure_strings_length[] = {STR_NULL, STR_MEASURE_LENGTH, STR_MEASURE_LENGTH_HEIGHTDIFF};
---
> /**
>  * Show a tooltip indicating the length of highlighted rail track.
>  * @param style                   Style of the highlight.
>  * @param start_tile              Tile where selection starts.
>  * @param end_tile                Tile where selection ends.
>  * @param close_cond              Close condition of the tooltip.
>  * @param show_single_tile_length Show a tooltip also when the length is 1 tile.
>  */
> static void ShowLengthMeasurement(HighLightStyle style, TileIndex start_tile, TileIndex end_tile, TooltipCloseCondition close_cond = TCC_NONE, bool show_single_tile_length = false)
> {
> 	static const StringID measure_strings_length[] = {STR_NULL, STR_MEASURE_LENGTH, STR_MEASURE_LENGTH_HEIGHTDIFF};
> 
> 	if (_settings_client.gui.measure_tooltip) {
> 		uint distance = DistanceManhattan(start_tile, end_tile) + 1;
> 		byte index = 0;
> 		uint64 params[2];
> 
> 		if (show_single_tile_length || distance != 1) {
> 			int heightdiff = CalcHeightdiff(style, distance, start_tile, end_tile);
> 			/* If we are showing a tooltip for horizontal or vertical drags,
> 			 * 2 tiles have a length of 1. To bias towards the ceiling we add
> 			 * one before division. It feels more natural to count 3 lengths as 2 */
> 			if ((style & HT_DIR_MASK) != HT_DIR_X && (style & HT_DIR_MASK) != HT_DIR_Y) {
> 				distance = CeilDiv(distance, 2);
> 			}
> 
> 			params[index++] = distance;
> 			if (heightdiff != 0) params[index++] = heightdiff;
> 		}
> 
> 		ShowMeasurementTooltips(measure_strings_length[index], index, params, close_cond);
> 	}
> }
2856a3086,3277
> static const uint X_DIRS = (1 << DIR_NE) | (1 << DIR_SW);
> static const uint Y_DIRS = (1 << DIR_SE) | (1 << DIR_NW);
> static const uint HORZ_DIRS = (1 << DIR_W) | (1 << DIR_E);
> static const uint VERT_DIRS = (1 << DIR_N) | (1 << DIR_S);
> 
> /**
>  * Convert a given point and a given #Direction to best matching #Trackdir.
>  *
>  * For example, #DIR_N will be converted to #TRACKDIR_LEFT_N if the point
>  * is on left tile half or #TRACKDIR_RIGHT_N if the point is on right half.
>  *
>  * @param pt  The point expressed in inner-tile world "units".
>  * @param dir The direction.
>  * @return The matching #Trackdir.
>  */
> Trackdir PointDirToTrackdir(const Point &pt, Direction dir)
> {
> 	Trackdir ret;
> 
> 	if (IsDiagonalDirection(dir)) {
> 		ret = DiagDirToDiagTrackdir(DirToDiagDir(dir));
> 	} else {
> 		int x = pt.x & TILE_UNIT_MASK;
> 		int y = pt.y & TILE_UNIT_MASK;
> 		int ns = x + y;
> 		int we = y - x;
> 		if (HasBit(HORZ_DIRS, dir)) {
> 			ret = TrackDirectionToTrackdir(ns < (int)TILE_SIZE ? TRACK_UPPER : TRACK_LOWER, dir);
> 		} else {
> 			ret = TrackDirectionToTrackdir(we < 0 ? TRACK_LEFT : TRACK_RIGHT, dir);
> 		}
> 	}
> 
> 	return ret;
> }
> 
> /**
>  * Try to fit a pair of rail track lines (polyline) based on a given end point
>  * (mouse cursor position) and a given snap point (begin point).
>  *
>  * @param pt       The end point expressed in inner-tile world "units".
>  * @param start    The snap point, begin of the lines.
>  * @param[out] ret Coordinates of the lines (if found).
>  * @return Whether the lines were found.
>  */
> 
> static bool FindPolyline(const Point &pt, const LineSnapPoint &start, RailPolyline *ret) {
> 	/* relative coordinates of the mouse point (offset against the snap point) */
> 	int x = pt.x - start.x;
> 	int y = pt.y - start.y;
> 	int we = y - x;
> 	int ns = x + y;
> 
> 	/* in-tile alignment of the snap point (there are two variants: [0, 8] or [8, 0]) */
> 	uint align_x = start.x & TILE_UNIT_MASK;
> 	uint align_y = start.y & TILE_UNIT_MASK;
> 	assert((align_x == TILE_SIZE / 2 && align_y == 0 && !(start.dirs & X_DIRS)) || (align_x == 0 && align_y == TILE_SIZE / 2 && !(start.dirs & Y_DIRS)));
> 
> 	/* absolute distance between points (in tiles) */
> 	uint d_x = abs(RoundDivSU(x < 0 ? x - align_y : x + align_y, TILE_SIZE));
> 	uint d_y = abs(RoundDivSU(y < 0 ? y - align_x : y + align_x, TILE_SIZE));
> 	uint d_ns = abs(RoundDivSU(ns, TILE_SIZE));
> 	uint d_we = abs(RoundDivSU(we, TILE_SIZE));
> 
> 	/* Find on which quadrant is the mouse point (relatively to the snap point).
> 	 * Numeration (clockwise like in Direction):
> 	 * ortho            diag
> 	 *   \   2   /       2 | 3
> 	 *     \   /         --+---> [we]
> 	 *  1    X    3      1 | 0
> 	 *     /   \           v
> 	 *  [x]  0  [y]       [ns]          */
> 	uint ortho_quadrant = 2 * (x < 0) + ((x < 0) != (y < 0)); // implicit cast: false/true --> 0/1
> 	uint diag_quadrant = 2 * (ns < 0) + ((ns < 0) != (we < 0));
> 
> 	/* direction from the snap point to the mouse point */
> 	Direction ortho_line_dir = ChangeDir(DIR_S, (DirDiff)(2 * ortho_quadrant)); // DIR_S is the middle of the ortho quadrant no. 0
> 	Direction diag_line_dir = ChangeDir(DIR_SE, (DirDiff)(2 * diag_quadrant));  // DIR_SE is the middle of the diag quadrant no. 0
> 	if (!HasBit(start.dirs, ortho_line_dir) && !HasBit(start.dirs, diag_line_dir)) return false;
> 
> 	/* length of booth segments of auto line (choosing orthogonal direction first) */
> 	uint ortho_len = 0, ortho_len2 = 0;
> 	if (HasBit(start.dirs, ortho_line_dir)) {
> 		bool is_len_even = (align_x != 0) ? d_x >= d_y : d_x <= d_y;
> 		ortho_len = 2 * min(d_x, d_y) - (int)is_len_even;
> 		assert((int)ortho_len >= 0);
> 		if (d_ns == 0 || d_we == 0) { // just single segment?
> 			ortho_len++;
> 		} else {
> 			ortho_len2 = abs((int)d_x - (int)d_y) + (int)is_len_even;
> 		}
> 	}
> 
> 	/* length of booth segments of auto line (choosing diagonal direction first) */
> 	uint diag_len = 0, diag_len2 = 0;
> 	if (HasBit(start.dirs, diag_line_dir)) {
> 		if (d_x == 0 || d_y == 0) { // just single segment?
> 			diag_len = d_x + d_y;
> 		} else {
> 			diag_len = min(d_ns, d_we);
> 			diag_len2 = d_x + d_y - diag_len;
> 		}
> 	}
> 
> 	/* choose the best variant */
> 	if (ortho_len != 0 && diag_len != 0) {
> 		/* in the first place, choose this line whose first segment ends up closer
> 		 * to the mouse point (thus the second segment is shorter) */
> 		int cmp = ortho_len2 - diag_len2;
> 		/* if equal, choose the shorter line */
> 		if (cmp == 0) cmp = ortho_len - diag_len;
> 		/* finally look at small "units" and choose the line which is closer to the mouse point */
> 		if (cmp == 0) cmp = min(abs(we), abs(ns)) - min(abs(x), abs(y));
> 		/* based on comparison, disable one of variants */
> 		if (cmp > 0) {
> 			ortho_len = 0;
> 		} else {
> 			diag_len = 0;
> 		}
> 	}
> 
> 	/* store results */
> 	if (ortho_len != 0) {
> 		ret->first_dir = ortho_line_dir;
> 		ret->first_len = ortho_len;
> 		ret->second_dir = (ortho_len2 != 0) ? diag_line_dir : INVALID_DIR;
> 		ret->second_len = ortho_len2;
> 	} else if (diag_len != 0) {
> 		ret->first_dir = diag_line_dir;
> 		ret->first_len = diag_len;
> 		ret->second_dir = (diag_len2 != 0) ? ortho_line_dir : INVALID_DIR;
> 		ret->second_len = diag_len2;
> 	} else {
> 		return false;
> 	}
> 
> 	ret->start = start;
> 	return true;
> }
> 
> /**
>  * Calculate squared euclidean distance between two points.
>  * @param a the first point
>  * @param b the second point
>  * @return |b - a| ^ 2
>  */
> static inline uint SqrDist(const Point &a, const Point &b)
> {
> 	return (b.x - a.x) * (b.x - a.x) + (b.y - a.y) * (b.y - a.y);
> }
> 
> /**
>  * Find best matching pair of lines (polyline).
>  *
>  * @param pt          The end point (mouse cursor position) expressed in inner-tile world "units".
>  * @param snap_points Array of snapping points, the best one will be chosen.
>  * @param num_points  Length of the array.
>  * @param[out] ret    Coordinates of the polyline (if found).
>  * @return The chosen snapping point or NULL if no matching line was found.
>  */
> static LineSnapPoint *FindBestPolyline(const Point &pt, LineSnapPoint *snap_points, uint num_points, RailPolyline *ret)
> {
> 	/* Find the best polyline (a pair of two lines - the white one and the blue
> 	 * one) led from any of saved snap points to the mouse cursor. */
> 
> 	LineSnapPoint *best_snap_point = NULL; // the best polyline we found so far is led from this snap point
> 
> 	for (int i = 0; i < (int)num_points; i++) {
> 		/* try to fit a polyline */
> 		RailPolyline polyline;
> 		if (!FindPolyline(pt, snap_points[i], &polyline)) continue; // skip non-matching snap points
> 		/* check whether we've found a better polyline */
> 		if (best_snap_point != NULL) {
> 			/* firstly choose shorter polyline (the one with smaller amount of
> 			 * track pieces composing booth the white and the blue line) */
> 			uint cur_len = polyline.first_len + polyline.second_len;
> 			uint best_len = ret->first_len + ret->second_len;
> 			if (cur_len > best_len) continue;
> 			/* secondly choose that polyline which has longer first (white) line */
> 			if (cur_len == best_len && polyline.first_len < ret->first_len) continue;
> 			/* finally check euclidean distance to snap points and choose the
> 			 * one which is closer */
> 			if (cur_len == best_len && polyline.first_len == ret->first_len && SqrDist(pt, snap_points[i]) >= SqrDist(pt, *best_snap_point)) continue;
> 		}
> 		/* save the found polyline */
> 		*ret = polyline;
> 		best_snap_point = &snap_points[i];
> 	}
> 
> 	return best_snap_point;
> }
> 
3043,3048c3464,3467
< 	if (_settings_client.gui.measure_tooltip) {
< 		TileIndex t0 = TileVirtXY(_thd.selstart.x, _thd.selstart.y);
< 		TileIndex t1 = TileVirtXY(x, y);
< 		uint distance = DistanceManhattan(t0, t1) + 1;
< 		byte index = 0;
< 		uint64 params[2];
---
> 	_thd.selend.x = x;
> 	_thd.selend.y = y;
> 	_thd.dir2 = HT_DIR_END;
> 	_thd.next_drawstyle = b;
3050,3057c3469,3470
< 		if (distance != 1) {
< 			int heightdiff = CalcHeightdiff(b, distance, t0, t1);
< 			/* If we are showing a tooltip for horizontal or vertical drags,
< 			 * 2 tiles have a length of 1. To bias towards the ceiling we add
< 			 * one before division. It feels more natural to count 3 lengths as 2 */
< 			if ((b & HT_DIR_MASK) != HT_DIR_X && (b & HT_DIR_MASK) != HT_DIR_Y) {
< 				distance = CeilDiv(distance, 2);
< 			}
---
> 	ShowLengthMeasurement(b, TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y));
> }
3059,3061c3472,3480
< 			params[index++] = distance;
< 			if (heightdiff != 0) params[index++] = heightdiff;
< 		}
---
> /**
>  * Calculate how tiles should be highlighted (polyline mode).
>  * @param pt       Current mouse cursor position expressed in inner-tile world "units".
>  * @param dragging Whether currently drag-dropping, in this case direction of rail track line is locked.
>  * @return New highlight style.
>  */
> static HighLightStyle CalcPolyrailDrawstyle(Point pt, bool dragging)
> {
> 	RailSnapMode snap_mode = GetRailSnapMode();
3063c3482,3486
< 		ShowMeasurementTooltips(measure_strings_length[index], index, params);
---
> 	/* are we only within one tile? */
> 	if (snap_mode == RSM_SNAP_TO_TILE && GetRailSnapTile() == TileVirtXY(pt.x, pt.y)) {
> 		_thd.selend.x = pt.x;
> 		_thd.selend.y = pt.y;
> 		return GetAutorailHT(pt.x, pt.y);
3066,3068c3489,3546
< 	_thd.selend.x = x;
< 	_thd.selend.y = y;
< 	_thd.next_drawstyle = b;
---
> 	/* find the best track */
> 	RailPolyline line;
> 
> 	bool lock_snapping = dragging && snap_mode == RSM_SNAP_TO_RAIL;
> 	if (!lock_snapping) _current_snap_lock.x = -1;
> 
> 	const LineSnapPoint *snap_point;
> 	if (_current_snap_lock.x != -1) {
> 		snap_point = FindBestPolyline(pt, &_current_snap_lock, 1, &line);
> 	} else if (snap_mode == RSM_SNAP_TO_TILE) {
> 		snap_point = FindBestPolyline(pt, _tile_snap_points.data(), _tile_snap_points.size(), &line);
> 	} else {
> 		assert(snap_mode == RSM_SNAP_TO_RAIL);
> 		snap_point = FindBestPolyline(pt, _rail_snap_points.data(), _rail_snap_points.size(), &line);
> 	}
> 
> 	if (snap_point == NULL) return HT_NONE; // no match
> 
> 	if (lock_snapping && _current_snap_lock.x == -1) {
> 		/* lock down the snap point */
> 		_current_snap_lock = *snap_point;
> 		_current_snap_lock.dirs &= (1 << line.first_dir) | (1 << ReverseDir(line.first_dir));
> 	}
> 
> 	TileIndexDiffC first_dir = TileIndexDiffCByDir(line.first_dir);
> 	_thd.selstart.x  = line.start.x;
> 	_thd.selstart.y  = line.start.y;
> 	_thd.selend.x    = _thd.selstart.x + line.first_len * first_dir.x * (IsDiagonalDirection(line.first_dir) ? TILE_SIZE : TILE_SIZE / 2);
> 	_thd.selend.y    = _thd.selstart.y + line.first_len * first_dir.y * (IsDiagonalDirection(line.first_dir) ? TILE_SIZE : TILE_SIZE / 2);
> 	_thd.selstart2.x = _thd.selend.x;
> 	_thd.selstart2.y = _thd.selend.y;
> 	_thd.selstart.x  += first_dir.x;
> 	_thd.selstart.y  += first_dir.y;
> 	_thd.selend.x    -= first_dir.x;
> 	_thd.selend.y    -= first_dir.y;
> 	Trackdir seldir = PointDirToTrackdir(_thd.selstart, line.first_dir);
> 	_thd.selstart.x  &= ~TILE_UNIT_MASK;
> 	_thd.selstart.y  &= ~TILE_UNIT_MASK;
> 
> 	if (line.second_len != 0) {
> 		TileIndexDiffC second_dir = TileIndexDiffCByDir(line.second_dir);
> 		_thd.selend2.x   = _thd.selstart2.x + line.second_len * second_dir.x * (IsDiagonalDirection(line.second_dir) ? TILE_SIZE : TILE_SIZE / 2);
> 		_thd.selend2.y   = _thd.selstart2.y + line.second_len * second_dir.y * (IsDiagonalDirection(line.second_dir) ? TILE_SIZE : TILE_SIZE / 2);
> 		_thd.selstart2.x += second_dir.x;
> 		_thd.selstart2.y += second_dir.y;
> 		_thd.selend2.x   -= second_dir.x;
> 		_thd.selend2.y   -= second_dir.y;
> 		Trackdir seldir2 = PointDirToTrackdir(_thd.selstart2, line.second_dir);
> 		_thd.selstart2.x &= ~TILE_UNIT_MASK;
> 		_thd.selstart2.y &= ~TILE_UNIT_MASK;
> 		_thd.dir2 = (HighLightStyle)TrackdirToTrack(seldir2);
> 	} else {
> 		_thd.dir2 = HT_DIR_END;
> 	}
> 
> 	HighLightStyle ret = HT_LINE | (HighLightStyle)TrackdirToTrack(seldir);
> 	ShowLengthMeasurement(ret, TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), TCC_HOVER, true);
> 	return ret;
3087a3566,3571
> 	if ((_thd.place_mode & HT_POLY) && GetRailSnapMode() != RSM_NO_SNAP) {
> 		Point pt = { x, y };
> 		_thd.next_drawstyle = CalcPolyrailDrawstyle(pt, true);
> 		return;
> 	}
> 
3140,3160c3624,3629
< 			if (_settings_client.gui.measure_tooltip) {
< 				TileIndex t0 = TileVirtXY(sx, sy);
< 				TileIndex t1 = TileVirtXY(x, y);
< 				uint distance = DistanceManhattan(t0, t1) + 1;
< 				byte index = 0;
< 				uint64 params[2];
< 
< 				if (distance != 1) {
< 					/* With current code passing a HT_LINE style to calculate the height
< 					 * difference is enough. However if/when a point-tool is created
< 					 * with this method, function should be called with new_style (below)
< 					 * instead of HT_LINE | style case HT_POINT is handled specially
< 					 * new_style := (_thd.next_drawstyle & HT_RECT) ? HT_LINE | style : _thd.next_drawstyle; */
< 					int heightdiff = CalcHeightdiff(HT_LINE | style, 0, t0, t1);
< 
< 					params[index++] = distance;
< 					if (heightdiff != 0) params[index++] = heightdiff;
< 				}
< 
< 				ShowMeasurementTooltips(measure_strings_length[index], index, params);
< 			}
---
> 			/* With current code passing a HT_LINE style to calculate the height
> 			 * difference is enough. However if/when a point-tool is created
> 			 * with this method, function should be called with new_style (below)
> 			 * instead of HT_LINE | style case HT_POINT is handled specially
> 			 * new_style := (_thd.next_drawstyle & HT_RECT) ? HT_LINE | style : _thd.next_drawstyle; */
> 			ShowLengthMeasurement(HT_LINE | style, TileVirtXY(sx, sy), TileVirtXY(x, y));
3170c3639
< 			if (_settings_client.gui.measure_tooltip) {
---
> 			if (_settings_client.gui.measure_tooltip || _thd.select_proc == DDSP_MEASURE) {
3172c3641,3642
< 					STR_NULL, STR_NULL, STR_MEASURE_AREA, STR_MEASURE_AREA_HEIGHTDIFF
---
> 					STR_NULL, STR_NULL, STR_MEASURE_AREA, STR_MEASURE_AREA_HEIGHTDIFF,
> 					STR_MEASURE_DIST_HEIGHTDIFF,
3180c3650
< 				uint64 params[3];
---
> 				uint64 params[4];
3227c3697,3703
< 					if (heightdiff != 0) params[index++] = heightdiff;
---
> 
> 					if (_thd.select_proc == DDSP_MEASURE) {
> 						params[index++] = sqrtl(dx * dx + dy * dy);
> 					}
> 
> 					if (heightdiff != 0 || index == 3)
> 						params[index++] = heightdiff;
3238a3715
> 	_thd.dir2 = HT_DIR_END;
3256,3260c3733,3736
< 	/* while dragging execute the drag procedure of the corresponding window (mostly VpSelectTilesWithMethod() ) */
< 	if (_left_button_down) {
< 		w->OnPlaceDrag(_thd.select_method, _thd.select_proc, GetTileBelowCursor());
< 		return ES_HANDLED;
< 	}
---
> 	/* While dragging execute the drag procedure of the corresponding window (mostly VpSelectTilesWithMethod() ).
> 	 * Do it even if the button is no longer pressed to make sure that OnPlaceDrag was called at least once. */
> 	w->OnPlaceDrag(_thd.select_method, _thd.select_proc, GetTileBelowCursor());
> 	if (_left_button_down) return ES_HANDLED;
3271c3747
< 		_thd.place_mode = (_thd.select_method & ~VPM_RAILDIRS) ? _thd.next_drawstyle : (HT_RAIL | others);
---
> 		_thd.place_mode = (_thd.select_method & ~VPM_RAILDIRS ? _thd.next_drawstyle : HT_RAIL) | others;
3316,3319c3791
< 		if (w != nullptr) {
< 			w->OnPlaceObjectAbort();
< 			HideMeasurementTooltips();
< 		}
---
> 		if (w != nullptr) w->OnPlaceObjectAbort();
3429c3901
< static void MarkCatchmentTilesDirty()
---
> void MarkCatchmentTilesDirty()
3488a3961,4170
> }
> 
> /**
>  * Construct a rail snapping point based on a spot where a rail tracks segment
>  * has been placed.
>  *
>  * The snapping point will allow to stick new segment of tracks to the line that
>  * was placed before.
>  *
>  * @param tile Tile where the placed segment ended.
>  * @param exit_dir Tile side at which the segment ended.
>  * @param bidirectional Whether to allow to reverse at this point
>  *        (e.g. reversing after a bridges/tunnels is undesired).
>  * @param extended If not \c NULL, the snapping point will be extended over
>  *        a bridge/tunnel/station etc. if the last placed segment touches such
>  *        an object. Additional snapping point may be stored under \a extended
>  *        if needed, otherwise it will be set to { -1, -1, 0 }.
>  * @return New rail snapping point.
>  */
> static LineSnapPoint LineSnapPointAtRailTrackEndpoint(TileIndex tile, DiagDirection exit_dir, bool bidirectional, LineSnapPoint *extended)
> {
> 	LineSnapPoint ret;
> 	ret.x = (TILE_SIZE / 2) * (uint)(2 * TileX(tile) + TileIndexDiffCByDiagDir(exit_dir).x + 1);
> 	ret.y = (TILE_SIZE / 2) * (uint)(2 * TileY(tile) + TileIndexDiffCByDiagDir(exit_dir).y + 1);
> 	ret.dirs = 0;
> 	if (extended != NULL) {
> 		extended->x = -1;
> 		extended->y = -1;
> 		extended->dirs = 0;
> 	}
> 
> 	/* Check whether to extend the snap point over a tunnel/bridge/station etc. */
> 	tile = TileAddByDiagDir(tile, exit_dir);
> 	if (extended != NULL && !IsTileType(tile, MP_RAILWAY) && !IsTileType(tile, MP_ROAD) &&
> 			TrackStatusToTrackBits(GetTileTrackStatus(tile, TRANSPORT_RAIL, INVALID_DIAGDIR)) == AxisToTrackBits(DiagDirToAxis(exit_dir)) &&
> 			IsTileOwner(tile, _local_company)) {
> 		/* Check if this is a tunnel/bridge and move the tile to the other end if so. */
> 		if (IsTileType(tile, MP_TUNNELBRIDGE)) tile = GetOtherTunnelBridgeEnd(tile);
> 		LineSnapPoint ex = LineSnapPointAtRailTrackEndpoint(tile, exit_dir, false, extended);
> 		if (!bidirectional) return ex; // if we are interested in forward direction only then return just the extended point
> 		*extended = ex; // otherwise return two points, extended with forward direction and base with reverse direction
> 	} else {
> 		/* Add forward direction. */
> 		SetBit(ret.dirs, DiagDirToDir(exit_dir));
> 	}
> 
> 	/* Add reverse direction. */
> 	if (bidirectional) SetBit(ret.dirs, ReverseDir(DiagDirToDir(exit_dir)));
> 
> 	/* Add 45 degree rotated directions. */
> 	ret.dirs |= ROR<uint8>(ret.dirs, DIRDIFF_45LEFT);
> 	ret.dirs |= ROR<uint8>(ret.dirs, DIRDIFF_45RIGHT);
> 	return ret;
> }
> 
> /**
>  * Store the position of lastly built rail track; for highlighting purposes.
>  *
>  * In "polyline" highlighting mode, the stored end point will be used as a snapping point for new
>  * tracks allowing to place multi-segment polylines.
>  *
>  * @param start_tile         tile where the track starts
>  * @param end_tile           tile where the track ends
>  * @param start_track        track piece on the start_tile
>  * @param bidirectional_exit whether to allow to highlight next track in any direction; otherwise new track will have to fallow the stored one (usefull when placing tunnels and bridges)
>  */
> void StoreRailPlacementEndpoints(TileIndex start_tile, TileIndex end_tile, Track start_track, bool bidirectional_exit)
> {
> 	if (start_tile != INVALID_TILE && end_tile != INVALID_TILE) {
> 		/* calculate trackdirs at booth ends of the track */
> 		Trackdir exit_trackdir_at_start = TrackToTrackdir(start_track);
> 		Trackdir exit_trackdir_at_end = ReverseTrackdir(TrackToTrackdir(start_track));
> 		if (start_tile != end_tile) { // multi-tile case
> 			/* determine proper direction (pointing outside of the track) */
> 			uint distance = DistanceManhattan(start_tile, end_tile);
> 			if (distance > DistanceManhattan(TileAddByDiagDir(start_tile, TrackdirToExitdir(exit_trackdir_at_start)), end_tile)) {
> 				Swap(exit_trackdir_at_start, exit_trackdir_at_end);
> 			}
> 			/* determine proper track on the end tile - switch between upper/lower or left/right based on the length */
> 			if (distance % 2 != 0) exit_trackdir_at_end = NextTrackdir(exit_trackdir_at_end);
> 		}
> 
> 		LineSnapPoint snap_start, snap_start_ex, snap_end, snap_end_ex;
> 		snap_start = LineSnapPointAtRailTrackEndpoint(start_tile, TrackdirToExitdir(exit_trackdir_at_start), bidirectional_exit, &snap_start_ex);
> 		snap_end = LineSnapPointAtRailTrackEndpoint(end_tile, TrackdirToExitdir(exit_trackdir_at_end), bidirectional_exit, &snap_end_ex);
> 		/* Find if we already had these coordinates before. */
> 		bool had_start = false;
> 		bool had_end = false;
> 		for (auto &snap: _rail_snap_points) {
> 			had_start |= (snap.x == snap_start.x && snap.y == snap_start.y);
> 			had_end |= (snap.x == snap_end.x && snap.y == snap_end.y);
> 		}
> 		/* Create new snap point set. */
> 		if (had_start && had_end) {
> 			/* just stop snapping, don't forget snap points */
> 			SetRailSnapMode(RSM_NO_SNAP);
> 		} else {
> 			/* include only new points */
> 			_rail_snap_points.clear();
> 			if (!had_start) {
> 				_rail_snap_points.push_back(snap_start);
> 				if (snap_start_ex.dirs != 0) _rail_snap_points.push_back(snap_start_ex);
> 			}
> 			if (!had_end) {
> 				_rail_snap_points.push_back(snap_end);
> 				if (snap_end_ex.dirs != 0) _rail_snap_points.push_back(snap_end_ex);
> 			}
> 			SetRailSnapMode(RSM_SNAP_TO_RAIL);
> 		}
> 	}
> }
> 
> /**
>  * Store the position of lastly built rail station; for highlighting purposes.
>  *
>  * In "polyline" highlighting mode, the stored end points will be used as snapping points for new tracks.
>  *
>  * @param ta           Station area.
>  * @param station_axis Station axis.
>  */
> void StoreRailStationPlacementEndpoints(const TileArea &ta, Axis station_axis)
> {
> 	uint start_x = TileX(ta.tile);
> 	uint start_y = TileY(ta.tile);
> 	uint end_x = start_x + ta.w - 1;
> 	uint end_y = start_y + ta.h - 1;
> 
> 	_rail_snap_points.clear();
> 	if (station_axis == AXIS_X) {
> 		for (uint y = start_y; y <= end_y; y++) {
> 			_rail_snap_points.push_back(LineSnapPointAtRailTrackEndpoint(TileXY(start_x, y), DIAGDIR_NE, false, NULL));
> 			_rail_snap_points.push_back(LineSnapPointAtRailTrackEndpoint(TileXY(end_x, y), DIAGDIR_SW, false, NULL));
> 		}
> 	} else {
> 		for (uint x = start_x; x <= end_x; x++) {
> 			_rail_snap_points.push_back(LineSnapPointAtRailTrackEndpoint(TileXY(x, start_y), DIAGDIR_NW, false, NULL));
> 			_rail_snap_points.push_back(LineSnapPointAtRailTrackEndpoint(TileXY(x, end_y), DIAGDIR_SE, false, NULL));
> 		}
> 	}
> }
> 
> /**
>  * Get current rail track snapping mode.
>  * @return Current snapping mode.
>  *
>  * @note This function will return #RSM_NO_SNAP if there are no snapping points
>  *       set (yet), even thought the snapping was set to some different mode.
>  */
> RailSnapMode GetRailSnapMode()
> {
> 	if (_rail_snap_mode == RSM_SNAP_TO_TILE && _tile_snap_points.empty()) return RSM_NO_SNAP;
> 	if (_rail_snap_mode == RSM_SNAP_TO_RAIL && _rail_snap_points.empty()) return RSM_NO_SNAP;
> 	return _rail_snap_mode;
> }
> 
> /**
>  * Set current current rail track snapping mode.
>  * @param mode New snapping mode.
>  */
> void SetRailSnapMode(RailSnapMode mode)
> {
> 	_rail_snap_mode = mode;
> 
> 	if ((_thd.place_mode & HT_POLY) && (GetRailSnapMode() == RSM_NO_SNAP)) {
> 		SetTileSelectSize(1, 1);
> 	}
> }
> 
> /**
>  * Get the tile that is set to be a snapping point for rail tracks (used when
>  * #RSM_SNAP_TO_TILE mode is active).
>  *
>  * @return The tile.
>  */
> static TileIndex GetRailSnapTile()
> {
> 	if (_tile_snap_points.empty()) return INVALID_TILE;
> 	return TileVirtXY(_tile_snap_points[DIAGDIR_NE].x, _tile_snap_points[DIAGDIR_NE].y);
> }
> 
> /**
>  * Set the tile that is meant to be a snapping point for rail tracks (used when
>  * #RSM_SNAP_TO_TILE mode is active).
>  *
>  * @param tile The tile.
>  */
> static void SetRailSnapTile(TileIndex tile)
> {
> 	_tile_snap_points.clear();
> 	if (tile == INVALID_TILE) return;
> 
> 	for (DiagDirection dir = DIAGDIR_BEGIN; dir < DIAGDIR_END; dir++) {
> 		auto point = LineSnapPointAtRailTrackEndpoint(tile, dir, false, NULL);
> 		point.dirs = ROR<uint8>(point.dirs, DIRDIFF_REVERSE);
> 		_tile_snap_points.push_back(point);
> 	}
> }
> 
> /** Clear all stored rail snapping points and reset the snapping mode. */
> void ResetRailPlacementEndpoints()
> {
> 	_rail_snap_mode = RSM_NO_SNAP;
> 	_tile_snap_points.clear();
> 	_rail_snap_points.clear();
> 	_current_snap_lock.x = -1;
> }
> 
> namespace citymania {
> 	void (*DrawTileSelectionRect)(const TileInfo *ti, PaletteID pal) = &::DrawTileSelectionRect;
> 	void (*DrawAutorailSelection)(const TileInfo *ti, HighLightStyle autorail_type, PaletteID pal) = &::DrawAutorailSelection;
diff -r -B -X .diff-exclude vanilla/src/viewport_func.h cmclient/src/viewport_func.h
61c61
< bool HandleViewportClicked(const ViewPort *vp, int x, int y);
---
> bool HandleViewportClicked(const ViewPort *vp, int x, int y, bool double_click);
diff -r -B -X .diff-exclude vanilla/src/viewport_gui.cpp cmclient/src/viewport_gui.cpp
154a155,159
> 
> 	virtual void OnMouseOver(Point pt, int widget)
> 	{
> 		if (pt.x != -1) GuiPrepareTooltipsExtra(this);
> 	}
diff -r -B -X .diff-exclude vanilla/src/viewport_sprite_sorter.h cmclient/src/viewport_sprite_sorter.h
39c39
< 	bool comparison_done;           ///< Used during sprite sorting: true if sprite has been compared with all other sprites
---
> 	uint32 order;                   ///< Used during sprite sorting
diff -r -B -X .diff-exclude vanilla/src/viewport_sprite_sorter_sse4.cpp cmclient/src/viewport_sprite_sorter_sse4.cpp
15a16,18
> #include <forward_list>
> #include <map>
> #include <stack>
26d28
< /** Sort parent sprites pointer array using SSE4.1 optimizations. */
28a31,32
> 	if (psdv->size() < 2) return;
> 
30,33d33
< 	auto const psdvend = psdv->end();
< 	auto psd = psdv->begin();
< 	while (psd != psdvend) {
< 		ParentSpriteToDraw * const ps = *psd;
35,36c35,73
< 		if (ps->comparison_done) {
< 			psd++;
---
> 	/* We rely on sprites being, for the most part, already ordered.
> 	 * So we don't need to move many of them and can keep track of their
> 	 * order effecienty by using stack. We always move sprites to the front
> 	 * of the current position, i.e. to the top of the stack.
> 	 * Also use special constants to indicate sorting state without
> 	 * adding extra fields to ParentSpriteToDraw structure.
> 	 */
> 	const uint32 ORDER_COMPARED = UINT32_MAX; // Sprite was compared but we still need to compare the ones preceding it
> 	const uint32 ORDER_RETURNED = UINT32_MAX - 1; // Makr sorted sprite in case there are other occurences of it in the stack
> 	std::stack<ParentSpriteToDraw *> sprite_order;
> 	uint32 next_order = 0;
> 
> 	std::forward_list<std::pair<int64, ParentSpriteToDraw *>> sprite_list;  // We store sprites in a list sorted by xmin+ymin
> 
> 	/* Initialize sprite list and order. */
> 	for (auto p = psdv->rbegin(); p != psdv->rend(); p++) {
> 		sprite_list.push_front(std::make_pair((*p)->xmin + (*p)->ymin, *p));
> 		sprite_order.push(*p);
> 		(*p)->order = next_order++;
> 	}
> 
> 	sprite_list.sort();
> 
> 	std::vector<ParentSpriteToDraw*> preceding;  // Temporarily stores sprites that precede current and their position in the list
> 	auto preceding_prev = sprite_list.begin(); // Store iterator in case we need to delete a single preciding sprite
> 	auto out = psdv->begin();  // Iterator to output sorted sprites
> 
> 	while (!sprite_order.empty()) {
> 
> 		auto s = sprite_order.top();
> 		sprite_order.pop();
> 
> 		/* Sprite is already sorted, ignore it. */
> 		if (s->order == ORDER_RETURNED) continue;
> 
> 		/* Sprite was already compared, just need to output it. */
> 		if (s->order == ORDER_COMPARED) {
> 			*(out++) = s;
> 			s->order = ORDER_RETURNED;
40c77
< 		ps->comparison_done = true;
---
> 		preceding.clear();
42,43c79,96
< 		for (auto psd2 = psd + 1; psd2 != psdvend; psd2++) {
< 			ParentSpriteToDraw * const ps2 = *psd2;
---
> 		/* We only need sprites with xmin <= s->xmax && ymin <= s->ymax && zmin <= s->zmax
> 		 * So by iterating sprites with xmin + ymin <= s->xmax + s->ymax
> 		 * we get all we need and some more that we filter out later.
> 		 * We don't include zmin into the sum as there are usually more neighbors on x and y than z
> 		 * so including it will actually increase the amount of false posistives.
> 		 * Also min coordinates can be > xmax so use max(xmin, xmax) + max(ymin, ymax)
> 		 * to ensure we terate the current sprite as we need to remove it from the list.
> 		 */
> 		auto ssum = max(s->xmax, s->xmin) + max(s->ymax, s->ymin);
> 		auto prev = sprite_list.before_begin();
> 		auto x = sprite_list.begin();
> 		while(x != sprite_list.end() && ((*x).first <= ssum)) {
> 			auto p = (*x).second;
> 			if (p == s) {
> 				/* We found the current sprite, remove it and move on. */
> 				x = sprite_list.erase_after(prev);
> 				continue;
> 			}
45c98,99
< 			if (ps2->comparison_done) continue;
---
> 			auto p_prev = prev;
> 			prev = x++;
47,65c101,105
< 			/*
< 			 * Decide which comparator to use, based on whether the bounding boxes overlap
< 			 *
< 			 * Original code:
< 			 * if (ps->xmax >= ps2->xmin && ps->xmin <= ps2->xmax && // overlap in X?
< 			 *     ps->ymax >= ps2->ymin && ps->ymin <= ps2->ymax && // overlap in Y?
< 			 *     ps->zmax >= ps2->zmin && ps->zmin <= ps2->zmax) { // overlap in Z?
< 			 *
< 			 * Above conditions are equivalent to:
< 			 * 1/    !( (ps->xmax >= ps2->xmin) && (ps->ymax >= ps2->ymin) && (ps->zmax >= ps2->zmin)   &&    (ps->xmin <= ps2->xmax) && (ps->ymin <= ps2->ymax) && (ps->zmin <= ps2->zmax) )
< 			 * 2/    !( (ps->xmax >= ps2->xmin) && (ps->ymax >= ps2->ymin) && (ps->zmax >= ps2->zmin)   &&    (ps2->xmax >= ps->xmin) && (ps2->ymax >= ps->ymin) && (ps2->zmax >= ps->zmin) )
< 			 * 3/  !( ( (ps->xmax >= ps2->xmin) && (ps->ymax >= ps2->ymin) && (ps->zmax >= ps2->zmin) ) &&  ( (ps2->xmax >= ps->xmin) && (ps2->ymax >= ps->ymin) && (ps2->zmax >= ps->zmin) ) )
< 			 * 4/ !( !( (ps->xmax <  ps2->xmin) || (ps->ymax <  ps2->ymin) || (ps->zmax <  ps2->zmin) ) && !( (ps2->xmax <  ps->xmin) || (ps2->ymax <  ps->ymin) || (ps2->zmax <  ps->zmin) ) )
< 			 * 5/ PTEST <---------------------------------- rslt1 ---------------------------------->         <------------------------------ rslt2 -------------------------------------->
< 			 */
< 			__m128i ps1_max = LOAD_128((__m128i*) &ps->xmax);
< 			__m128i ps2_min = LOAD_128((__m128i*) &ps2->xmin);
< 			__m128i rslt1 = _mm_cmplt_epi32(ps1_max, ps2_min);
< 			if (!_mm_testz_si128(mask_ptest, rslt1))
---
> 			/* Check that p->xmin <= s->xmax && p->ymin <= s->ymax && p->zmin <= s->zmax */
> 			__m128i s_max = LOAD_128((__m128i*) &s->xmax);
> 			__m128i p_min = LOAD_128((__m128i*) &p->xmin);
> 			__m128i r1 = _mm_cmplt_epi32(s_max, p_min);
> 			if (!_mm_testz_si128(mask_ptest, r1))
68,71c108,114
< 			__m128i ps1_min = LOAD_128((__m128i*) &ps->xmin);
< 			__m128i ps2_max = LOAD_128((__m128i*) &ps2->xmax);
< 			__m128i rslt2 = _mm_cmplt_epi32(ps2_max, ps1_min);
< 			if (_mm_testz_si128(mask_ptest, rslt2)) {
---
> 			/* Check if sprites overlap, i.e.
> 			 * s->xmin <= p->xmax && s->ymin <= p->ymax && s->zmin <= p->zmax
> 			 */
> 			__m128i s_min = LOAD_128((__m128i*) &s->xmin);
> 			__m128i p_max = LOAD_128((__m128i*) &p->xmax);
> 			__m128i r2 = _mm_cmplt_epi32(p_max, s_min);
> 			if (_mm_testz_si128(mask_ptest, r2)) {
78,79c121,122
< 				if (ps->xmin + ps->xmax + ps->ymin + ps->ymax + ps->zmin + ps->zmax <=
< 						ps2->xmin + ps2->xmax + ps2->ymin + ps2->ymax + ps2->zmin + ps2->zmax) {
---
> 					if (s->xmin + s->xmax + s->ymin + s->ymax + s->zmin + s->zmax <=
> 							p->xmin + p->xmax + p->ymin + p->ymax + p->zmin + p->zmax) {
84,87c127,148
< 			/* Move ps2 in front of ps */
< 			ParentSpriteToDraw * const temp = ps2;
< 			for (auto psd3 = psd2; psd3 > psd; psd3--) {
< 				*psd3 = *(psd3 - 1);
---
> 			preceding.push_back(p);
> 			preceding_prev = p_prev;
> 		}
> 
> 		if (preceding.empty()) {
> 			/* No preceding sprites, add current one to the output */
> 			*(out++) = s;
> 			s->order = ORDER_RETURNED;
> 			continue;
> 		}
> 
> 		/* Optimization for the case when we only have 1 sprite to move. */
> 		if (preceding.size() == 1) {
> 			auto p = preceding[0];
> 			/* We can only output the preceding sprite if there can't be any other sprites preceding it. */
> 			if (p->xmax <= s->xmax && p->ymax <= s->ymax && p->zmax <= s->zmax) {
> 				p->order = ORDER_RETURNED;
> 				s->order = ORDER_RETURNED;
> 				sprite_list.erase_after(preceding_prev);
> 				*(out++) = p;
> 				*(out++) = s;
> 				continue;
89c150,162
< 			*psd = temp;
---
> 		}
> 
> 		/* Sort all preceding sprites by order and assign new orders in reverse (as original sorter did). */
> 		std::sort(preceding.begin(), preceding.end(), [](const ParentSpriteToDraw *a, const ParentSpriteToDraw *b) {
> 			return a->order >  b->order;
> 		});
> 
> 		s->order = ORDER_COMPARED;
> 		sprite_order.push(s);  // Still need to output so push it back for now
> 
> 		for (auto p: preceding) {
> 			p->order = next_order++;
> 			sprite_order.push(p);
diff -r -B -X .diff-exclude vanilla/src/viewport_type.h cmclient/src/viewport_type.h
116a117
> 	DDSP_DEMOLISH_TREES,       ///< Clear trees
125a127
> 	DDSP_MEASURE,              ///< Measurement tool
Only in cmclient/src: watch_gui.cpp
Only in cmclient/src: watch_gui.h
diff -r -B -X .diff-exclude vanilla/src/waypoint_gui.cpp cmclient/src/waypoint_gui.cpp
27a28,29
> #include "citymania/cm_hotkeys.hpp"
> 
91c93
< 				if (_ctrl_pressed) {
---
> 				if (citymania::_fn_mod) {
diff -r -B -X .diff-exclude vanilla/src/widget.cpp cmclient/src/widget.cpp
218c218
< 	assert(img != 0);
---
> 
219a220
> 	if (img == 0) return;
Only in cmclient/src/widgets: cargo_table_widget.h
diff -r -B -X .diff-exclude vanilla/src/widgets/company_widget.h cmclient/src/widgets/company_widget.h
52a53,58
> 
> 	WID_C_SELECT_MOD,
> 	WID_C_SELECT_MOD_JOIN,
> 	WID_C_MOD_COMPANY_JOIN,
> 	WID_C_MOD_COMPANY_RESET,
> 	WID_C_MOD_COMPANY_TOGGLE_LOCK,
diff -r -B -X .diff-exclude vanilla/src/widgets/dropdown.cpp cmclient/src/widgets/dropdown.cpp
44c44,49
< 
---
> /*
> const char * DropDownListCharStringItem::String() const
> {
> 	return this->string;
> }
> */
diff -r -B -X .diff-exclude vanilla/src/widgets/graph_widget.h cmclient/src/widgets/graph_widget.h
29a30,33
> 	WID_CPR2_FOOTER,          ///< Footer.
> 	WID_CPR2_ENABLE_CARGOES,  ///< Enable cargoes button.
> 	WID_CPR2_DISABLE_CARGOES, ///< Disable cargoes button.
> 	WID_CPR2_CARGO_FIRST,     ///< First cargo in the list.
42a47
> 	WID_CPR_KEY_BUTTON,      ///< Key button.
diff -r -B -X .diff-exclude vanilla/src/widgets/industry_widget.h cmclient/src/widgets/industry_widget.h
19a20,21
> 	WID_DPI_FT_OFF,         ///< Forbidden tiles highlight off button.
> 	WID_DPI_FT_ON,          ///< Forbidden tiles highlight on button.
diff -r -B -X .diff-exclude vanilla/src/widgets/network_widget.h cmclient/src/widgets/network_widget.h
51a52,56
> 
> 	WID_NG_CITYMANIA,          ///< filter citymania
> 	WID_NG_REDDIT,             ///< filter reddit
> 	WID_NG_NICE,               ///< filter n-ice
> 	WID_NG_BTPRO,              ///< filter btpro
diff -r -B -X .diff-exclude vanilla/src/widgets/rail_widget.h cmclient/src/widgets/rail_widget.h
21a22
> 	WID_RAT_POLYRAIL,       ///< Polyline rail tool.
100,103c101,105
< 	WID_BRAD_DEPOT_NE, ///< Build a depot with the entrance in the north east.
< 	WID_BRAD_DEPOT_SE, ///< Build a depot with the entrance in the south east.
< 	WID_BRAD_DEPOT_SW, ///< Build a depot with the entrance in the south west.
< 	WID_BRAD_DEPOT_NW, ///< Build a depot with the entrance in the north west.
---
> 	WID_BRAD_DEPOT_NE,   ///< Build a depot with the entrance in the north east.
> 	WID_BRAD_DEPOT_SE,   ///< Build a depot with the entrance in the south east.
> 	WID_BRAD_DEPOT_SW,   ///< Build a depot with the entrance in the south west.
> 	WID_BRAD_DEPOT_NW,   ///< Build a depot with the entrance in the north west.
> 	WID_BRAD_DEPOT_AUTO, ///< Build a depot, autoselect entrance.
diff -r -B -X .diff-exclude vanilla/src/widgets/road_widget.h cmclient/src/widgets/road_widget.h
19c19
< 	WID_ROT_AUTOROAD,       ///< Autorail.
---
> 	WID_ROT_AUTOROAD,       ///< Autoroad.
34,38c34,39
< 	WID_BROD_CAPTION,   ///< Caption of the window.
< 	WID_BROD_DEPOT_NE,  ///< Depot with NE entry.
< 	WID_BROD_DEPOT_SE,  ///< Depot with SE entry.
< 	WID_BROD_DEPOT_SW,  ///< Depot with SW entry.
< 	WID_BROD_DEPOT_NW,  ///< Depot with NW entry.
---
> 	WID_BROD_CAPTION,    ///< Caption of the window.
> 	WID_BROD_DEPOT_NE,   ///< Depot with NE entry.
> 	WID_BROD_DEPOT_SE,   ///< Depot with SE entry.
> 	WID_BROD_DEPOT_SW,   ///< Depot with SW entry.
> 	WID_BROD_DEPOT_NW,   ///< Depot with NW entry.
> 	WID_BROD_DEPOT_AUTO, ///< Depot, autodetect entry.
44,54c45,57
< 	WID_BROS_CAPTION,       ///< Caption of the window.
< 	WID_BROS_BACKGROUND,    ///< Background of the window.
< 	WID_BROS_STATION_NE,    ///< Terminal station with NE entry.
< 	WID_BROS_STATION_SE,    ///< Terminal station with SE entry.
< 	WID_BROS_STATION_SW,    ///< Terminal station with SW entry.
< 	WID_BROS_STATION_NW,    ///< Terminal station with NW entry.
< 	WID_BROS_STATION_X,     ///< Drive-through station in x-direction.
< 	WID_BROS_STATION_Y,     ///< Drive-through station in y-direction.
< 	WID_BROS_LT_OFF,        ///< Turn off area highlight.
< 	WID_BROS_LT_ON,         ///< Turn on area highlight.
< 	WID_BROS_INFO,          ///< Station acceptance info.
---
> 	WID_BROS_CAPTION,          ///< Caption of the window.
> 	WID_BROS_BACKGROUND,       ///< Background of the window.
> 	WID_BROS_STATION_NE,       ///< Terminal station with NE entry.
> 	WID_BROS_STATION_SE,       ///< Terminal station with SE entry.
> 	WID_BROS_STATION_SW,       ///< Terminal station with SW entry.
> 	WID_BROS_STATION_NW,       ///< Terminal station with NW entry.
> 	WID_BROS_STATION_X,        ///< Drive-through station in x-direction.
> 	WID_BROS_STATION_Y,        ///< Drive-through station in y-direction.
> 	WID_BROS_STATION_AUTO,     ///< Terminal station, autoselect entry.
> 	WID_BROS_STATION_XY_AUTO,  ///< Drive-through station, autoselect direction.
> 	WID_BROS_LT_OFF,           ///< Turn off area highlight.
> 	WID_BROS_LT_ON,            ///< Turn on area highlight.
> 	WID_BROS_INFO,             ///< Station acceptance info.
diff -r -B -X .diff-exclude vanilla/src/widgets/smallmap_widget.h cmclient/src/widgets/smallmap_widget.h
28a29
> 	CM_WID_SM_IMBA,        ///< CityMania IMBA mode (Industries, Contour, Vegetation)
diff -r -B -X .diff-exclude vanilla/src/widgets/statusbar_widget.h cmclient/src/widgets/statusbar_widget.h
17a18
>     CM_WID_S_APM, ///< CityMania EPM counter.
diff -r -B -X .diff-exclude vanilla/src/widgets/terraform_widget.h cmclient/src/widgets/terraform_widget.h
20a21
> 	WID_TT_DEMOLISH_TREES,                    ///< Demolish trees only
diff -r -B -X .diff-exclude vanilla/src/widgets/toolbar_widget.h cmclient/src/widgets/toolbar_widget.h
23a24
> 	WID_TN_CARGOS,        ///< Transported cargo menu
26a28
> 	WID_TN_WATCH,         ///< Watch gui menu
diff -r -B -X .diff-exclude vanilla/src/widgets/town_widget.h cmclient/src/widgets/town_widget.h
20a21
> 	TDW_CAPTION_TEXT,
44a46
> 	WID_TV_CB,
63a66,96
> };
> 
> enum TownHK {
> 	HK_SADVERT,
> 	HK_MADVERT,
> 	HK_LADVERT,
> 	HK_ROADS,
> 	HK_STATUE,
> 	HK_FUND,
> };
> 
> enum CBTownWidgets {
> 	WID_CB_LOCATION,
> 	WID_CB_ADVERT,
> 	WID_CB_ADVERT_REGULAR,
> 	WID_CB_FUND,
> 	WID_CB_FUND_REGULAR,
> 	WID_CB_POWERFUND,
> 	WID_CB_DETAILS,
> 	WID_CB_CARGO_NAME,
> 	WID_CB_CARGO_AMOUNT,
> 	WID_CB_CARGO_REQ,
> 	WID_CB_CARGO_PREVIOUS,
> 	WID_CB_CARGO_STORE,
> 	WID_CB_CARGO_STORE_PCT,
> 	WID_CB_CARGO_FROM,
> 	WID_CB_CENTER_VIEW,
> 	WID_CB_TOWN_VIEW,
> 	WID_CB_SHOW_AUTHORITY,
> 	WID_CB_SELECT_REQUIREMENTS,
> 	WID_CB_GOALS,
diff -r -B -X .diff-exclude vanilla/src/window.cpp cmclient/src/window.cpp
11a12
> #include <limits>
33a35
> #include "window_gui.h"
41a44,45
> #include "citymania/cm_hotkeys.hpp"
> 
725c729
< 			if (_ctrl_pressed) {
---
> 			if (citymania::_fn_mod) {
759c763
< 			if (_ctrl_pressed) w->window_desc->pref_sticky = (w->flags & WF_STICKY) != 0;
---
> 			if (citymania::_fn_mod) w->window_desc->pref_sticky = (w->flags & WF_STICKY) != 0;
1234a1239
> 			case WC_CARGOS:
1792a1798,1799
> 		pt.y = w->top + ((desc->parent_cls == WC_BUILD_TOOLBAR || desc->parent_cls == WC_SCEN_LAND_GEN) ? w->height : 10);
> 		return pt;
2730,2737c2737,2745
< void HandleCtrlChanged()
< {
< 	/* Call the event, start with the uppermost window. */
< 	Window *w;
< 	FOR_ALL_WINDOWS_FROM_FRONT(w) {
< 		if (w->OnCTRLStateChange() == ES_HANDLED) return;
< 	}
< }
---
> // Use CityMania modifier key handling
> // void HandleCtrlChanged()
> // {
> // 	/* Call the event, start with the uppermost window. */
> // 	Window *w;
> // 	FOR_ALL_WINDOWS_FROM_FRONT(w) {
> // 		if (w->OnCTRLStateChange() == ES_HANDLED) return;
> // 	}
> // }
2925c2933
< 				if (HandleViewportClicked(vp, x, y)) return;
---
> 				if (HandleViewportClicked(vp, x, y, click == MC_DOUBLE_LEFT)) return;
3641a3650,3700
> }
> 
> /**
>  * Sets safe-initial values.
>  * @param t The type of positioning desired.
>  */
> WindowPopup::WindowPopup(WindowDesc *desc, WindowPopupType t): Window(desc)
> {
> 	this->type = t;
> 	this->wpu_mod_x = -5;
> 	this->wpu_mod_y = -5;
> 	this->wpu_widget = std::numeric_limits<uint>::max();
> }
> 
> /**
>  * Compute #WindowPopup origin Point.
>  *
>  * @param desc The window's #WindowDesc object
>  * @param sm_width Window's smallest_x.
>  * @param sm_height Window's smallest_y. Unused.
>  * @param window_number Unused.
>  * @return The origin coordinate of the window.
>  */
> /*virtual*/ Point WindowPopup::OnInitialPosition(int16 sm_width, int16 sm_height, int window_number)
> {
> 	int x, y;
> 
> 	switch (this->type) {
> 		case WPUT_CENTERED:
> 			x = _cursor.pos.x - sm_width / 2;
> 			y = _cursor.pos.y - this->window_desc->GetDefaultHeight() / 2;
> 			break;
> 		case WPUT_WIDGET_RELATIVE:
> 			if (this->wpu_widget != std::numeric_limits<uint>::max()) {
> 				NWidgetBase *wid = this->GetWidget<NWidgetBase>(this->wpu_widget);
> 				x = _cursor.pos.x - wid->pos_x + this->wpu_mod_x;
> 				y = _cursor.pos.y - wid->pos_y + this->wpu_mod_y;
> 				break;
> 			}
> 			FALLTHROUGH;  // suppress warning, no idea if it's actually correct
> 		case WPUT_ORIGIN:
> 		default:
> 			x = _cursor.pos.x + this->wpu_mod_x;
> 			y = _cursor.pos.y + this->wpu_mod_y;
> 			break;
> 	}
> 
> 	Point rv;
> 	rv.x = Clamp(x, 0, _screen.width - sm_width);
> 	rv.y = Clamp(y, GetMainViewTop(), GetMainViewBottom() - this->window_desc->GetDefaultHeight());
> 	return rv;
diff -r -B -X .diff-exclude vanilla/src/window_gui.h cmclient/src/window_gui.h
17a18
> #include "station_base.h"
613,614c614,616
< 	virtual EventState OnCTRLStateChange() { return ES_NOT_HANDLED; }
< 
---
> 	// CM virtual EventState OnCTRLStateChange() { return ES_NOT_HANDLED; }
> 	virtual EventState CM_OnFnModStateChange() { return ES_NOT_HANDLED; }
> 	virtual EventState CM_OnRemoveModStateChange() { return ES_NOT_HANDLED; }
883a886
> void GuiPrepareTooltipsExtra(Window *parent);
914a918,944
> 
> 
> /**
>  * #WindowPopup positioning types
>  */
> enum WindowPopupType {
> 	WPUT_ORIGIN = 1,      ///< Align with the top-left corner of the window.
> 	WPUT_WIDGET_RELATIVE, ///< Align from a nested widget.
> 	WPUT_CENTERED,        ///< Center the widget under the cursor. Ignore modifiers.
> };
> 
> /**
>  * Specialized Window bound to open around the cursor's position.
>  * Its sole purpose is to provide the OnInitialPosition() method
>  * and an simple interface to control its behaviour.
>  */
> struct WindowPopup: public Window {
> public:
> 	WindowPopup(WindowDesc *desc, WindowPopupType t = WPUT_ORIGIN);
> 	virtual Point OnInitialPosition(int16 sm_width, int16 sm_height, int window_number);
> protected:
> 	uint wpu_widget; ///< The widget to which the computation would be made from when type is #WPUT_WIDGET_RELATIVE.
> 	int wpu_mod_x;   ///< The X axis modifier. A negative value would bring the window closer to the left edge of the screen. Default value is -5.
> 	int wpu_mod_y;   ///< The Y axis modifier. A negative value would bring the window closer to the top edge of the screen. Default value is -5.
> private:
> 	WindowPopupType type;
> };
diff -r -B -X .diff-exclude vanilla/src/window_type.h cmclient/src/window_type.h
109a110
> 	WC_STATION_RATING_TOOLTIP,
370a372,377
> 	//watch company
> 	WC_WATCH_COMPANY,
> 
> 	//watch company admin version
> 	WC_WATCH_COMPANYA,
> 
516a524
> 	WC_CARGOS,
692a701,704
> 	WC_ZONING_TOOLBAR,
> 	WC_COMMAND_TOOLBAR,
> 	WC_LOGIN_WINDOW,
> 	WC_CB_TOWN,
698a711,715
> 
> 	/*
> 	 * CityMania extra windows
> 	 */
> 	CM_WC_LAND_TOOLTIPS,
Only in cmclient/src: zoning_cmd.cpp
Only in cmclient/src: zoning_gui.cpp
Only in cmclient/src: zoning.h
Only in cmclient: update.sh
