Commit Graph

65 Commits (62afd94b47d7c48ef2045540be9a62ec63a4827b)

Author SHA1 Message Date
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
3 years ago
Rubidium f904aef176 Cleanup: use nullptr instead of 0 or NULL 3 years ago
Jonathan G Rennison 55915d8d55 Elide vehicle random trigger callbacks 3 years ago
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.
3 years ago
PeterN 66cac92028 Fix #9202: Invalid test for unset NewGRF override mapping. (#9226)
(cherry picked from commit 3d9436bd75)
3 years ago
PeterN f52da3de3a Codechange: Don't save unused NewGRF override mappings. (#9202)
(cherry picked from commit 69e5da0b54)
3 years ago
PeterN 3d9436bd75
Fix #9202: Invalid test for unset NewGRF override mapping. (#9226) 3 years ago
PeterN 69e5da0b54
Codechange: Don't save unused NewGRF override mappings. (#9202) 3 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson c01a2e2a81 Codechange: Removed SmallVector completely 5 years ago
Henry Wilson ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 5 years ago
peter1138 b1fb3f4fb8 Codechange: More use of override keyword. 5 years ago
frosch ebee9fa418 (svn r27534) -Fix [FS#6435]: [NewGRF] Station spritelayouts did not accept the var10 flag for the palette. 8 years ago
frosch ba1779b978 (svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack. 11 years ago
frosch 73c6565cf2 (svn r26240) -Codechange: Pass the GRFFile to GetErrorMessageFromLocationCallbackResult instead of the GRFID. 11 years ago
rubidium 729d64d8d9 (svn r26071) -Fix: always initialise GRFFileProps 11 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
rubidium e40eb8177a (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 13 years ago
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 13 years ago
frosch 8f4c6d42f9 (svn r23154) -Change: [NewGRF v8] Use heightlevel units in nearby tile info variables. (rubidium) 13 years ago
frosch 30874b5e81 (svn r23147) -Change: [NewGRF v8] Unify the return values of boolean callbacks, and check the results for validity. 13 years ago
frosch 56e5144f71 (svn r23140) -Add: ErrorUnknownCallbackResult() 13 years ago
frosch 7f228d6909 (svn r22924) -Codechange: Enhance NewGRFSpriteLayout for drawing construction stages in spritelayouts with inconsistent number of sprites per spriteset. 13 years ago
frosch de27360549 (svn r22923) -Codechange: Move application of the construction stage into TileLayoutSpriteGroup::ProcessRegisters(). 13 years ago
frosch c6e29a5b89 (svn r22848) -Add: The missing bits in station variable 43. 13 years ago
michi_cc d579af11e8 (svn r22659) -Add: [NewGRF] Support for the land slope check callback for stations. 13 years ago
michi_cc 206ff68e65 (svn r22656) -Codechange: Deduplicate the custom error message of the industry shape and location callbacks. 13 years ago
terkhen b7b0637a10 (svn r22575) -Fix (r22574): Compilation error. 13 years ago
terkhen 9f55abf51a (svn r22566) -Codechange: Define and use OverrideManagerBase::GetGRFID function. 13 years ago
frosch a241a4ce97 (svn r22518) -Feature: [NewGRF] Advanced sprite layouts with register modifiers. 13 years ago
frosch 7415b9cca2 (svn r22456) -Codechange: Derive NewGRFSpriteLayout from DrawTileSprites for spritelayouts allocated on the heap, and make use of constructors and destructors. 13 years ago
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 14 years ago
rubidium 1ec1f1ef37 (svn r20648) -Codechange: implement the NewGRF override manager for objects 14 years ago
rubidium 30f2afac9b (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
rubidium e0a3a0fd54 (svn r20448) -Codechange: make some functions that can be const const 14 years ago
frosch 43d6740f2d (svn r20445) -Codechange (r20435): Some compilers (esp. mine) do not comply to the specs. 14 years ago
rubidium ca7a067b7a (svn r20435) -Codechange: move spritegroup to GRFFilePropsBase and prepare it for more spritegroups 14 years ago
terkhen 78fd08c7b2 (svn r20424) -Fix: Rename members of TileContext (TC_NORMAL conflicted with an existing define on MinGW). 14 years ago
frosch 7f1425c333 (svn r20423) -Change [FS#3947]: Make snow on bridges depend on bridgeheight. 14 years ago
frosch 48c5091a7c (svn r20420) -Codechange: Add TileContext enum instead of using a bool. 14 years ago
rubidium af9d8824bd (svn r20398) -Codechange: move some variables of GRFFileProps into (the new) GRFFilePropsBase 14 years ago
frosch ed4f806f1d (svn r20283) -Codechange: Unify start of doygen comments. 14 years ago
frosch 72ee11a7c6 (svn r20126) -Fix [FS#3883]: Make railtype Terrain Type variable aware of RAIL_GROUND_HALF_SNOW. That is, resolve the sprites for upper and lower part of the foundation independently. 14 years ago
yexo 38f4cb6469 (svn r19457) -Codechange: introduce AirportOverrideManager to keep track of airports if a newgrf can't be found 14 years ago
yexo 05d29d8a3d (svn r19435) -Fix: when loading a savegame created with a house newgrf without that newgrf available all houses became tall office blocks 14 years ago
yexo 683ad53d21 (svn r19193) -Codechange: increase the maximum number of airport tiles to 256 and introduce AirportTileOverrideManager 14 years ago
frosch 24e0945bc4 (svn r18846) -Codechange: Merge DrawTileSeq into DrawCommonTileSeq. 15 years ago
frosch d27999e446 (svn r18837) -Codechange: Rename DrawStationTileSeq() to DrawCommonTileSeq() and move it to separate file. 15 years ago
rubidium 82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago