Commit Graph

248 Commits

Author SHA1 Message Date
Jonathan G Rennison
174779e371 Merge branch 'save_ext' into enhanced_viewport_overlay-sx
Conflicts:
	src/saveload/saveload.cpp
2015-08-05 21:31:57 +01:00
Jonathan G Rennison
e24839ed65 Merge branch 'master' into enhanced_viewport_overlay
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
2015-08-05 21:25:13 +01:00
patch-import
536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
2015-08-05 21:24:30 +01:00
Jonathan G Rennison
5d680d9154 Implement version setting in SlXvSetCurrentState
Call in ClearSaveLoadState
2015-08-01 18:03:07 +01:00
Jonathan G Rennison
bde094fe01 Initial implementation of SLXI chunk save/load 2015-08-01 12:58:53 +01:00
Jonathan G Rennison
a3980dc6ba Move SlRead/SlWrite functions to saveload.h
Add SlGetBytesRead and SlGetBytesWritten functions.
2015-08-01 12:26:22 +01:00
Jonathan G Rennison
4508cfbf93 Add format-style versions of SlError and SlErrorCorrupt. 2015-08-01 12:26:22 +01:00
Jonathan G Rennison
17e8693e62 Initial stubs for extending the save/load version checking/upgrade code,
with support for tests on individually versioned features as well as
savegame versions.
This is mainly for improved handling of features added to patchpacks.
The current status-quo of picking a random number for the savegame
version when releasing a patch breaks loading of savegames from newer
trunk savegame versions, with or without the same patch applied, as
savegame upgrade code is not run, which can also lead to crashes on load.
Instead don't change the savegame version (but set the high bit to
keep trunk versions away), but instead include the versions of individual
features using a separate mechanism.
2015-08-01 12:26:22 +01:00
frosch
17d9b77db6 (svn r27278) -Fix: Handle savegames with an unexpected amount of industry-builder or NewGRF entity-mapping more gracefully. 2015-05-09 10:04:50 +00:00
frosch
2edbc72ebd (svn r27192) -Change: heading for 1.6 now 2015-03-17 20:33:44 +00:00
rubidium
660a95e5d2 (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 2014-10-12 18:41:53 +00:00
rubidium
b50c649405 (svn r26881) -Codechange: bump the savegame version 2014-09-21 11:28:29 +00:00
alberth
44d2f6a988 (svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo). 2014-09-07 16:12:58 +00:00
rubidium
a1f31b735a (svn r26700) -Fix [FS#6066]: incorrect saving of order backups 2014-07-21 18:03:32 +00:00
fonsinchen
bdde95513a (svn r26650) -Fix [FS#6041]: Support save/load chunk lengths of up to (1 << 32) - 1 2014-06-17 06:13:38 +00:00
fonsinchen
ef2caa02b2 (svn r26646) -Fix [FS#6041]: Save locations instead of distances in link graphs to reduce size. 2014-06-14 13:35:39 +00:00
rubidium
4c6c4677fa (svn r26591) -Add: some instrumentation to catch most cases where the wrong number of bytes would be written into variables during loading (or read during saving) 2014-05-16 17:41:55 +00:00
fonsinchen
7c9ef443e3 (svn r26551) -Fix: document revision number for latest savegame version change 2014-05-01 14:56:33 +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
034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
6ecc602050 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 2014-04-23 21:12:09 +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
peter1138
ed8f6f1a0f (svn r26450) -Feature: Hierarchical vehicle subgroups. 2014-04-08 21:09:06 +00:00
frosch
e511805439 (svn r26409) -Update: Version number in some more places. 2014-03-17 20:16:05 +00:00
frosch
7fcae50579 (svn r26169) -Fix-ish [FS#5831-ish]: Unify the time a RV needs to travel through a curve. 2013-12-22 11:55:07 +00:00
rubidium
089d75e250 (svn r26115) -Fix: AfterLoadGame can throw an exception; from the old savegame load section this wouldn't be caught 2013-11-25 22:22:32 +00:00
rubidium
a6fae2c608 (svn r26058) -Fix: handle the return value of a number of functions better 2013-11-23 13:15:07 +00:00
fonsinchen
809df5aaf6 (svn r25900) -Change [FS#5677]: Allow restricted flows to be picked for kept cargo. 2013-10-22 16:15:59 +00:00
fonsinchen
7025a145e3 (svn r25899) -Change: Restrict flows if links are restricted and don't normally pick them anymore. 2013-10-22 16:13:54 +00:00
frosch
336dc88c19 (svn r25855) -Fix [FS#5788] (r25833): Obiwan messed up savegame conversion. 2013-10-13 10:51:58 +00:00
frosch
d9d978d6d2 (svn r25833) -Codechange: Move ObjectType from map array into pool item. 2013-10-12 16:30:42 +00:00
zuu
4b036690e2 (svn r25620) -Fix (r25342): Save/load of story books were broken 2013-07-21 13:18:45 +00:00
rubidium
1c1a774475 (svn r25510) -Fix: forgot to update some documentation 2013-06-29 09:51:03 +00:00
rubidium
1cf6dad8f2 (svn r25508) -Change: split unit localisation choice into a choice per type of unit, and move it to the advanced settings
-Feature [FS#5482]: have tractive effort in imperial (lbf) and metric (kgf) units
-Feature: have weights and volumes in imperial units (short tons, gallons)
2013-06-29 09:47:18 +00:00
fonsinchen
9589715d3e (svn r25363) -Codechange: bump the savegame version for cargodist 2013-06-09 13:06:03 +00:00
fonsinchen
111ecddb50 (svn r25358) -Codechange: save and load link graph jobs and the schedule 2013-06-09 13:02:05 +00:00
zuu
65129db43c (svn r25342) -Add: StoryPage data structures and GS API 2013-06-09 12:19:09 +00:00
zuu
f23a61e1aa (svn r25296) -Feature: Goals can now have a progress text and/or be marked as completed. 2013-05-26 19:54:43 +00:00
rubidium
6b746167e4 (svn r25259) -Codechange: track capacities and usage of links 2013-05-19 14:22:04 +00:00
rubidium
6515371cf5 (svn r25258) -Codechange: save linkgraph (fonsinchen) 2013-05-19 14:17:02 +00:00
rubidium
3aed6229b5 (svn r25136) -Merge: 1.3 release (documentation) updates 2013-03-31 21:14:39 +00:00
rubidium
7dd2354a13 (svn r25012) -Codechange: persistently keep 'reserved' cargo (for full-load improved loading) instead of calculating if for every cycle 2013-02-17 14:54:50 +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
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
frosch
9f0e8399b0 (svn r24810) -Fix: Make engine preview offers more robust wrt. changes in the company ranking. 2012-12-09 16:55:03 +00:00
frosch
75eb34b48c (svn r24795) -Fix (r24789): Unfinished patch. 2012-12-05 19:58:38 +00:00
frosch
9ef1c5f4c3 (svn r24789) -Add: Separate setting to control the default settings of newly added scripts and random AIs. 2012-12-05 19:36:04 +00:00
alberth
19adc87262 (svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb) 2012-12-01 13:12:39 +00:00
rubidium
d2b2e20818 (svn r24754) -Fix [FS#5367]: crash on corrupted savegame 2012-11-18 16:14:31 +00:00
planetmaker
f46b2fd4b3 (svn r24619) -Change: Check for bankruptcy on a monthly basis (ZxBioHazardZx) 2012-10-20 22:05:26 +00:00