212140b88b
Codechange: replace grow() usage in ClientNetworkContentSocketHandler::OnReceiveData()
5 years ago
9197926bca
Fix #7165 : Missed another 'Append() --> push_back()' replacement ( #7548 )
...
(cherry picked from commit 0ab6244f6b
5 years ago
5b34c8019f
Codechange: Remove Company/OwnerByte types
5 years ago
0ab6244f6b
Fix #7165 : Missed another 'Append() --> push_back()' replacement ( #7548 )
5 years ago
d5841109f0
Fix dcb2571: Missing override keywords
5 years ago
a64bd6e22c
Fix: Also breaking for warning text in set company password
5 years ago
dcb2571888
Add: Warn players that company passwords are not truly secure
5 years ago
bd2fdde759
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
5 years ago
ede88aa6cd
Fix multi-packet network content requests (ContentVector)
...
Broken by incorrect merge conflict resolution in ba34ec7ad#86
5 years ago
8899272614
Codechange: use std::vector for _language_dropdown
5 years ago
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
5 years ago
2db88953e7
Codechange: use std::sort() in GUIList
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
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
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
f887b12be2
Add 3rd party mingw-std-threads headers to fix MinGW compilation
5 years ago
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
5 years ago
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.
5 years ago
e804173595
Codechange: If something is a vector of strings, use a vector of strings instead of an AutoFreeSmallVector.
5 years ago
361758b516
Merge branches 'crashlog_improvements', 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/core/smallstack_type.hpp
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/misc.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
5 years ago
74e5e04724
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
5 years ago
ae748166d0
Codechange: Use platform independent C++11 function for sleeping on a thread.
5 years ago
94c5269fa7
Codechange: Use atomic variables for thread synchronization where useful.
5 years ago
05bc2ed7cb
Codechange: Replace custom thread code with C++11 thread objects.
...
We assume a conforming C++11 compiler environment that has a valid <thread>-header.
Failure to run a real thread is handled gracefully.
5 years ago
05f4e73608
Codechange: Replace custom mutex code with C++11 mutex'es.
...
A conforming compiler with a valid <mutex>-header is expected.
Most parts of the code assume that locking a mutex will never fail unexpectedly,
which is generally true on all common platforms that don't just pretend to
be C++11. The use of condition variables in driver code is checked.
5 years ago
a1e492d0d8
Fix #7439 : don't overwrite CompanyRemoveReason with ClientID ( #7465 )
5 years ago
58433c7667
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
5 years ago
9244dad3f1
Fix #7434 : Incorrect use of vector iterator. ( #7437 )
5 years ago
66dd7c3879
Fix: MSVC warnings ( #7423 )
5 years ago
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
b913c92aa7
Fix #7165 : Missed 'Append() --> push_back()' replacement
5 years ago
cc62f4163f
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
5 years ago
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
5 years ago
297fd3dda3
Codechange: Replaced SmallVector::Include() with include()
5 years ago
2bc2de9034
Codechange: Replaced SmallVector::Find() with std::find()
5 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
ca2f33c6d0
Codechange: Replaced SmallVector::Erase() with std::vector::erase()
5 years ago
097328c3d7
Codechange: Replaced SmallVector::Get() const with std alternatives
5 years ago
5795f66d2e
Codechange: Replaced SmallVector::Contains() with std::find() pattern
5 years ago
8460952240
Codechange: Replaced SmallVector::Find() const with suitable alternatives
...
The use of std::none_of in network/core/host.cpp is driven by the non-const
comparison operator use by NetworkAddress. A future commit should address
the const_casts in that class to ensure const-correctness.
5 years ago
81315939b9
Codechange: Replaced SmallVector::Find() non-const with std::find()
5 years ago
f3938fdb83
Codechange: Replaced SmallVector::Reset() with std::vector::clear() + shrink_to_fit()
5 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
5 years ago
9cba6f7193
Codechange: Replaced SmallVector::Compact() with std::vector::shrink_to_fit()
5 years ago
bfd79e59dc
Codechange: Replace SmallVector::Clear() with std::vector::clear()
5 years ago
07de9d6c3f
Codechange: Use override keyword in networking classes.
5 years ago
317f69c152
Codechange: Use override specifier in Window-derived classes.
5 years ago
af7d9020a1
Codechange: Use override specifer for overriding member declarations
...
This is a C++11 feature that allows the compiler to check that a virtual
member declaration overrides a base-class member with the same signature.
Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked
as virtual despite being a template.
5 years ago
e3c639a09f
Remove: ENABLE_NETWORK switch
...
This switch has been a pain for years. Often disabling broke
compilation, as no developer compiles OpenTTD without, neither do
any of our official binaries.
Additionaly, it has grown so hugely in our codebase, that it
clearly shows that the current solution was a poor one. 350+
instances of "#ifdef ENABLE_NETWORK" were in the code, of which
only ~30 in the networking code itself. The rest were all around
the code to do the right thing, from GUI to NewGRF.
A more proper solution would be to stub all the functions, and
make sure the rest of the code can simply assume network is
available. This was also partially done, and most variables were
correct if networking was disabled. Despite that, often the #ifdefs
were still used.
With the recent removal of DOS, there is also no platform anymore
which we support where networking isn't working out-of-the-box.
All in all, it is time to remove the ENABLE_NETWORK switch. No
replacement is planned, but if you feel we really need this option,
we welcome any Pull Request which implements this in a way that
doesn't crawl through the code like this diff shows we used to.
5 years ago
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
5 years ago
cdb6dbad85
Cleanup: Remove repeated network error message on connection timeout. ( #7327 )
5 years ago
1c5ea33099
Fix: warnings when compiling for a recent version of Haiku
...
This might break older Haiku versions, but it is hard to tell.
5 years ago
f58db44ff2
Remove: BeOS support (deprecated by Haiku)
...
In 10 years there is no commit to change how BeOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).
With the arrival of SDL2 (and removal of SDL), BeOS is no longer
support. SDL2 suggests to use Haiku instead of BeOS.
5 years ago
7784d77713
Remove: MorphOS / AmigaOS support
...
In 10 years there is no commit to change how MorphOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).
With the arrival of SDL2 (and removal of SDL), MorphOS is no longer
support. There is an SDL2 port for MorphOS, but it is not maintained
by upstream SDL2, and nobody can currently test it out.
If anyone wants to re-add MorphOS, please do (revert this patch,
fix the problems, and create a Pull Request). If you need any help
doing so, let us know! It is not that we don't like MorphOS, it is
that we don't have anyone fixing the problems :(
5 years ago
7ff252c58d
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
5 years ago
c61acc7fc1
Fix #7280 : Save in the right location on desync and server timeout
5 years ago
36ac643749
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/afrikaans.txt
# src/lang/basque.txt
# src/lang/belarusian.txt
# src/lang/brazilian_portuguese.txt
# src/lang/bulgarian.txt
# src/lang/catalan.txt
# src/lang/croatian.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/gaelic.txt
# src/lang/galician.txt
# src/lang/german.txt
# src/lang/greek.txt
# src/lang/hebrew.txt
# src/lang/hungarian.txt
# src/lang/icelandic.txt
# src/lang/indonesian.txt
# src/lang/irish.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/latin.txt
# src/lang/latvian.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/norwegian_nynorsk.txt
# src/lang/polish.txt
# src/lang/portuguese.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/slovenian.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/thai.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/unfinished/persian.txt
# src/lang/vietnamese.txt
# src/lang/welsh.txt
# src/rail_cmd.cpp
# src/station_cmd.cpp
5 years ago
7c31a32c2b
Fix: colour of network specific strings in company dropdown menus
5 years ago
2fdcc52321
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/lang/dutch.txt
# src/lang/korean.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/rail.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/ship_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle.cpp
5 years ago
830ed6be61
Fix: Do not mangle tagged revision strings for network revision strings
5 years ago
412e6132b6
Fix: CompanyEconomy documentation
...
Company income was described as an unsigned integer, but it should be signed.
5 years ago
db2c0ccae0
Fix fdc2e85: Double close of file handles
...
When unpacking downloaded content, the downloaded .gz file was being opened with `fopen`, the OS file handle given to zlib, and then afterwards zlib told to close the file.
But the `FILE *` object was never closed with `fclose`, meaning the stdio library would have a hanging file object, whose file handle was now invalid or referred to a different file. This caused asserts during shutdown with Microsoft's C library in debug mode.
Fix this by properly duplicating the OS handle and `fclose`ing the `FILE *` object, before giving the handle to zlib.
5 years ago
8e7fe3973f
Add: CompanyCtrlAction enum for CMD_COMPANY_CTRL actions
5 years ago
2142452305
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/gamelog.cpp
# src/gamelog_internal.h
# src/lang/german.txt
# src/lang/korean.txt
# src/network/core/config.h
# src/network/network.cpp
# src/network/network_udp.cpp
# src/rev.h
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/gamelog_sl.cpp
# src/saveload/misc_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
# src/viewport.cpp
5 years ago
5f8354f358
Change: Make a shortened network revision string for use in server queries
5 years ago
c511b0e801
Change: Increase NETWORK_REVISION_LENGTH to 33 bytes
5 years ago
1dd8629227
Define socket constants on MinGW if missing
5 years ago
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
5 years ago
b22fbfbe3d
Add: allow opening of one TextfileWindow per type
5 years ago
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
6 years ago
fe8c24e081
Codechange: Remove unnecessarily defined functions under MinGW
6 years ago
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
6 years ago
5ff0c24993
Fix #6780 : Some windows didn't get updated from OnTick() ( #7048 )
6 years ago
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
6 years ago
a6c5951b2f
Fix flags field not being received in Reply_CLIENT_FIND_SERVER_extended
6 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
940314a3c7
Use std::string for CommandContainer text instead of giant static buffer
...
Use move semantics for CommandContainer instance where feasible
6 years ago
4fb76db42f
Feature #986 : Automatic save when losing connection to a network game
6 years ago
21040dc00b
Implementing sending server GRF info list response in multiple packets
...
Add/adjust GRF info message logging
6 years ago
847a46d107
Fix assertion failure in RequestContentList with many GRFs
6 years ago
7559db2bbb
Merge remote-tracking branch 'nielsmh/bug986' into jgrpp
6 years ago
db5abdd78a
Feature #986 : Automatic save when losing connection to a network game
6 years ago
6342099c4d
Allow 256 NewGRFs in multiplayer
...
Add extended network format for server info
Add general UDP packet fragmentation system
Fix map dimensions >= 64k
Increase length of server revision string
Maintain backwards compatibility with trunk for advertisement/server listing
6 years ago
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
6 years ago
cfb8092397
Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation.
6 years ago
fa87212a76
Fix: Some spelling errors in printed messages
6 years ago
85adde7485
Remove: PSP support
6 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
d1dd5937eb
Merge branch 'send_money_company' into jgrpp
7 years ago
e43f0dad21
Fix crashes/issues with non-broadcast network chat.
7 years ago
b3fd11efd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse4.cpp
7 years ago
ed01e81c42
(svn r27794) -Fix [FS#6526]: Chat text background overflowed due to missing padding.
7 years ago
36837a070c
(svn r27794) -Fix [FS#6526]: Chat text background overflowed due to missing padding.
7 years ago
54494a0a7c
Merge branch 'send_money_company' into jgrpp
7 years ago
9c74da46b1
Change send money to company messages to be broadcasts.
...
Adjust text formatting depending on whether current client is
the source, destination or neither.
7 years ago
63629852f7
Add a second int64 data field to chat arbitrary data field.
7 years ago
3001595916
Change chat arbitrary data field from an int64 to a struct.
7 years ago
c70a60fd18
Add another network broadcast mode.
7 years ago
f820543391
Import give money to company patch
...
From: https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311
Fix language files and minor formatting issues
7 years ago
f89e8b76d6
Fix increased number of NewGRFs support.
...
Improve error handling if multiplayer limit is exceeded.
7 years ago
24b3424ca3
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/economy.cpp
# src/network/network_command.cpp
# src/saveload/extended_ver_sl.cpp
8 years ago
285ba41699
TBTR: Fix spelling issues in comment and a method name.
8 years ago
90cd312428
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios.h
8 years ago
8bd3a8a991
(svn r27729) -Codechange: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game.
...
-Codechange: Remove LAST_GRF_SLOT and MAX_NEWGRFS. Now NETWORK_MAX_GRF_COUNT is the only constant to specify the maximum number of non-static NewGRF.
-Codechange: Increase the number of file slots, effectively increasing the maximum number of static NewGRF and baseset GRFs.
8 years ago
ec9a920aab
(svn r27729) -Codechange: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game.
...
-Codechange: Remove LAST_GRF_SLOT and MAX_NEWGRFS. Now NETWORK_MAX_GRF_COUNT is the only constant to specify the maximum number of non-static NewGRF.
-Codechange: Increase the number of file slots, effectively increasing the maximum number of static NewGRF and baseset GRFs.
8 years ago
d204062300
Merge branch 'master' into template_train_replacement
8 years ago
3f75b8bca2
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
8 years ago
31f046bd9b
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
8 years ago
8e6569c11f
Include tick skip counter in all desync debug output.
...
Change message format to make field identification easier.
Update desync message reader to support tick skip counter.
8 years ago
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
80fd6a2783
Drop memory allocator from ClientNetworkGameSocketHandler
...
Have ClientNetworkGameSocketHandler initialise all of its members
on construction and not derive from ZeroedMemoryAllocator.
(cherry picked from commit dddda4f0b7ba0bd6f310f924d3b85cadbc81dc99)
8 years ago
f286ba8db2
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
8 years ago
0adfb1ac6f
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
8 years ago
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
3b84827773
(svn r27648) -Codechange: Remove remaining _saveload_mode usage.
8 years ago
88bdf482c0
(svn r27648) -Codechange: Remove remaining _saveload_mode usage.
8 years ago
23a1c07378
Merge branch 'master' into template_train_replacement
...
Fix Template creation window vehicle drag cursor.
8 years ago
09291a3b74
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
8 years ago
b1272ee714
(svn r27577) -Fix [FS#6386]: Dock and roadstop picker, client list and town authority window did not auto-resize according to their content when they were positioned at the bottom of the screen. (Eearslya)
8 years ago
8084f39bf3
(svn r27577) -Fix [FS#6386]: Dock and roadstop picker, client list and town authority window did not auto-resize according to their content when they were positioned at the bottom of the screen. (Eearslya)
8 years ago
9aa9d7e898
(svn r27576) -Fix (r27570): Compilation failure with all compilers but mine.
8 years ago
4fc43b510d
(svn r27576) -Fix (r27570): Compilation failure with all compilers but mine.
8 years ago
14c1a7ad0b
(svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect.
8 years ago
9aa33862a7
(svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect.
8 years ago
998a6c1302
(svn r27570) -Fix [FS#6449]: Various incorrect but uncritical size computations in the content client.
8 years ago
97e6981e39
(svn r27570) -Fix [FS#6449]: Various incorrect but uncritical size computations in the content client.
8 years ago
580b2f7584
Merge branch 'template_train_replacement-sx' into jgrpp
...
Remove a duplicated declaration.
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/group_gui.cpp
# src/lang/english.txt
# src/network/network_command.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/window_type.h
8 years ago
6be2efc084
Update from KeldorKatarn branch
...
This approximately corresponds to 971ba4928a5c7c7916fea55d91a3b6dd5bba140c,
excluding the different virtual train build GUI, but including the basic
changes to the original train build GUI for multiplayer to work.
Fixup
8 years ago
db2f08f86e
Merge branch 'master' into jgrpp
9 years ago
8660a2c2b1
(svn r27469) -Fix (r27468): Don't fetch all content info from content server when showing a online content window with exactly one type of content.
9 years ago
b22d6715cd
(svn r27469) -Fix (r27468): Don't fetch all content info from content server when showing a online content window with exactly one type of content.
9 years ago
566d7de6af
(svn r27468) -Fix (r27444): Game Scripts were not displayed in the content download window when opened from the AI/GS settings window.
9 years ago
aabc46712a
(svn r27468) -Fix (r27444): Game Scripts were not displayed in the content download window when opened from the AI/GS settings window.
9 years ago
a3768d3a29
Label threads with a descriptive name where supported (pthreads).
9 years ago
f6a8f27501
Make server and all clients run desync checks if a client desyncs.
9 years ago
7ff6ad1e36
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
9 years ago
ea3198cc25
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
9 years ago
0cff11130d
(svn r27444) -Add: When viewing online content of a particular type, hide content of other types unless they have been (auto)selected for download.
9 years ago
c9f1d82345
(svn r27444) -Add: When viewing online content of a particular type, hide content of other types unless they have been (auto)selected for download.
9 years ago
90b340e689
(svn r27443) -Fix: Negoation in comment was wrong.
9 years ago
4fcaee1fee
(svn r27443) -Fix: Negoation in comment was wrong.
9 years ago
8d19727c93
Merge branch 'save_ext' into jgrpp
...
Conflicts:
src/pathfinder/follow_track.hpp
9 years ago
7be7851b94
(svn r27421) -Fix [FS#6265]: Consider text and icon sizes when drawing the client list. (_dp_)
9 years ago
2c9117fbdd
(svn r27421) -Fix [FS#6265]: Consider text and icon sizes when drawing the client list. (_dp_)
9 years ago
66cd454c37
Merge branch 'day_length-sx' into jgrpp
9 years ago
f03cd98d04
Check/print tick skip counter in desync and random logging.
9 years ago
531956bb4d
Merge branch 'house_placing' into jgrpp
9 years ago
e8788019fa
(svn r27400) -Fix [FS#6368] (r26449): when a dedicated server was paused with no clients the tick length was increased significantly, making any assumptions about the tick length used further down in the code are not true anymore. One of such assumptions was that one should readvertise every 15 minutes worth of original ticks, but due to the lengthening this timeframe would be more like 45-60 minutes. Now we'll take the operating system's millisecond counter instead
9 years ago
ff5c05c1b4
(svn r27400) -Fix [FS#6368] (r26449): when a dedicated server was paused with no clients the tick length was increased significantly, making any assumptions about the tick length used further down in the code are not true anymore. One of such assumptions was that one should readvertise every 15 minutes worth of original ticks, but due to the lengthening this timeframe would be more like 45-60 minutes. Now we'll take the operating system's millisecond counter instead
9 years ago
c6854afcef
Pause the game instead of blocking when link graph jobs lag.
...
Check if the job is still running one date fract tick before it
is due to join and if so pause the game until its done.
This avoids the main thread being blocked on a thread join.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
8f5ef2ae01
Import and rebase Max NewGRFs patch
...
Fix trailing whitespace, clean up code a bit
http://www.tt-forums.net/viewtopic.php?p=894743#p894743
9 years ago
4117c5b747
(svn r27304) -Fix [FS#6321-ish]: Improve password window layout for big font sizes.
9 years ago
fc50ff6531
(svn r27304) -Fix [FS#6321-ish]: Improve password window layout for big font sizes.
9 years ago
a41f197379
(svn r27288) -Fix: Slow network content GUI in MSVC Debug builds due to repeated string resolving.
9 years ago
95cb7c8692
(svn r27288) -Fix: Slow network content GUI in MSVC Debug builds due to repeated string resolving.
9 years ago
abe22e594d
(svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition.
10 years ago
e113f5e4a1
(svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition.
10 years ago
3d37abf802
(svn r27144) -Change: The chatbox-width setting now uses percent of screen width instead of pixels.
10 years ago
2f7de4fd99
(svn r27144) -Change: The chatbox-width setting now uses percent of screen width instead of pixels.
10 years ago
93fb724f87
(svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles)
10 years ago
396dde1636
(svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles)
10 years ago
0c2f4bdc2b
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
10 years ago
d534c80e94
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
10 years ago
815576440c
(svn r26975) -Fix: reading too many bits when determining the client index for desync debug message
10 years ago
f28ff446e9
(svn r26975) -Fix: reading too many bits when determining the client index for desync debug message
10 years ago
6872b647f1
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
10 years ago
0877f892c5
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
10 years ago
a1929222d5
(svn r26923) -Codechange: Make multiplayer lobby fit to icon size.
10 years ago
59076ee32b
(svn r26923) -Codechange: Make multiplayer lobby fit to icon size.
10 years ago
01c30568e8
(svn r26921) -Codechange: Adjust content window listing to fit icon size.
10 years ago
d9179d518e
(svn r26921) -Codechange: Adjust content window listing to fit icon size.
10 years ago
e00f4cac59
(svn r26788) -Add: Desync replay option to skip/replay failed commands
10 years ago
e2f5081f40
(svn r26788) -Add: Desync replay option to skip/replay failed commands
10 years ago
db45d979db
(svn r26786) -Fix: Also replay failed commands.
10 years ago
937265d6d6
(svn r26786) -Fix: Also replay failed commands.
10 years ago
e2be6f657d
(svn r26616) -Fix (r26576) [FS#6025]: First send packages about new company, then clients joining it to admin port (Taede)
10 years ago
105306609f
(svn r26616) -Fix (r26576) [FS#6025]: First send packages about new company, then clients joining it to admin port (Taede)
10 years ago
7db8be4a1e
(svn r26577) -Fix [FS#6001]: [Network] Client of non-dedicated server was not correctly put into the first company for all state variables
10 years ago
e64249446d
(svn r26577) -Fix [FS#6001]: [Network] Client of non-dedicated server was not correctly put into the first company for all state variables
10 years ago
492c6ed39b
(svn r26576) -Fix [FS#6003]: [Network] AIs would not reset certain network state information upon creation of their company
10 years ago
4a52300838
(svn r26576) -Fix [FS#6003]: [Network] AIs would not reset certain network state information upon creation of their company
10 years ago
beb540ec55
(svn r26538) -Codechange: remove double accounting of the drivers
10 years ago
b476086c39
(svn r26538) -Codechange: remove double accounting of the drivers
10 years ago
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
b886c8db8c
(svn r26506) -Codechange: replace most of vsnprintf with vseprintf
10 years ago
e61fe21237
(svn r26506) -Codechange: replace most of vsnprintf with vseprintf
10 years ago
5c7c2445d8
(svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay
10 years ago
21f991e235
(svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay
10 years ago
a0eaaf80b7
(svn r26488) -Codechange: perform the appropriate length checks when getting a client name
10 years ago
160ad31028
(svn r26488) -Codechange: perform the appropriate length checks when getting a client name
10 years ago
6ecc602050
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
5b82822c12
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
24c7134bff
(svn r26485) -Codechange: Replace ttd_strlcpy and ttd_strlcat with strecpy and strecat.
10 years ago
ef4c2ce031
(svn r26485) -Codechange: Replace ttd_strlcpy and ttd_strlcat with strecpy and strecat.
10 years ago
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
1d8c673587
(svn r26449) -Add: Allow more sound sleep for dedicated servers when there's nothing to do and nobody paying attention
10 years ago
3e9c10f9e1
(svn r26449) -Add: Allow more sound sleep for dedicated servers when there's nothing to do and nobody paying attention
10 years ago
198b8897b8
(svn r26370) -Doc: Desync debugging and command replaying.
11 years ago
c6ce57e8a7
(svn r26370) -Doc: Desync debugging and command replaying.
11 years ago
4a911754b5
(svn r26209) -Codechange: remove some template magic and simplify some code
11 years ago
2618d960e3
(svn r26209) -Codechange: remove some template magic and simplify some code
11 years ago
66d4bcb88e
(svn r26167) -Fix [FS#5834]: Certain hotkeys crashed the content GUI when the list was empty.
11 years ago
62c0d42f92
(svn r26167) -Fix [FS#5834]: Certain hotkeys crashed the content GUI when the list was empty.
11 years ago
73474728e3
(svn r26057) -Fix: a number of possibly uninitialised variables
11 years ago
b3e93d6520
(svn r26057) -Fix: a number of possibly uninitialised variables
11 years ago
bebf2291db
(svn r26056) -Fix: a number of possibly uninitialised variables
11 years ago
2e54c8fdfa
(svn r26056) -Fix: a number of possibly uninitialised variables
11 years ago
7ecfd60b96
(svn r26055) -Codechange: mark switch default as really not triggerable, as technically it's dead code
11 years ago
bdd62a4b3e
(svn r26055) -Codechange: mark switch default as really not triggerable, as technically it's dead code
11 years ago
0eb1e6ae67
(svn r26047) -Fix: possible, but very unlikely, null pointer dereference when gunziping just downloaded files
11 years ago
ed4e14dc20
(svn r26047) -Fix: possible, but very unlikely, null pointer dereference when gunziping just downloaded files
11 years ago
32e52df99f
(svn r26046) -Fix: handle a number of failure conditions from methods called in the network code
11 years ago
fad4fa09ba
(svn r26046) -Fix: handle a number of failure conditions from methods called in the network code
11 years ago
dc65379970
(svn r26043) -Fix [FS#5811]: occasional hanging when client joins
11 years ago
1a043202d1
(svn r26043) -Fix [FS#5811]: occasional hanging when client joins
11 years ago
a59af5c3fc
(svn r26005) -Fix [FS#5478]: crash when transferring savegame from server to client
11 years ago
18a3a569fb
(svn r26005) -Fix [FS#5478]: crash when transferring savegame from server to client
11 years ago
7457abb067
(svn r25997) -Codechange: make it slightly more clear what ports are coming from where in the debug output when listening
11 years ago
c40f281545
(svn r25997) -Codechange: make it slightly more clear what ports are coming from where in the debug output when listening
11 years ago
5fe15ef5b3
(svn r25845) -Add [FS#5756]: [Admin] Send info on bankruptcy quarters also in ADMIN_PACKET_SERVER_COMPANY_INFO (zydeco)
11 years ago
189dd2dcce
(svn r25845) -Add [FS#5756]: [Admin] Send info on bankruptcy quarters also in ADMIN_PACKET_SERVER_COMPANY_INFO (zydeco)
11 years ago
75cf518a7d
(svn r25770) -Fix [Admin]: the frame of a command packet wasn't set for the packets that were sent via de admin interface
11 years ago
7adc453473
(svn r25770) -Fix [Admin]: the frame of a command packet wasn't set for the packets that were sent via de admin interface
11 years ago
872acc5287
(svn r25668) -Codechange: Pass proper Unicode UCS-4 characters instead of just UCS-2 to the window key press handlers.
11 years ago
b911f4a452
(svn r25668) -Codechange: Pass proper Unicode UCS-4 characters instead of just UCS-2 to the window key press handlers.
11 years ago
bb9022c7c1
(svn r25597) -Fix [FS#5635]: [Content] When the server closed the connection, the client would for eternity try to read a packet and never timeout making it impossible to reconnect
11 years ago
5eac3a77d2
(svn r25597) -Fix [FS#5635]: [Content] When the server closed the connection, the client would for eternity try to read a packet and never timeout making it impossible to reconnect
11 years ago
4c552bd367
(svn r25593) -Cleanup: remove a few stale #defines
11 years ago
e6ae8cf420
(svn r25593) -Cleanup: remove a few stale #defines
11 years ago
2d3a8cbdc0
(svn r25590) -Codechange: Align doxygen comments again
11 years ago
bb7f08f8db
(svn r25590) -Codechange: Align doxygen comments again
11 years ago
2ecbbce498
(svn r25589) -Fix [FS#5646]: Ensure that sent and received length of json strings are the same (based on patch by Xaroth)
11 years ago
2e390613a6
(svn r25589) -Fix [FS#5646]: Ensure that sent and received length of json strings are the same (based on patch by Xaroth)
11 years ago
5bd83befbe
(svn r25588) -Feature [FS#5643]: PING and PONG packets for admin port (Xaroth)
11 years ago
7686587f02
(svn r25588) -Feature [FS#5643]: PING and PONG packets for admin port (Xaroth)
11 years ago
fdcebd3f2f
(svn r25587) -Add FS#5643: Conclude rcon output sent to admin clients with an RCON_END packet (Xaroth)
11 years ago
4a1bf704ee
(svn r25587) -Add FS#5643: Conclude rcon output sent to admin clients with an RCON_END packet (Xaroth)
11 years ago
534d41ad98
(svn r25573) -Change: make content list appear faster by allowing some window redraws in between
11 years ago
51f0d11ee3
(svn r25573) -Change: make content list appear faster by allowing some window redraws in between
11 years ago
glx
PeterN
Charles Pigott
Niels Martin Hansen
Jonathan G Rennison
Henry Wilson
Michael Lutz
glx22
PeterN
stormcone
Patric Stout
SamuXarick
Thomas den Hollander
J0an Josep
Matthijs Kooijman
frosch
patch-import
cirdan
alberth
zuu
rubidium
michi_cc
planetmaker