Commit Graph

103 Commits

Author SHA1 Message Date
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
Jonathan G Rennison
46b1ea81e4 Add company rate limit for land area purchasing 2018-11-23 18:47:36 +00:00
Jonathan G Rennison
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
2018-11-05 12:53:36 +00:00
Charles Pigott
f5b1115039 Doc: Lots and lots of doxymentation fixes 2018-10-31 12:35:54 +01:00
Jonathan G Rennison
3330e4cef8 Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h
2018-07-02 21:04:06 +01:00
Charles Pigott
e1b9187e9b Codechange: Add initialisation values for all CompanyProperty attributes 2018-06-27 22:54:46 +02:00
Jonathan G Rennison
56be293107 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp
2018-05-25 18:29:17 +01:00
PeterN
42b43c9983 Change: Available railtypes is always calculated on load, so no need to load value for old savegames (#6782) 2018-05-19 22:31:46 +01:00
Jonathan G Rennison
a6168dd2f0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/company_sl.cpp
2017-02-28 00:15:45 +00:00
frosch
fc4c4d080c (svn r27757) -Change: Make StringID 32bit. 2017-02-26 19:41:14 +00:00
frosch
0c1fcc02ec (svn r27757) -Change: Make StringID 32bit. 2017-02-26 19:41:14 +00:00
Jonathan G Rennison
3813b3ca09 Dump infrastructure totals when mismatch detected in CheckCaches. 2017-02-22 02:51:25 +00:00
michi_cc
2b8bb12d62 (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
michi_cc
44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
rubidium
6fb28d8719 (svn r26081) -Fix [FS#5815]: memset with virtual functions doesn't quite work. Upon further review CompanyProperties doesn't need to be virtual in the current code base 2013-11-24 09:52:35 +00:00
rubidium
388e8e2d97 (svn r26081) -Fix [FS#5815]: memset with virtual functions doesn't quite work. Upon further review CompanyProperties doesn't need to be virtual in the current code base 2013-11-24 09:52:35 +00:00
rubidium
83a76c73c7 (svn r26052) -Fix: missing virtual destructor could cause some memory to be not freed 2013-11-22 21:44:51 +00:00
rubidium
d8cd229ef7 (svn r26052) -Fix: missing virtual destructor could cause some memory to be not freed 2013-11-22 21:44:51 +00:00
planetmaker
f2e94237fc (svn r24619) -Change: Check for bankruptcy on a monthly basis (ZxBioHazardZx) 2012-10-20 22:05:26 +00:00
planetmaker
f46b2fd4b3 (svn r24619) -Change: Check for bankruptcy on a monthly basis (ZxBioHazardZx) 2012-10-20 22:05:26 +00:00
michi_cc
f3e295b4ec (svn r24134) -Add: Configurable limits for tree planting. 2012-04-17 19:43:52 +00:00
michi_cc
07f32df363 (svn r24134) -Add: Configurable limits for tree planting. 2012-04-17 19:43:52 +00:00
michi_cc
0542e26460 (svn r23931) -Change: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type. 2012-02-11 22:43:39 +00:00
michi_cc
7f06f392f7 (svn r23931) -Change: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type. 2012-02-11 22:43:39 +00:00
rubidium
70c7fbd90e (svn r23826) -Fix [FS#4972]: the detailed performance rating window showed the cargo count of the current quarter instead of the last quarter like the tooltip says 2012-01-20 20:18:19 +00:00
rubidium
464d51905a (svn r23826) -Fix [FS#4972]: the detailed performance rating window showed the cargo count of the current quarter instead of the last quarter like the tooltip says 2012-01-20 20:18:19 +00:00
rubidium
e40eb8177a (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 2012-01-03 20:26:05 +00:00
rubidium
0cfe86cead (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 2012-01-03 20:26:05 +00:00
truebrain
1c9bec1999 (svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC) 2011-12-20 17:57:56 +00:00
truebrain
aa1a0053b0 (svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC) 2011-12-20 17:57:56 +00:00
michi_cc
6083d6ffb4 (svn r23410) -Add: A window with a detailed overview over the infrastructure of a company. 2011-12-03 23:40:08 +00:00
michi_cc
b68ced52c4 (svn r23410) -Add: A window with a detailed overview over the infrastructure of a company. 2011-12-03 23:40:08 +00:00
frosch
dd74536bef (svn r22981) -Add: GroupStatistics for the ALL_GROUP. 2011-10-03 17:23:41 +00:00
frosch
f406385319 (svn r22981) -Add: GroupStatistics for the ALL_GROUP. 2011-10-03 17:23:41 +00:00
frosch
5be8f73204 (svn r22980) -Add: GroupStatistics for DEFAULT_GROUP. 2011-10-03 17:22:56 +00:00
frosch
f43290d6af (svn r22980) -Add: GroupStatistics for DEFAULT_GROUP. 2011-10-03 17:22:56 +00:00
frosch
ebb4f0513a (svn r22479) -Codechange/Fix: Months != quarters. (xi) 2011-05-19 21:03:23 +00:00
frosch
09403a4c49 (svn r22479) -Codechange/Fix: Months != quarters. (xi) 2011-05-19 21:03:23 +00:00
planetmaker
914f8e9f1d (svn r22080) -Doc: Add doxygen comments to a few functions and improve a few existing comments 2011-02-14 19:52:26 +00:00
planetmaker
6d031d0867 (svn r22080) -Doc: Add doxygen comments to a few functions and improve a few existing comments 2011-02-14 19:52:26 +00:00
rubidium
eab47d2227 (svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company 2011-01-04 22:50:09 +00:00
rubidium
be077e030e (svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company 2011-01-04 22:50:09 +00:00
alberth
0e900039f3 (svn r20320) -Doc: Small Doxygen and normal comment fixes, and an missed addition. 2010-08-02 20:47:27 +00:00
alberth
91eba89331 (svn r20320) -Doc: Small Doxygen and normal comment fixes, and an missed addition. 2010-08-02 20:47:27 +00:00
alberth
4781f1fa92 (svn r20319) -Codechange: Align comments, add indent to a function call. 2010-08-02 20:37:32 +00:00
alberth
66b3d60b60 (svn r20319) -Codechange: Align comments, add indent to a function call. 2010-08-02 20:37:32 +00:00
alberth
5556955960 (svn r20318) -Doc: Doxygen additions. 2010-08-02 20:32:39 +00:00
alberth
ccbacfc298 (svn r20318) -Doc: Doxygen additions. 2010-08-02 20:32:39 +00:00
alberth
dc6ed2c2c0 (svn r20279) -Doc: Doxygen additions/improvements. 2010-08-01 17:45:53 +00:00