Commit Graph

23287 Commits

Author SHA1 Message Date
cirdan
c5e30b8f04 Fix file descriptor leak in LoadOldSaveGame
LoadOldSaveGame was leaking a file descriptor when it
successfully loaded a savegame.

(cherry picked from commit f47cfbbba0b182f116109e02445bb419fab1a157)
2016-09-07 19:15:04 +01:00
cirdan
293ce8b4ab Remove impossible conditional in RealSave_Town
Saving always uses the current savegame version SAVEGAME_VERSION,
which is non-decreasing and already greater than 166.

(cherry picked from commit 6b79497d380b3ae865ddf4d3efb71c319a2bb579)
2016-09-07 18:47:47 +01:00
cirdan
4a19babf9e Remove unused ChunkType flag CH_AUTO_LENGTH
CH_AUTO_LENGTH is no longer used anywhere, so remove all code
that depends on it.

(cherry picked from commit 9c620d9de5d45b78f7d992d6b3897009fe988d86)
2016-09-07 18:47:39 +01:00
cirdan
ec157b4a66 Remove save-only autolength flag from economy chunk handlers
CH_AUTO_LENGTH is only used when saving chunks; it makes no sense
to set it for chunks without a save handler.

(cherry picked from commit 8b2fe11d8491fb5f3b9bd7dd5344a0956817e41c)
2016-09-07 18:47:32 +01:00
cirdan
e6122f5ce4 Remove ZeroedMemoryAllocator from ScriptText
Have ScriptText initialise all of its members on construction and
not derive from ZeroedMemoryAllocator.

(cherry picked from commit 3240126202d3437396004f2d5b0371783effb1ea)

Reorder ScriptText constructor initialisers.
2016-09-05 22:41:36 +01:00
cirdan
80fd6a2783 Drop memory allocator from ClientNetworkGameSocketHandler
Have ClientNetworkGameSocketHandler initialise all of its members
on construction and not derive from ZeroedMemoryAllocator.

(cherry picked from commit dddda4f0b7ba0bd6f310f924d3b85cadbc81dc99)
2016-09-05 22:35:15 +01:00
cirdan
33e3956b13 Remove ZeroedMemoryAllocator from WindowDesc
All fields are initialised in the constructor, plus no WindowDesc
is ever constructed via operator new.

