dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,944 Commits 1 Branch 0 Tags
0e5dfa42c357e78314d97aa3b93ae753f4b6c60c
Commit Graph

47944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
8715574c4a Merge branch 'crashlog_improvements' into jgrpp 2019-04-18 18:34:12 +01:00
Jonathan G Rennison
73c8715eb6 Add LLDB self debug to OSX 2019-04-18 18:30:09 +01:00
Jonathan G Rennison
55fbf37373 Add missing includes to newgrf_text.cpp 2019-04-18 18:05:20 +01:00
Jonathan G Rennison
1c0643e419 Add GRF ID/name to "Too many NewGRF string parameters" messages 2019-04-17 23:00:57 +01:00
Jonathan G Rennison
0c3fbecb96 Delete GSortT implementation 
Unused
 2019-04-17 19:49:22 +01:00
translators
f0b3267615 Update: Translations from eints 
indonesian: 9 changes by fanioz
 2019-04-17 19:45:47 +02:00
Jonathan G Rennison
2a41d783cd Adjust vehicle position filter in ViewportMapDrawVehicles 2019-04-16 23:54:28 +01:00
PeterN
671a310d21 Fix #7235: Ensure catchment area of neutral station covers entire industry. (#7518) 2019-04-16 20:30:07 +01:00
translators
8ae15d9797 Update: Translations from eints 
indonesian: 6 changes by fanioz
 2019-04-16 19:45:42 +02:00
Jonathan G Rennison
0d93ecb6bf Merge branch 'master' into jgrpp 
# Conflicts:
#	src/core/alloc_type.hpp
#	src/group_gui.cpp
#	src/newgrf.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/map_sl.cpp
#	src/station_cmd.cpp
 2019-04-16 18:03:08 +01:00
Michael Lutz
38729297f9 Codechange: No need for AutoFreePtr if there's std::unique_ptr. 2019-04-15 22:52:50 +01:00
Michael Lutz
4e85ccf3c0 Codechange: Replace SmallStackSafeStackAlloc with std::array. 
The only port that ever used it to make heap allocations instead of stack ones was the NDS port, which got thrown out some time ago.
 2019-04-15 22:52:50 +01:00
