Commit Graph

23349 Commits (34040b694c7a50f5db9e9d05a7f9b2445399ae6a)
 

Author SHA1 Message Date
Jonathan G Rennison 34040b694c Make use of override unconditional. 8 years ago
Jonathan G Rennison 8ad53acfef Merge branch 'crashlog_improvements' into jgrpp 8 years ago
Jonathan G Rennison c2825c12ea Add clang version support to crashlog output. 8 years ago
Jonathan G Rennison c59509c2aa Use -gline-tables-only instead of -g1 on clang. 8 years ago
Jonathan G Rennison f7774415f2 Merge branch 'cpp-11' into crashlog_improvements
# Conflicts:
#	src/stdafx.h
8 years ago
Jonathan G Rennison 8a2f9311a9 Include -01 in CFLAGS_BUILD when using clang. 8 years ago
Jonathan G Rennison b8a89437a1 Enable use of atomic store/load on clang. 8 years ago
Jonathan G Rennison 390a22f864 Enable FINAL, (un)linkely, __attribute__ for clang. 8 years ago
Jonathan G Rennison 9a7c1911fc Fix narrowing conversion errors with clang. 8 years ago
Jonathan G Rennison 9ea018abc5 Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
8 years ago
Jonathan G Rennison bc04b07f2b Fix double-use of bits 3 and 7 in Order::flags.
Use a different encoding for the cargo type load/unload bit in flags.
8 years ago
Jonathan G Rennison 153a0536df Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/extended_ver_sl.cpp
8 years ago
Jonathan G Rennison 88156ee570 Merge branch 'day_length' into jgrpp 8 years ago
Jonathan G Rennison 5e67582a64 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison c8942219bd Merge branch 'save_ext' into day_length
# Conflicts:
#	src/saveload/saveload.cpp
8 years ago
cirdan 315db4874a Remove unused global struct RefitDesc
Global struct RefitDesc was defined but never used.

(cherry picked from commit 6826240f8170a93720a0f856f1a10d6dda1926c7)
8 years ago
cirdan ca98e78c69 Remove unused Vehicle capacity methods
Remove unused methods Vehicle::GetConsistFreeCapacities and
Vehicle::GetConsistTotalCapacity.

(cherry picked from commit d97442878f9856c253a3bf976b6a3e114faebefe)
8 years ago
cirdan 25bd3ed6f4 Fix map borders when switching freeform edges
When disabling freeform edges after they were enabled, the tiles
at the northern borders of the map were turned from void to water
by simply setting their type to MP_WATER, which is wrong, because
they were left as owned by player 0, since their owner information
was not updated. Use MakeSea instead, which gets it right.

(cherry picked from commit 39408d6cc4080760f5a58d60cbed9f2ea584496f)
8 years ago
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)
8 years ago
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)
8 years ago
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)
8 years ago
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)
8 years ago
Jonathan G Rennison 6031cca2d7 Refactor Link Refresher cargo mask handling.
Add some separate helper functions.
Move cargo checks out of LinkRefresher::Run.
8 years ago
Jonathan G Rennison f8f8e642dc Use unique_ptr and initialiser init for OrderExtraInfo. 8 years ago
Jonathan G Rennison e90b266af1 De-duplicate cargo masking boilerplate using C++11. 8 years ago
Jonathan G Rennison 72a386abe5 Merge branch 'save_ext' into cargo_type_order 8 years ago
Jonathan G Rennison 162e495cc9 Merge branch 'save_ext' into tracerestrict-sx
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/extended_ver_sl.cpp
8 years ago
Jonathan G Rennison a3d0fc5817 Remove an unused extern declaration, update comment. 8 years ago
Jonathan G Rennison 8e8d7e93d5 Tidy up legacy-compatibility code in PATX/PLYX handlers.
Use lambdas instead of manual emulation.
Move an inner struct back into its owner function.
8 years ago
Jonathan G Rennison a6e0b1ac7d Merge branch 'cpp-11' into save_ext 8 years ago
Jonathan G Rennison f7af8b8bdc Silence -Wunused-variable warnings in src/table/townname.h 8 years ago
Jonathan G Rennison 6e9ea59ab5 Add a simple scope guard include file. 8 years ago
Jonathan G Rennison bb6ea150a3 Use likely/__builtin_expect for assertion macros.
(cherry picked from commit f82002cda2)
8 years ago
Jonathan G Rennison 0b7d68a6d1 Add support for verbose asserts.
(cherry picked from commit 48e4c35fdc)
8 years ago
Jonathan G Rennison 51099c3572 Unconditionally use static_assert. 8 years ago
Jonathan G Rennison 2fe7571034 Require C++11 support.
Set minimum compiler versions to:
GCC 4.7
clang 3.3
ICC 14.0
8 years ago
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.
8 years ago
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)
8 years ago
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)
8 years ago
frosch 533cb7c156 (svn r27654) -Change: Enable C++11 for clang 3.3 (LordAro) 8 years ago
Jonathan G Rennison 871d26098e Move Order::cargo_type_flags into a separately allocated object.
Change savegame format, add a new chunk for cargo_type_flags.
8 years ago
Jonathan G Rennison 3507b51d9e Initial LinkRefresher support for cargo-specific links. 8 years ago
Jonathan G Rennison a670966acf Change GetNextStoppingStation to return per-cargo result(s). 8 years ago
Jonathan G Rennison ed99dd2583 Change name of Order cargo-typed get load/unload type accessors.
Move helper functions to get cargo-specific type in cargo-specific
mode, into Order class.
8 years ago
Jonathan G Rennison 7178ef22e5 Adjust order line load/unload by cargo type strings. 8 years ago
Jonathan G Rennison c1c983ea16 Import cargo type orders patch
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749

Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
8 years ago
Jonathan G Rennison 8deac54c9f Remove mutex from SmallStack/StationIDStack.
It is only ever used from the main thread.
8 years ago
Jonathan G Rennison 349cd8a6f0 Where possible use compiler builtins for CountBits and FindFirstBit. 8 years ago
alberth f286ba8db2 (svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit. 8 years ago
alberth 0b8869930f (svn r27652) -Fix(r27650): Use the file operation being performed to set the _sl.action variable. 8 years ago