dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,248 Commits 1 Branch 0 Tags
c2f9d89802363bcbbc6c9946c65130f64a52fef8
Commit Graph

254 Commits

Author SHA1 Message Date
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
Jonathan G Rennison
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
 2019-03-27 18:12:04 +00:00
Patric Stout
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.
 2019-03-20 19:24:55 +01:00
Jonathan G Rennison
631a18fb07 Merge branch 'send_money_company' into jgrpp 2017-07-03 21:42:20 +01:00
Jonathan G Rennison
86bea16c60 Fix sending money to companies in single-player mode 2017-07-03 21:42:14 +01:00
Jonathan G Rennison
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.
 2015-09-03 18:36:30 +01:00
rubidium
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 2014-04-23 20:13:33 +00:00
rubidium
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 2014-04-23 20:13:33 +00:00
zuu
c7620a1ea7 (svn r25788) -Feature: [Script] Game Scripts can now charge fees and give money to companies 2013-09-21 13:07:42 +00:00
zuu
ab69c6c2a0 (svn r25788) -Feature: [Script] Game Scripts can now charge fees and give money to companies 2013-09-21 13:07:42 +00:00
zuu
d30caad43f (svn r25787) -Doc: Doxygen comment was wrong 2013-09-21 10:06:23 +00:00
zuu
01dea4ec37 (svn r25787) -Doc: Doxygen comment was wrong 2013-09-21 10:06:23 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
planetmaker
c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
zuu
ac3d609377 (svn r24552) -Fix (r24537): Unpause do no longer continue scripts 2012-09-23 11:30:37 +00:00
zuu
d219fdb875 (svn r24552) -Fix (r24537): Unpause do no longer continue scripts 2012-09-23 11:30:37 +00:00
truebrain
3a799f1145 (svn r23618) -Add: ScriptGame::Pause, ScriptGame::Unpause, and ScriptGame::GetLandscape (GameScript only) 2011-12-19 20:58:59 +00:00
truebrain
55de5d336c (svn r23618) -Add: ScriptGame::Pause, ScriptGame::Unpause, and ScriptGame::GetLandscape (GameScript only) 2011-12-19 20:58:59 +00:00
frosch
42623e1084 (svn r22621) -Fix: When asking the user to confirm an unsafe unpausing, there is no need to execute a command if 'no' is choosed. This also prevents crashing when clicking unpause while the confirm window is shown. 2011-07-02 17:40:39 +00:00
frosch
7bf8b1d96e (svn r22621) -Fix: When asking the user to confirm an unsafe unpausing, there is no need to execute a command if 'no' is choosed. This also prevents crashing when clicking unpause while the confirm window is shown. 2011-07-02 17:40:39 +00:00
rubidium
1b7adfc484 (svn r22028) -Cleanup: remove traces of a debugging "feature" that got disabled a long time ago 2011-02-08 20:47:48 +00:00
rubidium
5286de116b (svn r22028) -Cleanup: remove traces of a debugging "feature" that got disabled a long time ago 2011-02-08 20:47:48 +00:00
rubidium
8183922813 (svn r22021) -Fix (r22019): ofcourse make doesn't notice files are gone, so it doesn't recompile everything that needs to be recompiled... 2011-02-07 22:49:38 +00:00
rubidium
1d0d7635e0 (svn r22021) -Fix (r22019): ofcourse make doesn't notice files are gone, so it doesn't recompile everything that needs to be recompiled... 2011-02-07 22:49:38 +00:00
frosch
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
frosch
ed4f806f1d (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
frosch
a5bea603ea (svn r19931) -Fix (r19914): Convert assertion in Backup<> destructor into DEBUG() output. It was triggered on exceptions, especially when aborting world generation. 2010-06-05 12:16:12 +00:00
frosch
1d3adb2b66 (svn r19931) -Fix (r19914): Convert assertion in Backup<> destructor into DEBUG() output. It was triggered on exceptions, especially when aborting world generation. 2010-06-05 12:16:12 +00:00
frosch
60fb3bb9a5 (svn r19930) -Codechange: Deduplicate magic command parameter casts. (rubidium) 2010-06-05 11:51:34 +00:00
frosch
406c2a9865 (svn r19930) -Codechange: Deduplicate magic command parameter casts. (rubidium) 2010-06-05 11:51:34 +00:00
frosch
ee53807e51 (svn r19914) -Codechange: Wrap a helper class around temporary assignments of _current_company to ensure proper restoration. 2010-05-31 20:22:57 +00:00
frosch
9db3cde73a (svn r19914) -Codechange: Wrap a helper class around temporary assignments of _current_company to ensure proper restoration. 2010-05-31 20:22:57 +00:00
yexo
451fcefde7 (svn r19684) -Fix [FS#3779]: don't show an error message when trying to give another client an amount of 0 money 2010-04-20 18:02:08 +00:00
yexo
879057de25 (svn r19684) -Fix [FS#3779]: don't show an error message when trying to give another client an amount of 0 money 2010-04-20 18:02:08 +00:00
frosch
5b481e6f4a (svn r19658) -Fix: One could turn transport companies into credit banks. 2010-04-17 14:57:49 +00:00
frosch
77486ee8d2 (svn r19658) -Fix: One could turn transport companies into credit banks. 2010-04-17 14:57:49 +00:00
yexo
cdfe7f7834 (svn r19544) -Feature [FS#3496]: add an input box to the AI Debug window where you can input a break string (patch by Zuu) 2010-04-02 17:35:20 +00:00
yexo
8165737939 (svn r19544) -Feature [FS#3496]: add an input box to the AI Debug window where you can input a break string (patch by Zuu) 2010-04-02 17:35:20 +00:00
alberth
8109a0ad7f (svn r19483) -Codechange: Code layout fixes, and parentheses reduction. 2010-03-20 15:30:57 +00:00
alberth
f05a8635fd (svn r19483) -Codechange: Code layout fixes, and parentheses reduction. 2010-03-20 15:30:57 +00:00
rubidium
6ce5fe41f8 (svn r18732) -Codechange: move the company related commands of misc_cmd.cpp to company_cmd.cpp 2010-01-05 17:11:56 +00:00
rubidium
74ffe8647f (svn r18732) -Codechange: move the company related commands of misc_cmd.cpp to company_cmd.cpp 2010-01-05 17:11:56 +00:00
rubidium
da30e736ca (svn r18330) -Cleanup: remove some unneeded includes 2009-11-28 20:35:25 +00:00
rubidium
b00a5f1069 (svn r18330) -Cleanup: remove some unneeded includes 2009-11-28 20:35:25 +00:00
rubidium
a0840ee58b (svn r18052) -Codechange/Fix: make the 'pause' chat message when actually executing the pause command. This to prevent showing paused and especially unpaused to be shown when the state doesn't change. Output now mentions whether pause changes keep the game paused and what reasons for pausing there 'currently' are. 2009-11-12 20:33:30 +00:00
rubidium
2a1cab4d46 (svn r18052) -Codechange/Fix: make the 'pause' chat message when actually executing the pause command. This to prevent showing paused and especially unpaused to be shown when the state doesn't change. Output now mentions whether pause changes keep the game paused and what reasons for pausing there 'currently' are. 2009-11-12 20:33:30 +00:00
rubidium
0c20992c5b (svn r18051) -Codechange: make the active clients pause use a separate bit in the pause mode 2009-11-12 17:46:04 +00:00
rubidium
934e6a295d (svn r18051) -Codechange: make the active clients pause use a separate bit in the pause mode 2009-11-12 17:46:04 +00:00
rubidium
7d2d49cb9b (svn r18050) -Codechange: disallow 'pause on join' paused when not in a network game 2009-11-12 17:44:49 +00:00
rubidium
3f2dce581e (svn r18050) -Codechange: disallow 'pause on join' paused when not in a network game 2009-11-12 17:44:49 +00:00