dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,340 Commits 1 Branch 0 Tags
9ea018abc58a875ee38c259b6a6ccca2ec3c836a
Commit Graph

43 Commits

Author SHA1 Message Date
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
 2016-09-08 00:12:48 +01:00
Jonathan G Rennison
f8f8e642dc Use unique_ptr and initialiser init for OrderExtraInfo. 2016-09-06 22:10:18 +01: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
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
d8a083b666 Allow timetable start dates to be set with full precision. 
This avoids rounding of start dates when using minutes and
day length > 1.
 2016-05-11 21:31:31 +01:00
Jonathan G Rennison
bbc131ce47 Merge branch 'jgrpp' into save_ext_spp 
Conflicts:
	src/saveload/order_sl.cpp
 2015-08-26 23:26:18 +01:00
Jonathan G Rennison
8357b911e5 Merge branch 'more_cond_orders-sx' into jgrpp 
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-08-26 23:24:41 +01:00
Jonathan G Rennison
77bcd5f2c2 More conditional orders: Extended save/load changes. 2015-08-26 23:15:33 +01:00
Jonathan G Rennison
ffdd845b1c Merge branch 'master' into more_cond_orders 
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/saveload.cpp
	src/saveload/saveload.h
 2015-08-26 22:51:47 +01:00
patch-import
c757a97214 Import more conditional orders patch 
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
 2015-08-26 22:28:20 +01:00
Jonathan G Rennison
9716026809 Merge branch 'jgrpp' into save_ext_spp 2015-08-15 15:24:21 +01:00
Jonathan G Rennison
fdce64ddae Save/load changes for order occupancy 2015-08-09 23:43:55 +01:00
Jonathan G Rennison
117599ec7f Order occupancy: Add column to orders GUI to show occupancy running average. 
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
 2015-08-09 23:39:55 +01:00
Jonathan G Rennison
39608841f2 Initial support for loading savegames from SpringPP v2.0.102/103 
Savegame version 220

Bin all extra settings added in SpringPP.
Bin extra features: trip histories, more conditional orders/jump counter,
prev order time, snow-line chunk, town auto adv. campaign, etc.
Fix vehicle flags.
Fix bridges wrt height changes.
Handle 60-bit RIFF chunk sizes.
Doesn't deal with huge airports, loading games with these may
lead to undefined ehaviour.
PAX signals and traffic lights are ignored.
 2015-08-09 18:31:00 +01:00
rubidium
c225276a7a (svn r26819) -Fix [FS#6112] (r26787): trying to delete just loaded objects that had not yet resolved their references caused a crash upon savegame load (only when loading a game from a server, e.g. joining MP) 2014-09-14 15:11:33 +00:00
frosch
d2ec27c6c4 (svn r26787) -Fix (r20547): Loading a game with order backups leaked Orders and left unreachable items in the pool. 2014-09-07 13:52:20 +00:00
rubidium
a1f31b735a (svn r26700) -Fix [FS#6066]: incorrect saving of order backups 2014-07-21 18:03:32 +00:00
fonsinchen
c81a6070cb (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 2014-05-01 14:49:16 +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
frosch
972c4560dc (svn r25041) -Remove [FS#3764-ish]: ordered refit with subtypes, since the cases where it worked were corner cases rather than the general case. 2013-02-24 16:41:51 +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
2c67dc3d9f (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 2013-02-14 17:04:01 +00:00
frosch
348f2d35be (svn r24446) -Add [FS#5199]: Store more consist properties in order backups. 2012-07-29 16:48:00 +00:00
frosch
8d09070bb7 (svn r24445) -Fix: Do not load order backups when loading a server-saved game in single player. 2012-07-29 16:45:56 +00:00
frosch
432835ab07 (svn r24444) -Codechange: Base OrderBackup on BaseConsist. 2012-07-29 16:45:34 +00:00
michi_cc
64c5299b4d (svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles. 2012-02-14 17:04:06 +00:00
rubidium
b7722dbe86 (svn r22914) -Fix [FS#4716]: old TTO/TTD savegames could get non-stop via orders upon savegame loading, even when those orders did not exist back then. This 'conversion' feature is something for TTDPatch and old OpenTTD savegames 2011-09-09 21:12:52 +00:00
rubidium
0cf2ef83f0 (svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s]. 2011-01-18 23:09:43 +00:00
alberth
16f678a990 (svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore(). 2010-11-21 12:47:04 +00:00
alberth
160b6834e9 (svn r21282) -Codechange: Rename CheckSavegameVersionOldStyle() to IsSavegameVersionBefore(). 2010-11-21 12:31:16 +00:00
rubidium
27e45d96a4 (svn r20547) -Change: the way order backups are performed. Now restoring an order doesn't require up to 765 commands. 2010-08-18 20:48:38 +00:00
frosch
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
frosch
fe063af382 (svn r19973) -Codechange: Add another procedure to chunk handlers for checking savegames (empty for now). 2010-06-13 14:11:59 +00:00
rubidium
3de085a143 (svn r18683) -Fix: it's not an other 2010-01-01 18:45:40 +00:00
rubidium
da30e736ca (svn r18330) -Cleanup: remove some unneeded includes 2009-11-28 20:35:25 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
smatz
50624d5c0f (svn r16378) -Codechange: replace OldPool with simpler Pool. Compilation time, binary size and run time (with asserts disabled) should be improved 2009-05-22 15:13:50 +00:00
smatz
769de62daf (svn r16338) -Codechange: split loading of references to two phases 
In the first phase, indexes are stored. In the second phase, indexes are checked for validity and converted to pointers
 2009-05-17 16:28:29 +00:00
smatz
d495dc5dbc (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) 2009-05-16 23:34:14 +00:00
smatz
3d5ca93674 (svn r16320) -Fix (r11939): loading of savegames created in revision between 0.3.5 and 0.3.6 caused crash 2009-05-16 18:28:31 +00:00
rubidium
4c707c7414 (svn r16037) -Feature: allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station. 2009-04-12 14:11:14 +00:00
smatz
b83b58dd54 (svn r15500) -Fix (r12648): pre-0.5 OTTD stored new_nonstop and full_load_any in a different way, savegame conversion wasn't working for them 2009-02-16 21:43:44 +00:00
smatz
91233ea596 (svn r14828) -Codechange: move most of save/load-specific code to separate files 2009-01-04 15:32:25 +00:00