Commit Graph

75 Commits

Author SHA1 Message Date
Jonathan G Rennison
ff0e779680 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/czech.txt
#	src/order_backup.h
#	src/settings_internal.h
#	src/string.cpp
#	src/viewport.cpp
2023-02-04 11:37:45 +00:00
Rubidium
ae422be979 Cleanup: remove/replace trailing ; with . in comments 2023-01-26 23:47:55 +01:00
Jonathan G Rennison
32fe84cfdd Merge branch 'master' into jgrpp
# Conflicts:
#	src/clear_cmd.cpp
#	src/main_gui.cpp
#	src/saveload/newgrf_sl.cpp
#	src/water_cmd.cpp
2023-01-26 22:32:08 +00:00
Peter Nelson
ede1201b6a Codechange: Rename override manager variables. 2023-01-26 21:39:16 +01:00
Peter Nelson
bcc53c5ad5 Codechange: Add missing this-> in override manager.
Variable scope is also tweaked in a couple of cases reducing line count.
2023-01-26 21:39:16 +01:00
Peter Nelson
eedb786872 Codechange: Use vector for NewGRF spec overrides.
This replaces C-style memory management.
2023-01-26 21:39:16 +01:00
Jonathan G Rennison
41117a52d2 Signals: Add variable for signal context (track, tunnel, bridge, etc) 2022-06-15 19:03:13 +01:00
Jonathan G Rennison
7a61b5d820 VarAction2: Cache refit capacity callback results which depend only on cargo 2022-06-06 18:34:30 +01:00
Jonathan G Rennison
8eb86fa6c7 GRF: Use access mask when evaluating get nearby tile information variable 2022-05-31 01:32:18 +01:00
Jonathan G Rennison
502980ba61 Support railtype-dependant GRF train speed limits with realistic braking
See: #389
2022-05-24 21:50:38 +01:00
Jonathan G Rennison
62afd94b47 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp
2021-11-01 18:54:43 +00:00
Rubidium
f904aef176 Cleanup: use nullptr instead of 0 or NULL 2021-06-17 16:18:30 +02:00
Jonathan G Rennison
55915d8d55 Elide vehicle random trigger callbacks 2021-05-18 22:14:19 +01:00
Jonathan G Rennison
a15e26f369 NewGRF: Elide unmasked vehicle callbacks where possible
This includes:
* CBID_VEHICLE_32DAY_CALLBACK
* CBID_VEHICLE_REFIT_COST
* CBID_VEHICLE_MODIFY_PROPERTY
  This is on a per-property basis