(cherry picked from commit 94750756bfbf8ab5ca36e6a38f6f7b556ca31b32)
2016-09-05 22:34:48 +01:00
Jonathan G Rennison
349cd8a6f0 Where possible use compiler builtins for CountBits and FindFirstBit. 2016-09-04 18:01:38 +01:00
Jonathan G Rennison
376a45d9fc Fix wrong bit-allocation in doc comment of CmdModifyOrder. 2016-09-03 21:55:51 +01:00
Jonathan G Rennison
761463d134 Merge branch 'template_train_replacement-sx' into jgrpp
# Conflicts:
#	src/window.cpp
2016-08-26 00:19:11 +01:00
Jonathan G Rennison
1af23b7caa Merge branch 'template_train_replacement' into template_train_replacement-sx
# Conflicts:
#	src/saveload/saveload.cpp
2016-08-26 00:18:10 +01:00
Jonathan G Rennison
5064dcdd2c TBTR: Create template window: Fix vehicle unselection on drag abort. 2016-08-26 00:16:18 +01:00
Jonathan G Rennison
0c5a98d125 TBTR: Create template window: Sell button now lowers on hover. 2016-08-26 00:15:50 +01:00
Jonathan G Rennison
23a1c07378 Merge branch 'master' into template_train_replacement
Fix Template creation window vehicle drag cursor.
2016-08-26 00:00:20 +01:00
frosch
f46996243b (svn r27632) -Feature: When dragging vehicles in group or depot GUI, draw the complete articulated vehicle. 2016-08-15 18:34:31 +00:00
frosch
0829753fd0 (svn r27631) -Codechange: Split GetSingleVehicleWidth from GetVehicleWidth. 2016-08-15 18:34:09 +00:00
frosch
caa9bffb56 (svn r27630) -Codechange: Deduplicate code to attach vehicle to cursor. 2016-08-15 18:33:52 +00:00
frosch
0214caaac2 (svn r27629) -Fix: When dragging multiple vehicles in the depot, make the destination gap as long as the chain instead of just considering the first vehicle. 2016-08-15 18:33:29 +00:00
frosch
0e3e4eeb53 (svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites. 2016-08-15 18:33:08 +00:00
frosch
2337d169e8 (svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy. 2016-08-15 18:32:48 +00:00
frosch
93d5995bed (svn r27626) -Codechange: Do not use the cursor sprite as PlaceObject status in the main toolbar. 2016-08-15 18:32:25 +00:00
frosch
2257d782b0 (svn r27625) -Doc: CursorVars 2016-08-15 18:30:50 +00:00
translators
9d5ed2c469 (svn r27624) -Update from Eints:
spanish (mexican): 24 changes by Absay
2016-08-07 17:45:36 +00:00
Jonathan G Rennison
1d66e66c91 Version: Committing version data for tag: jgrpp-0.14.0 2016-07-27 21:08:42 +01:00
Jonathan G Rennison
7b56097f50 Merge branch 'master' into jgrpp
# Conflicts:
#	config.lib
#	src/linkgraph/demands.cpp
#	src/linkgraph/mcf.cpp
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/smallmap_gui.cpp
2016-07-24 10:16:55 +01:00
frosch
a2a69c1480 (svn r27623) -Fix (r27616) [FS#6492]: Missed two version checks, and messed one up. 2016-07-24 09:13:51 +00:00
frosch
cc18df4cb7 (svn r27622) -Change: In industry map view, give visible industry types the highest tile priority, and hidden industry types a lower one. This way filtered and highlighted industries are not hidden by overlapping tiles in zoomed-out smallmap. (adf88) 2016-07-22 21:44:54 +00:00
frosch
46aeed3817 (svn r27621) -Fix (r27620): Committed too early. 2016-07-22 21:38:49 +00:00
frosch
bd6799a9f8 (svn r27620) -Codechange: Inline GetEffectiveTileType (adf88) 2016-07-22 21:29:04 +00:00
frosch
2c403c8a80 (svn r27619) -Update: Baseset translations 2016-07-22 21:25:37 +00:00
Jonathan G Rennison
e29da8323c Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2016-07-20 01:54:38 +01:00
Jonathan G Rennison
c6d9a49a73 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2016-07-20 01:54:30 +01:00
Jonathan G Rennison
8c4904a9e4 Update route markers/lines when drag/dropping vehicle orders. 2016-07-20 01:54:18 +01:00
translators
aa140bb928 (svn r27618) -Update from Eints:
latvian: 19 changes by Parastais
2016-07-18 17:45:36 +00:00
Jonathan G Rennison
3ea652c4b9 Merge branch 'tracerestrict-sx' into jgrpp 2016-07-18 00:48:12 +01:00
Jonathan G Rennison
8482fc6aef Merge branch 'tracerestrict' into tracerestrict-sx 2016-07-18 00:48:05 +01:00
Jonathan G Rennison
3d6cbb76b4 Allow value of "PBS entry signal" conditional to be a rail depot. 2016-07-18 00:47:52 +01:00
Jonathan G Rennison
e7dfc40a59 Merge branch 'template_train_replacement-sx' into jgrpp 2016-07-18 00:19:42 +01:00
Jonathan G Rennison
0d45eba6ce Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-07-18 00:19:33 +01:00
Jonathan G Rennison
f245049f91 TBTR: Select most used rail-type by default, instead of first rail-type. 2016-07-18 00:19:19 +01:00
translators
c6ac52e71a (svn r27617) -Update from Eints:
latvian: 6 changes by Parastais
2016-07-17 17:45:36 +00:00
frosch
f7a7f141d3 (svn r27616) -Codechange [FS#6487]: [Build] Change the GCC version detection so that it works with two-digit and truncated versions. 2016-07-17 11:10:21 +00:00
translators
18bbe02337 (svn r27615) -Update from Eints:
spanish: 7 changes by SilverSurferZzZ
2016-07-12 17:45:35 +00:00
Jonathan G Rennison
cd0211095b Merge branch 'tracerestrict-sx' into jgrpp 2016-07-11 22:13:07 +01:00
Jonathan G Rennison
7a18f9eeeb Merge branch 'tracerestrict' into tracerestrict-sx 2016-07-11 22:12:51 +01:00
Jonathan G Rennison
58817c26e0 Fix reservation through multiple reserve-through signals after a junction. 2016-07-11 22:02:33 +01:00
fonsinchen
ff96590312 (svn r27614) -Codechange: Use a fixed array instead of a map for link refresher cargo capacities. (JGR) 2016-07-10 12:17:00 +00:00
fonsinchen
a81b7a24a6 (svn r27613) -Codechange: Use a flat vector instead of a map in FlowEdgeIterator. (JGR) 2016-07-10 12:03:23 +00:00
fonsinchen
6b2eed0a70 (svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR) 2016-07-10 11:57:16 +00:00
fonsinchen
8d5566651b (svn r27611) -Codechange: Cache the calculated value of CapacityAnnotation 2016-07-10 11:53:43 +00:00