Commit Graph

49117 Commits

Author SHA1 Message Date
Jonathan G Rennison
147d9aef87 Crashlog: Remove unused variables 2020-06-18 00:54:18 +01:00
Jonathan G Rennison
663886843c Win32: Wine: Oversize buffer for WSAIoctl/SIO_GET_INTERFACE_LIST
This is a workaround for https://bugs.winehq.org/show_bug.cgi?id=49371

See also: 1e7a73b2
2020-06-12 17:15:03 +01:00
Jonathan G Rennison
3eb8d62148 Fix #157: Integer overflow in town GetNormalGrowthRate 2020-06-11 17:12:47 +01:00
Jonathan G Rennison
12c25be778 Debug: Add station delete counter to NewGRF debug 2020-06-07 19:50:37 +01:00
Jonathan G Rennison
271fac01a7 Add setting to scale station cargo capacity and rating tolerance by size 2020-06-07 19:50:37 +01:00
Jonathan G Rennison
1917a3e0f8 Station: Add field for number of station tiles 2020-06-07 14:37:59 +01:00
Jonathan G Rennison
c552e08ffe Version: Committing version data for tag: jgrpp-0.34.4 2020-06-05 22:03:15 +01:00
Jonathan G Rennison
43c538fa7d Merge branch 'master' into jgrpp
# Conflicts:
#	src/town_cmd.cpp
2020-06-05 17:07:58 +01:00
Marcus Calhoun-Lopez
eeed3a7613 Fix: unbreak building with ICU on macOS
A symbol clash breaks building ICU on macOS, and although it isn't
necessary, it might as well be possible.
2020-06-05 14:47:33 +01:00
TechGeekNZ
937b366546 Cleanup: StationCargoList::AreMergable doxygen comment references Vehicle instead of Station. 2020-06-05 14:27:09 +01:00
TechGeekNZ
012fea301d Cleanup: Add note explaining how settings.h is generated from source. 2020-06-05 08:38:40 +02:00
TechGeekNZ
f246f8faef Cleanup: Fix typo in settings.h.preamble. 2020-06-05 08:38:40 +02:00
TechGeekNZ
cdd2892c49 Codechange: Realign SDL driver with SDL2 driver to ease maintenance and emphasise differences. 2020-06-04 09:05:21 +01:00
Yexo
1507902d00 Codechange: remove has_newindustries global 2020-06-01 22:46:06 +02:00
Yexo
ce618bf7e9 Codechange: replace custom timer and OnGameTick() with OnHundrethTick() 2020-06-01 22:46:06 +02:00
Yexo
a82572d0f5 Codechange: remove has_newhouses global 2020-06-01 22:46:06 +02:00
Jonathan G Rennison
677940cfc6 Merge branch 'master' into jgrpp 2020-06-01 20:39:46 +01:00
Michael Lutz
1c0ba07c3c Add: [Script] Native priority queue; useful e.g. for pathfinders. 2020-06-01 21:35:13 +02:00
Jonathan G Rennison
52e0d44c8a Revert "Fix recursive faults in Window crash logger due to message box event loop."
This reverts commit 2b1b7f8b135968cb88d8e65fcb89cdff8d203838.

Replaced by b5ca2161d9.
2020-06-01 19:39:37 +01:00
Niels Martin Hansen
764497206a Fix #8066: Try another fallback colourspace if first one fails 2020-06-01 19:43:37 +02:00
glx
b3ddf2c907 Fix: [Win32] Crash message not fitting in crash dialog 2020-06-01 14:09:58 +02:00
glx
b5ca2161d9 Fix #7970: [Win32] Disable event loop on crash to prevent recursive faults 2020-06-01 14:09:58 +02:00
Yexo
f827bc8c1a Fix #8166: don't crash on loading an invalid roadtype newgrf
Initialization code for GRFFile::roadtype_map was copied from
railtype_map. But while RailType is a byte-sized enum and could thus
be initialized via memset, RoadType doesn't have a defined size.
2020-06-01 12:44:02 +02:00
Yexo
a9b3312d1a Fix #8024: make online content gui more responsive while loading
Previously the internal content list was invalidated and sorted for
every new item added. Now the sorting is delayed until the GUI is
drawn, which means we only sort once per GUI tick.

