Commit Graph

303 Commits

Author SHA1 Message Date
Jonathan G Rennison
3ac94e97c8 Cache the result of GetImage() in Vehicle::UpdateViewport() where possible.
Sprite number is not cached if callback is made, or a variable access
outside a whitelist occurs.
Invalidate cached sprite number when direction or cargo changes,
or vehicle is marked dirty.
2016-07-08 19:07:25 +01:00
Jonathan G Rennison
4c5173b6bf Merge branch 'auto_timetables-sx' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b Timetable auto separation is now per vehicle, with a company default.
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.

Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
2016-05-08 01:12:07 +01:00
Jonathan G Rennison
efcdd6c36f Remove global automated timetable setting. 2016-05-06 23:33:12 +01:00
Jonathan G Rennison
31a5baf555 Merge branch 'improved_breakdowns-sx' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/settings.cpp
2016-02-02 23:09:29 +00:00
Jonathan G Rennison
5eed9865d6 Improved breakdowns: Various changes and fixes.
* Revert breakdown_chance to (mostly) its original behaviour.
* Create a new breakdown_chance_factor to hold breakdown_chance
  from improved breakdowns logic.
* Revert airport crash probabilities back to original behaviour, with
  modified behaviour only during emergency landings.
* Low power breakdowns now only reduce the power of the engine which
  has broken down.
* Low power breakdowns no longer reduce speed directly.
* Add callback function to run whenever improved breakdowns setting
  is changed. Reset breakdown_chance_factor where required.
* More whitespace/formatting...
2016-01-31 22:55:25 +00:00
Jonathan G Rennison
9742300a1e Fix some more whitespace/formatting issues. 2016-01-31 15:22:46 +00:00
Jonathan G Rennison
27bdf2a8b6 Merge branch 'ship_collision_avoidance-sx' into jgrpp
Conflicts:
	src/settings_type.h
	src/table/settings.ini
2016-01-19 22:38:32 +00:00
Jonathan G Rennison
b00b1125be Add a dedicated setting to enable ship collision avoidance. 2016-01-19 22:37:23 +00:00
patch-import
917391102b Import ship collision-avoidance patch.
https://github.com/KeldorKatarn/OpenTTD_PatchPack
2016-01-19 22:01:16 +00:00
Jonathan G Rennison
e9dc82c801 Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
2015-09-03 23:30:13 +01:00
Jonathan G Rennison
42370dc28d Add company setting to auto-enable auto timetables for new vehicles.
Default: off.
2015-09-03 23:27:26 +01:00
Jonathan G Rennison
4c6dc11c16 Merge branch 'infrastructure_sharing-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
2015-08-06 23:11:49 +01:00
Jonathan G Rennison
a4ad4130a6 Merge branch 'master' into infrastructure_sharing
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
2015-08-06 22:55:09 +01:00
patch-import
ee791055f9 Import infrastructure sharing patch
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
2015-08-06 22:24:28 +01:00
Jonathan G Rennison
e4ccea350b Merge branch 'wait_in_depot-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
2015-08-03 01:12:16 +01:00
Jonathan G Rennison
2f9ebebf02 Merge branch 'master' into wait_in_depot 2015-08-03 01:06:55 +01:00
Jonathan G Rennison
4d1c4d18be Timetable wait in depot: minor whitespace/style changes. 2015-08-03 01:06:42 +01:00
patch-import
d8c5de188f Import timetabling wait time in depots patch
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
2015-08-03 01:06:12 +01:00
patch-import
9f5164b403 Import Improved Breakdowns patch
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
2015-08-02 22:58:52 +01:00
frosch
8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
rubidium
ac269a3f08 (svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class 2014-09-20 15:31:26 +00:00
fonsinchen
d49dad9f9c (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 2014-05-01 14:48:44 +00:00
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 2014-04-23 20:13:33 +00:00
rubidium
a498a56573 (svn r26130) -Codechange: add some guards against using invalid image indices 2013-11-26 16:08:58 +00:00
frosch
206616bf37 (svn r25648) -Change [FS#5669]: [NewGRF] Invalidate vehicle recolour palette during (un)loading. 2013-08-04 14:02:27 +00:00
rubidium
6b746167e4 (svn r25259) -Codechange: track capacities and usage of links 2013-05-19 14:22:04 +00:00
rubidium
58ec317c5a (svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138) 2013-02-14 17:24:55 +00:00
rubidium
2c67dc3d9f (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 2013-02-14 17:04:01 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
michi_cc
bac2b4c25d (svn r24839) -Feature [FS#5271]: [NewGRF] Support oversized purchase list sprites. (Based on patch by Eddi) 2012-12-23 01:00:25 +00:00
yexo
055cf8bae6 (svn r24539) -Codechange [FS#5260]: make code simpler by using IsValidTile instead of manually checking the bounds (juanjo) 2012-09-21 20:28:23 +00:00
frosch
5386558459 (svn r24481) -Feature [FS#5127]: Make the pathfinder decide whether ships shall leave depots towards north or south. 2012-08-18 11:37:47 +00:00
frosch
0318fe577e (svn r24480) -Doc: Doxygenize ChooseShipTrack(). 2012-08-18 11:37:23 +00:00
frosch
358a2bd6ed (svn r24384) -Fix [FS#5188-ish]: Make IsInDepot() functions behave consistent across vehicle types and add IsChainInDepot instead, if that is what shall be checked. 2012-07-07 15:39:46 +00:00
frosch
dcd977f778 (svn r24328) -Codechange: Simplify some silly code. 2012-06-06 14:03:22 +00:00
frosch
2aa43d6c8b (svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead. 2012-05-26 14:16:03 +00:00
michi_cc
64c5299b4d (svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles. 2012-02-14 17:04:06 +00:00
rubidium
d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
truebrain
d9f717dcfa (svn r23714) -Codechange: don't mix Viewport with non-viewport code 2012-01-02 13:44:37 +00:00
truebrain
92c60447dc (svn r23713) -Codechange: split VehicleMove() into two functions, to minimalize the work done where possible 2012-01-02 13:44:30 +00:00
rubidium
6b404d35b8 (svn r23540) -Codechange: unify and document vehicle widgets 2011-12-16 16:58:55 +00:00
truebrain
af1b3cc070 (svn r23355) -Codechange: rename all AI* to Script* (Rubidium) 2011-11-29 23:15:35 +00:00
peter1138
b84174fd4d (svn r23316) -Feature: Add ability to zoom in to 2x and 4x level. 2011-11-24 12:38:48 +00:00
frosch
3178814a00 (svn r23173) -Codechange: Rename GetVehicleCapacity() to Engine::DetermineCapacity(). 2011-11-09 16:38:50 +00:00
rubidium
de980ef0f9 (svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight) 2011-11-04 10:18:13 +00:00
frosch
6e61fee028 (svn r23080) -Feature: [NewGRF] Use variable 10 to enable vehicle GRFs to draw different sprites on the map and in various GUIs. 2011-11-01 16:51:47 +00:00
frosch
ad38f27242 (svn r23075) -Codechange: Add GetGRF() and GetGRFID() methods to Engine and Vehicle to simplify code. 2011-11-01 00:23:41 +00:00
frosch
e57ba5d0ae (svn r23074) -Codechange: Add Vehicle::GetEngine() to simplify code. 2011-11-01 00:21:08 +00:00
frosch
2e94869b42 (svn r22849) -Codechange: Add ShipVehicleInfo::ApplyWaterClassSpeedFrac() to apply ocean/canal speed fractions to velocities. 2011-08-27 10:33:45 +00:00