dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,470 Commits 1 Branch 0 Tags
ec302b85310bcecefb054cd79d96badb2981f97c
Commit Graph

648 Commits

Author SHA1 Message Date
Jonathan G Rennison
fc60857b66 Merge branches 'adjacent_crossings' and 'zoning' into jgrpp 2017-03-20 19:06:09 +00:00
peter1138
3c7dc746d5 (svn r27807) -Codechange: Remove _ship_leave_depot_offs 
There is already TileOffsByDiagDir for that. (cirdan)
 2017-03-19 22:02:20 +00:00
peter1138
80303515c1 (svn r27807) -Codechange: Remove _ship_leave_depot_offs 
There is already TileOffsByDiagDir for that. (cirdan)
 2017-03-19 22:02:20 +00:00
peter1138
2a555480bd (svn r27806) -Codechange: Remove function ShipGetNewDirection 
ShipGetNewDirection has no side effects and its return value
is ignored by its only caller, so do away with it.

Also remove now unused _new_vehicle_direction_table. (cirdan)
 2017-03-19 21:59:24 +00:00
peter1138
54ec06258a (svn r27806) -Codechange: Remove function ShipGetNewDirection 
ShipGetNewDirection has no side effects and its return value
is ignored by its only caller, so do away with it.

Also remove now unused _new_vehicle_direction_table. (cirdan)
 2017-03-19 21:59:24 +00:00
peter1138
4f9fd074b8 (svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles 
The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
 2017-03-19 21:57:54 +00:00
peter1138
f0062f94d6 (svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles 
The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
 2017-03-19 21:57:54 +00:00
Jonathan G Rennison
7f10d83a4a Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-11-01 23:00:48 +00:00
frosch
c175067ed9 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 2016-10-16 14:58:38 +00:00
frosch
a37bb32fd6 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 2016-10-16 14:58:38 +00:00
frosch
d2393b4f6c (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
frosch
f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
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
frosch
a8080b6256 (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
rubidium
6c2abf0930 (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
fonsinchen
c915d9fa55 (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
0463dbdc9e (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
rubidium
d2ba772f6a (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
frosch
5bda07c10c (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
3947453277 (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
ced17303c2 (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
rubidium
c77cd1f409 (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 2013-02-14 17:04:01 +00:00