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
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
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
alberth
e735bbebce
(svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload.
8 years ago
alberth
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
alberth
c3bed437ee
(svn r27649) -Codechange: Introduce detailed file type enum, rebuild FiosType with it.
8 years ago
alberth
3b84827773
(svn r27648) -Codechange: Remove remaining _saveload_mode usage.
8 years ago
alberth
ec2b2fad58
(svn r27647) -Codechange: Introduce file operations, and use it to replace most of SaveLoadDialogMode
8 years ago
alberth
ac72a6b1ed
(svn r27646) -Codechange: Move _fios_items variable into the SaveLoadWindow class.
8 years ago
alberth
76cd96e709
(svn r27645) -Add: Give console commands their own file list storage.
8 years ago
alberth
8a9e9f838b
(svn r27644) -Codechange: Split GetFiosItem into BuildFileList and FindItem, and move both to FileList.
8 years ago
alberth
f618c0d0a5
(svn r27643) -Codechange: FiosGetDrives function also takes a destination file list.
8 years ago
alberth
93baf192a0
(svn r27642) -Codechange: FiosGet* file query functions take a destination file list.
8 years ago
alberth
a38cdeccc0
(svn r27641) -Codechange: Fold the _fios_items file list vector into its own class.
8 years ago
alberth
c530f89761
(svn r27640) -Codechange: Remove another use of _saveload_mode in the loading code.
8 years ago
alberth
b6c29ae4eb
(svn r27639) -Codechange: Also always set the abstract FileToSaveLoad::filetype when setting a mode.
8 years ago
alberth
e78627f2f1
(svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function.
8 years ago
alberth
b5eb50da7b
(svn r27637) -Codechange: Don't use _saveload_mode for scenario loading detection.
8 years ago
alberth
757bc0a97b
(svn r27636) -Codechange: Rename FileType to AbstractFileType.
8 years ago
alberth
a35e970ab0
(svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions.
8 years ago
alberth
df2221ba7e
(svn r27634) -Codechange: Improve name of the SmallFiosItem struct.
8 years ago
alberth
55c7c21c5d
(svn r27633) -Codechange: Extract _saveload_mode use from BuildFileList
8 years ago
Jonathan G Rennison
376a45d9fc
Fix wrong bit-allocation in doc comment of CmdModifyOrder.
8 years ago
Jonathan G Rennison
e6c7134935
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison
761463d134
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/window.cpp
8 years ago