dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ingame_rivers' into jgrpp

Browse Source 
Conflicts:
	src/settings_gui.cpp
	src/settings_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-26 19:09:38 +01:00
parent 805986811a 9c75a3c477
commit 591d2ee8b9
6 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/settings_type.h
View File

@@ -347,6 +347,7 @@ struct ConstructionSettings {
uint8 command_pause_level; ///< level/amount of commands that can't be executed while paused
uint16 maximum_signal_evaluations; ///< maximum number of programmable signals which may be evaluated in one pass
byte simulated_wormhole_signals; ///< simulate signals in tunnel
bool enable_build_river; ///< enable building rivers in-game
uint32 terraform_per_64k_frames; ///< how many tile heights may, over a long period, be terraformed per 65536 frames?
uint16 terraform_frame_burst; ///< how many tile heights may, over a short period, be terraformed?