stormcone
79343762a4 Fix: Typos. (#7517) 2019-04-15 22:06:41 +02:00
Jonathan G Rennison
793d01ec74 Open train vehicle details window on total cargo tab if ctrl presed 2019-04-15 19:12:37 +01:00
translators
3964604148 Update: Translations from eints 
luxembourgish: 1 change by Phreeze
 2019-04-15 19:45:42 +02:00
Jonathan G Rennison
b81967f42a Change default non-global polyrail hotkeys to Y, CTRL-Y 
This is to avoid a clash with the transparency hotkeys
 2019-04-15 18:08:25 +01:00
peter1138
4f052fc2a4 Cleanup: Fix alignment after NULL -> nullptr change. 2019-04-13 20:35:10 +01:00
glx
410b81537c Fix 801cbea9c: operator< is not always the best idea 
Also removes unused and anyway broken SmallMap::SortByKey() function.
 2019-04-13 21:05:25 +02:00
PeterN
3bbd7ea2c1 Fix: Industry coverage area is no longer rectangular. (#7464) 
AIs test station catchment in reverse to how players see station catchment.
This did not take account of non-rectangular station catchment areas, so AIs
could end up placing stations in locations that did not accept/deliver cargo.
 2019-04-13 14:27:57 +01:00
PeterN
abe8cf4985 Codechange: Replace duplicated code with TileArea::Expand() (#7467) 2019-04-13 14:12:34 +01:00
glx
801cbea9cc Codechange: use std::sort() for all std::vector types 2019-04-13 12:49:18 +01:00
glx
5b77102b63 Codechange: use std::sort() to sort file lists 2019-04-13 12:49:18 +01:00
glx
b52561fd38 Codechange: use std::sort() in EngList_Sort[Partial]() 2019-04-13 12:49:18 +01:00
glx
2db88953e7 Codechange: use std::sort() in GUIList 2019-04-13 12:49:18 +01:00
PeterN
b9b34f676b Change: Always report error when ordering a road vehicle to wrong type of road stop. (#7316) 
This was inconsistent before, depending on road/tram and articulated/single vehicle status.
 2019-04-13 12:43:49 +01:00
Jonathan G Rennison
fb5cae3120 Version: Committing version data for tag: jgrpp-0.30.3 2019-04-12 23:27:16 +01:00
Jonathan G Rennison
601f3aaef4 Fix race condition causing crashes/undefined behaviour on thread init on windows/MinGW 2019-04-12 23:10:32 +01:00
peter1138
5bd2b15e86 Codechange: Replace NULL with nullptr in squirrel interface. 2019-04-11 22:42:11 +01:00
Jonathan G Rennison
ab157ea07f Version: Committing version data for tag: jgrpp-0.30.2 2019-04-11 22:02:22 +01:00
Jonathan G Rennison
5c1168603d Exclude MinGW headers from source/project files on non-MinGW platforms 2019-04-11 21:05:36 +01:00
Jonathan G Rennison
1c7b454a57 Merge branch 'pr-7490' into jgrpp 
# Conflicts:
#	src/dock_gui.cpp
#	src/water_cmd.cpp
 2019-04-11 20:52:06 +01:00
Jonathan G Rennison
c365c904a2 Merge branch 'master' into jgrpp 2019-04-11 18:26:40 +01:00
Jonathan G Rennison
33a0253137 Update project files 2019-04-11 18:18:52 +01:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Jonathan G Rennison
f5747bf753 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/genworld_gui.cpp
#	src/group_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
 2019-04-11 18:12:22 +01:00
peter1138
c0836bccef Codechange: NULL -> nullptr in settings files. 2019-04-11 13:00:55 +01:00
peter1138
0130f3be45 Fix #7491: Send company update admin message when bankruptcy counter changes. 2019-04-11 13:00:25 +01:00
SamuXarick
4ad981a98e Fix 50e08f333a: Creating a cargo subsidy with town as source did not consider min population. (#7493) 2019-04-11 07:35:46 +01:00
Jonathan G Rennison
8c3d1b1c45 Convert secondary rail types in AfterLoadLabelMaps 
Handle missing rail types
 2019-04-11 01:58:56 +01:00
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
glx22
3b4f224c0b Fix #7494: std::sort() and qsort() use different comparators (#7495) 2019-04-10 20:55:53 +02:00
translators
87d588f22f Update: Translations from eints 
luxembourgish: 17 changes by Phreeze
spanish (mexican): 2 changes by njn
 2019-04-10 19:45:43 +02:00
Jonathan G Rennison
f887b12be2 Add 3rd party mingw-std-threads headers to fix MinGW compilation 2019-04-10 17:35:43 +01:00
Jonathan G Rennison
01f957c51f Fix: Crash due to use of invalid iterator in ClientNetworkContentSocketHandler 
In particular this crash can be observed when using the
bootstrap GUI to download the base graphics.

In ClientNetworkContentSocketHandler::OnReceiveContentInfo
ClientNetworkContentSocketHandler::callbacks is iterated, using an iterator
cb->OnReceiveContentInfo() is called (cb is of type BootstrapAskForDownloadWindow)
This calls new BootstrapContentDownloadStatusWindow()
This inherits from BaseNetworkContentDownloadStatusWindow
The constructor of which calls _network_content_client.AddCallback(this)
This reallocates the std::vector which is being iterated in ClientNetworkContentSocketHandler::OnReceiveContentInfo
This results in iter being invalid, and an assertion failure occurs shortly
afterwards due to its use in the next iteration of cb->OnReceiveContentInfo()

Adjust all locations where ClientNetworkContentSocketHandler::callbacks
is iterated to avoid problematic behaviour
 2019-04-09 22:56:23 +02:00
Michael Lutz
8b1880187a Remove: AutoFreeSmallVector. 
The last use was for storing a list of memory blocks. As the way these lists are accessed is very
specific, it is easier to just write an explicit destructor instead of trying to exactly match the behaviour.
 2019-04-09 22:45:15 +02:00
Michael Lutz
e804173595 Codechange: If something is a vector of strings, use a vector of strings instead of an AutoFreeSmallVector. 2019-04-09 22:45:15 +02:00
Michael Lutz
c7b9987d08 Codechange: Switch DropDownList to directly use std::vector, thus making AutoDeleteSmallVector obsolete. 
DropDownListItem are strongly managed using std::unique_ptr to ensure leak-free handling. Appropriate use
of move-semantics make intent a lot clearer than parameter comments and allows the compiler to generate
copy-free code for most situations.
 2019-04-09 22:45:15 +02:00
Michael Lutz
d3e113eb5f Codechange: Use std::vector instead of AutoDeleteSmallVector in GS text handling. 2019-04-09 22:45:15 +02:00
Michael Lutz
baf9229931 Codechange: Replace AutoDeleteSmallVector with direct std::vector use in text layout code. 2019-04-09 22:45:15 +02:00
Michael Lutz
329bb52613 Codechange: Store text layout runs directly as values in a std::vector instead of heap allocated. 
This reduces memory allocations and heap fragmentation.
 2019-04-09 22:45:15 +02:00