The main benefit of this is to avoid callbacks not handled by the
vehicle's current sprite group from using the full graphics chain as
the "default" branch in the callback switch.
In the case where the graphics chain is long/expensive, a lot of work
had to be done before a callback failure result was eventually returned.
2021-05-18 19:07:44 +01:00
PeterN
66cac92028 Fix #9202: Invalid test for unset NewGRF override mapping. (#9226)
(cherry picked from commit 3d9436bd75)
2021-05-14 18:33:19 +01:00
PeterN
f52da3de3a Codechange: Don't save unused NewGRF override mappings. (#9202)
(cherry picked from commit 69e5da0b54)
2021-05-14 18:15:17 +01:00
PeterN
3d9436bd75 Fix #9202: Invalid test for unset NewGRF override mapping. (#9226) 2021-05-12 09:11:14 +02:00
PeterN
69e5da0b54 Codechange: Don't save unused NewGRF override mappings. (#9202) 2021-05-08 11:36:39 +01:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
Henry Wilson
c01a2e2a81 Codechange: Removed SmallVector completely 2019-03-26 20:15:57 +00:00
Henry Wilson
ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 2019-03-26 20:15:57 +00:00
peter1138
b1fb3f4fb8 Codechange: More use of override keyword. 2019-03-24 17:38:42 +00:00
frosch
ebee9fa418 (svn r27534) -Fix [FS#6435]: [NewGRF] Station spritelayouts did not accept the var10 flag for the palette. 2016-04-02 16:02:22 +00:00
frosch
ba1779b978 (svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack. 2014-01-12 18:00:39 +00:00
frosch
73c6565cf2 (svn r26240) -Codechange: Pass the GRFFile to GetErrorMessageFromLocationCallbackResult instead of the GRFID. 2014-01-12 18:00:19 +00:00
rubidium
729d64d8d9 (svn r26071) -Fix: always initialise GRFFileProps 2013-11-23 18:11:22 +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
rubidium
e40eb8177a (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 2012-01-03 20:26:05 +00:00
rubidium
7fd1e1df81 (svn r23198) -Codechange: introduce a free that takes const pointers so we don't need to cast to void/non-const before being able to free 2011-11-12 13:00:29 +00:00
frosch
8f4c6d42f9 (svn r23154) -Change: [NewGRF v8] Use heightlevel units in nearby tile info variables. (rubidium) 2011-11-08 17:29:01 +00:00
frosch
30874b5e81 (svn r23147) -Change: [NewGRF v8] Unify the return values of boolean callbacks, and check the results for validity. 2011-11-08 17:26:49 +00:00
frosch
56e5144f71 (svn r23140) -Add: ErrorUnknownCallbackResult() 2011-11-08 17:24:15 +00:00
frosch
7f228d6909 (svn r22924) -Codechange: Enhance NewGRFSpriteLayout for drawing construction stages in spritelayouts with inconsistent number of sprites per spriteset. 2011-09-11 15:10:09 +00:00
frosch
de27360549 (svn r22923) -Codechange: Move application of the construction stage into TileLayoutSpriteGroup::ProcessRegisters(). 2011-09-11 15:09:13 +00:00
frosch
c6e29a5b89 (svn r22848) -Add: The missing bits in station variable 43. 2011-08-27 08:42:24 +00:00
michi_cc
d579af11e8 (svn r22659) -Add: [NewGRF] Support for the land slope check callback for stations. 2011-07-11 16:32:35 +00:00
michi_cc
206ff68e65 (svn r22656) -Codechange: Deduplicate the custom error message of the industry shape and location callbacks. 2011-07-11 16:32:19 +00:00
terkhen
b7b0637a10 (svn r22575) -Fix (r22574): Compilation error. 2011-06-13 07:01:36 +00:00
terkhen
9f55abf51a (svn r22566) -Codechange: Define and use OverrideManagerBase::GetGRFID function. 2011-06-12 20:42:23 +00:00
frosch
a241a4ce97 (svn r22518) -Feature: [NewGRF] Advanced sprite layouts with register modifiers. 2011-05-29 16:56:22 +00:00
frosch
7415b9cca2 (svn r22456) -Codechange: Derive NewGRFSpriteLayout from DrawTileSprites for spritelayouts allocated on the heap, and make use of constructors and destructors. 2011-05-14 17:25:45 +00:00
yexo
9373ee71d9 (svn r20996) -Change: [NewGRF] the X and Y offsets in the parameter for industry vars 60,61,62,63 are unsigned instead of signed 2010-10-19 21:00:45 +00:00
rubidium
1ec1f1ef37 (svn r20648) -Codechange: implement the NewGRF override manager for objects 2010-08-28 17:30:55 +00:00
rubidium
30f2afac9b (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 2010-08-26 22:01:16 +00:00
rubidium
e0a3a0fd54 (svn r20448) -Codechange: make some functions that can be const const 2010-08-11 18:50:23 +00:00
frosch
43d6740f2d (svn r20445) -Codechange (r20435): Some compilers (esp. mine) do not comply to the specs. 2010-08-11 07:42:47 +00:00
rubidium
ca7a067b7a (svn r20435) -Codechange: move spritegroup to GRFFilePropsBase and prepare it for more spritegroups 2010-08-10 15:49:35 +00:00
terkhen
78fd08c7b2 (svn r20424) -Fix: Rename members of TileContext (TC_NORMAL conflicted with an existing define on MinGW). 2010-08-09 10:59:30 +00:00
frosch
7f1425c333 (svn r20423) -Change [FS#3947]: Make snow on bridges depend on bridgeheight. 2010-08-09 07:32:04 +00:00