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
frosch
533cb7c156
(svn r27654) -Change: Enable C++11 for clang 3.3 (LordAro)
2016-09-05 19:11:01 +00:00
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.
2016-09-05 00:12:48 +01:00
Jonathan G Rennison
3507b51d9e
Initial LinkRefresher support for cargo-specific links.
2016-09-05 00:12:48 +01:00
Jonathan G Rennison
a670966acf
Change GetNextStoppingStation to return per-cargo result(s).
2016-09-05 00:12:48 +01:00
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.
2016-09-05 00:12:48 +01:00
Jonathan G Rennison
7178ef22e5
Adjust order line load/unload by cargo type strings.
2016-09-04 23:00:10 +01:00
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.
2016-09-04 23:00:10 +01:00
Jonathan G Rennison
8deac54c9f
Remove mutex from SmallStack/StationIDStack.
...
It is only ever used from the main thread.
2016-09-04 23:00:10 +01:00
Jonathan G Rennison
349cd8a6f0
Where possible use compiler builtins for CountBits and FindFirstBit.
2016-09-04 18:01:38 +01:00
alberth
f286ba8db2
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
2016-09-04 16:06:50 +00:00
alberth
0b8869930f
(svn r27652) -Fix(r27650): Use the file operation being performed to set the _sl.action variable.
2016-09-04 15:10:41 +00:00
alberth
e735bbebce
(svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload.
2016-09-04 12:58:04 +00:00
alberth
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
2016-09-04 12:57:43 +00:00
alberth
c3bed437ee
(svn r27649) -Codechange: Introduce detailed file type enum, rebuild FiosType with it.
2016-09-04 12:57:20 +00:00
alberth
3b84827773
(svn r27648) -Codechange: Remove remaining _saveload_mode usage.
2016-09-04 12:56:56 +00:00
alberth
ec2b2fad58
(svn r27647) -Codechange: Introduce file operations, and use it to replace most of SaveLoadDialogMode
2016-09-04 12:56:23 +00:00
alberth
ac72a6b1ed
(svn r27646) -Codechange: Move _fios_items variable into the SaveLoadWindow class.
2016-09-04 12:55:54 +00:00
alberth
76cd96e709
(svn r27645) -Add: Give console commands their own file list storage.
2016-09-04 12:55:21 +00:00
alberth
8a9e9f838b
(svn r27644) -Codechange: Split GetFiosItem into BuildFileList and FindItem, and move both to FileList.
2016-09-04 12:54:52 +00:00
alberth
f618c0d0a5
(svn r27643) -Codechange: FiosGetDrives function also takes a destination file list.
2016-09-04 12:54:30 +00:00
alberth
93baf192a0
(svn r27642) -Codechange: FiosGet* file query functions take a destination file list.
2016-09-04 12:54:03 +00:00
alberth
a38cdeccc0
(svn r27641) -Codechange: Fold the _fios_items file list vector into its own class.
2016-09-04 12:50:22 +00:00
alberth
c530f89761
(svn r27640) -Codechange: Remove another use of _saveload_mode in the loading code.
2016-09-04 12:48:28 +00:00
alberth
b6c29ae4eb
(svn r27639) -Codechange: Also always set the abstract FileToSaveLoad::filetype when setting a mode.
2016-09-04 12:47:39 +00:00
alberth
e78627f2f1
(svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function.
2016-09-04 12:47:07 +00:00
alberth
b5eb50da7b
(svn r27637) -Codechange: Don't use _saveload_mode for scenario loading detection.
2016-09-04 12:46:29 +00:00
alberth
757bc0a97b
(svn r27636) -Codechange: Rename FileType to AbstractFileType.
2016-09-04 12:46:07 +00:00
alberth
a35e970ab0
(svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions.
2016-09-04 12:45:40 +00:00
alberth
df2221ba7e
(svn r27634) -Codechange: Improve name of the SmallFiosItem struct.
2016-09-04 12:45:11 +00:00
alberth
55c7c21c5d
(svn r27633) -Codechange: Extract _saveload_mode use from BuildFileList
2016-09-04 12:44:42 +00: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
e6c7134935
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
2016-09-02 22:21:28 +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