Commit Graph

152 Commits (5199e19213bfad4c9cd145b2b606cc6ad4015244)

Author SHA1 Message Date
Jonathan G Rennison 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
frosch 1124c15ccd (svn r27574) -Fix [FS#6432]: The house id as returned by house variable 66 was incorrect when querying neighboured tiles. (adf88) 8 years ago
Jonathan G Rennison f6d374ade4 Merge branch 'house_placing' into jgrpp
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
8 years ago
Jonathan G Rennison 95b65163e3 Revert back to v2 of house picking/placing patch. 8 years ago
Jonathan G Rennison 41a06e698f Merge branch 'house_placing' into jgrpp
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
8 years ago
patch-import 0fd34a17a5 Update to v4 of house placing patch. 8 years ago
Jonathan G Rennison 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
patch-import 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
patch-import 19dcbb1cb9 Import Picking and placing single houses in scenario editor patch
Minor whitespace fixes

http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
9 years ago
rubidium fb9dbf30fa (svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore) 10 years ago
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 10 years ago
frosch ce92faf682 (svn r26388) -Codechange: Move resolving of Action 3 into ResolverObject constructor. 10 years ago
frosch 6c63c98d7f (svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL. 11 years ago
rubidium 428faaf4ad (svn r26076) -Codechange: upgrade some C-style named structs to C++-style named structs 11 years ago
rubidium 6bc32d7c5d (svn r26059) -Fix (r20435): missed one instance causing to compare an array to NULL instead of an array's element 11 years ago
frosch 670c4879cf (svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES. 11 years ago
frosch 7a99da6093 (svn r25429) -Fix [FS#5603] (r25140): When town creation failed, removing remnants of the construction failed on protected houses. 11 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
alberth 6c1ff5f772 (svn r24693) -Doc: Add some doxymentation into the newgrf code. 12 years ago
alberth 8a297ca5f1 (svn r24692) -Cleanup: Cleanup final parts of the old resolver code. 12 years ago
alberth 2609cce514 (svn r24682) -Codechange: Add resolver classes for houses. 12 years ago
alberth 6a619b40d5 (svn r24678) -Codechange: Introduce scope resolver base class and prepare for adding derived classes. 12 years ago
rubidium 76d5833650 (svn r24179) -Codechange: move some variables of Town to TownCache 12 years ago
rubidium d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
yexo 6e65e92054 (svn r23721) -Fix (r23070): reading memory of a temporary (already deconstructed) object is invalid 13 years ago
frosch e29221a31e (svn r23154) -Change: [NewGRF v8] Use heightlevel units in nearby tile info variables. (rubidium) 13 years ago
frosch ebf19d6219 (svn r23147) -Change: [NewGRF v8] Unify the return values of boolean callbacks, and check the results for validity. 13 years ago
frosch 46e77ee24f (svn r23138) -Feature: [NewGRF] Allow passing 32bit parameters to 60+x variables (using var 7B). Currently most useful for vehicle var 60. 13 years ago
michi_cc f0ffa534de (svn r23072) -Feature: [NewGRF] House callback 0x148. 13 years ago
michi_cc 68370d2bc9 (svn r23071) -Codechange: [NewGRF] Allow passing custom extra data through the generic NewGRF animation helper class. 13 years ago
michi_cc 80766e45ba (svn r23070) -Add: [NewGRF] House variable 0x64. 13 years ago
frosch bd696a6288 (svn r22923) -Codechange: Move application of the construction stage into TileLayoutSpriteGroup::ProcessRegisters(). 13 years ago
frosch 7a7b16336f (svn r22731) -Fix: [NewGRF] The construction stage sprites were incorrectly selected in cases other than 1 or 4 sprites per set. 13 years ago
frosch 0f8065fef4 (svn r22635) -Fix: Correctly reseed random bits of industries and industry tiles. 13 years ago
frosch e2a5d69cb7 (svn r22634) -Codechange: Deduplicate some code. Note that zeroing 'count' is intentionally removed, it is only used together with 'scope'. 13 years ago
terkhen e8a8b6dae5 (svn r22569) -Feature: [NewGRF] Persistent storage for towns. 13 years ago
terkhen db879d5bd1 (svn r22566) -Codechange: Define and use OverrideManagerBase::GetGRFID function. 13 years ago
terkhen 713acf1ad3 (svn r22562) -Codechange: Remove constness from TownGetVariable. 13 years ago
terkhen 92c429e3ee (svn r22560) -Codechange: Remove constness from House in ResolverObject. 13 years ago
terkhen e392f26215 (svn r22557) -Codechange: Remove constness from AnimationBase callbacks. 13 years ago
frosch becf6c823f (svn r22518) -Feature: [NewGRF] Advanced sprite layouts with register modifiers. 13 years ago
frosch 5ca3ac41f0 (svn r22457) -Codechange: Make the NewGRFSpriteLayout a direct member of TileLayoutSpriteGroup instead of allocating it separately. 13 years ago
yexo faec404752 (svn r21456) -Fix: [NewGRF] make sure the parameter for house var 60 is the id of an original house 14 years ago
rubidium 878a06dd9a (svn r21198) -Fix: don't call variables properties in debug messages 14 years ago
alberth 063931d435 (svn r21060) -Doc: Improved wording of comments (mostly by __ln__) 14 years ago
rubidium 360d6daf34 (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
rubidium 7107eef4de (svn r20627) -Codechange: unify the animation code of station, airport, house and industry tiles 14 years ago
rubidium 3a6c4c2f85 (svn r20624) -Codechange: some constifying for NewGRF house 14 years ago
rubidium 514f566d7c (svn r20623) -Codechange: unify the storing of animation related information 14 years ago
rubidium 5a7d6249af (svn r20622) -Codechange: unify [GS]et[Statation|Object|Industry|House]AnimationFrame 14 years ago