Since the amount of incoming items per GUI tick is not controlled by
the GUI but rather by network speed, we were previously doing a lot
of duplicate work per tick, causing the mouse cursor to lag while
the list was initialized.
2020-06-01 10:59:11 +02:00
translators
281d93f600 Update: Translations from eints
croatian: 1 change by VoyagerOne
2020-05-30 19:45:39 +02:00
TechGeekNZ
16e5f610f7 Cleanup: Correct typographic errors in code comments. 2020-05-28 08:26:41 +01:00
Jonathan G Rennison
b018ebf268 Pathfinder: Fix incorrect handling of rail type 90° turns
Due to parenthesis/editing error
2020-05-27 22:02:28 +01:00
Jonathan G Rennison
f11cd8f2d0 Fix: Compilation warnings in story_gui and script_story_page
See: #7896
2020-05-27 22:22:56 +02:00
Jonathan G Rennison
14e7d43c62 Merge branch 'master' into jgrpp 2020-05-27 20:47:54 +01:00
TechGeekNZ
df0f9193da Fix some typographical errors in comments
Fixes: #153
Applied from: #153
2020-05-27 20:45:05 +01:00
Jonathan G Rennison
8d454cd006 Merge branch 'cargo_type_order' into jgrpp 2020-05-27 20:44:58 +01:00
Jonathan G Rennison
78ef36ec6a Merge pull request #155 into cargo_type_order 2020-05-27 20:44:17 +01:00
Jonathan G Rennison
2e93ca9409 Increase verbosity of chosen track assert in TrainController 2020-05-27 19:35:36 +01:00
Jonathan G Rennison
42acbbb936 Debug: Show rail type flags in debug window 2020-05-27 19:35:08 +01:00
translators
71e9c2a71b Update: Translations from eints
chinese (traditional): 2 changes by ww9980
chinese (simplified): 1 change by ww9980
2020-05-27 19:45:40 +02:00
TechGeekNZ
082404e443 Fix: Vehicle leaves station without loading if there is a per-cargo "no load" order for the currently fitted cargo. 2020-05-27 13:32:11 +12:00
glx
bfa2e4edf0 Fix: Inconsistency in handling of SDL2 in source.list 2020-05-26 22:44:18 +02:00
glx
2b2f60caf5 Fix: VS 2019 16.6 doesn't like newlines in <SettingsCommandLine> 2020-05-26 22:44:18 +02:00
Niels Martin Hansen
800ade7702
Feature: Push-buttons on storybook pages (#7896)
Allow more direct player-initiated interaction for Game Scripts, by letting the GS put push-buttons on storybook pages. These buttons can either trigger an immediate event, or require the player to first select a tile on the map, or a vehicle.

Additionally this reworks how the storybook pages are layouted and rendered, to allow for slightly more complex layouts, and maybe speeding drawing up a bit.
2020-05-22 22:22:55 +02:00
Jonathan G Rennison
5243cfd6d0 Use TinyString for custom name fields which are almost always empty 2020-05-22 00:10:09 +01:00
Jonathan G Rennison
81e69fcbbe Add TinyString: SLE_STR compatible c-string wrapper 2020-05-21 23:44:34 +01:00
Jonathan G Rennison
f8d6e781ba Merge branch 'master' into jgrpp
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
2020-05-21 22:24:01 +01:00
Michael Lutz
c972a63c8c Codechange: Store info about the dedicated server log file in globals with automatic destruction to simplify control flow in openttd_main. 2020-05-21 20:02:34 +02:00
Michael Lutz
37bc2f8064 Codechange: Use std::string in the driver and blitter selection code. 2020-05-21 20:02:34 +02:00
Michael Lutz
a49fdb7ebb Codechange: Store base set related texts in std::strings. 2020-05-21 20:02:34 +02:00
Michael Lutz
715aa67a9c Codechange: Use std::string in INI file parsing. 2020-05-21 20:02:34 +02:00
Michael Lutz
8aef14386f Add: Optional implementation of std::optional for pre-C++17 compilers.
Sourced from https://github.com/akrzemi1/Optional, Boost Software License, Version 1.0.
2020-05-21 20:02:34 +02:00
Michael Lutz
63ccb36ef3 Codechange: Use std::string for most of the user-settable custom names. 2020-05-21 20:02:34 +02:00
Michael Lutz
9b6f5e3bb8 Codechange: Store GS lang texts in std::strings. 2020-05-21 20:02:34 +02:00
Michael Lutz
9c2e47d03c Codechange: Use std::string for storing GRF error messages. 2020-05-21 20:02:34 +02:00