dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,655 Commits 1 Branch 0 Tags
06e0f39affc89888e07640a1aea0808e89c4003d
Commit Graph

2579 Commits

Author SHA1 Message Date
glx22
b080f24bd8 Codechange: move windows common to AI and GS out of ai_gui 2023-02-05 19:27:25 +01:00
Rubidium
4e65ec1dc4 Codechange: do not declare functions in blocks 2023-01-29 20:28:45 +01:00
Jonathan G Rennison
7a7c688b11 Do not call ReInitAllWindows from within LoadStringWidthTable 2023-01-29 10:31:28 +00:00
rubidium42
6ba55e663e Codechange: do not hide variables with other variables 2023-01-29 07:21:34 +01:00
rubidium42
1951af07c0 Codechange: do not hide parameters with local variables 2023-01-29 07:21:34 +01:00
Jonathan G Rennison
4761750eae Fix asserts due to main window not existing yet 
Partial revert of https://github.com/OpenTTD/OpenTTD/pull/10327
 2023-01-27 17:56:17 +00:00
Rubidium
5863d78cb4 Codechange: use commented out code, or guard by #ifdef 2023-01-26 23:47:55 +01:00
Jonathan G Rennison
32fe84cfdd Merge branch 'master' into jgrpp 
# Conflicts:
#	src/clear_cmd.cpp
#	src/main_gui.cpp
#	src/saveload/newgrf_sl.cpp
#	src/water_cmd.cpp
 2023-01-26 22:32:08 +00:00
Peter Nelson
ede1201b6a Codechange: Rename override manager variables. 2023-01-26 21:39:16 +01:00
Jonathan G Rennison
a9100e93cb Merge branch 'master' into jgrpp 
# Conflicts:
#	src/group_cmd.cpp
#	src/lang/korean.txt
#	src/lang/simplified_chinese.txt
#	src/script/api/script_rail.cpp
#	src/tunnelbridge_cmd.cpp
 2023-01-23 19:10:07 +00:00
Tyler Trahan
9c5de7fd72 Fix #10395: When loading old saves, don't forcibly bar level crossings (#10400) 2023-01-23 18:08:19 +01:00
Rubidium
7cdc23fd64 Codechange: hide the map's size related fields in the Map structure 2023-01-21 17:11:40 +01:00
Rubidium
fe2bcd2a58 Codechange: migrate size related functions to Map structure 2023-01-21 17:11:40 +01:00
Rubidium
953445a5ac Codechange: use MakeSea/AllocateMap in the oldloader instead of MemSetT 2023-01-21 17:11:40 +01:00
Jonathan G Rennison
1bfd96c7f2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/3rdparty/fmt/core.h
#	src/command_type.h
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/landscape.cpp
#	src/network/network.cpp
#	src/newgrf_object.h
#	src/object_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_industrytype.cpp
#	src/script/api/script_object.hpp
#	src/script/api/script_town.cpp
#	src/table/object_land.h
#	src/timetable_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
 2023-01-15 19:28:37 +00:00
Rubidium
c5ff61c5f2 Add: script specific Randomizer instances 2023-01-14 22:00:11 +01:00
Rubidium
bcfe0fb076 Codechange: introduce GetMainWindow() to properly account for nullptr checks 
Some nullptr checks have been removed as they were not triggered with nullptr
with the null video driver and in dedicated server mode.
 2023-01-14 21:15:23 +01:00
Rubidium
9c70c38c5e Fix: check for the existence of shadow and rotor vehicles for aircraft 
Instead of just assuming that it exists in the savegame that got loaded.
 2023-01-14 21:15:23 +01:00
Jonathan G Rennison
85fc077637 Add setting flag to enable upstream mode load when patx_name set 2023-01-14 16:58:49 +00:00
Jonathan G Rennison
adf2210bc8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/genworld_gui.cpp
#	src/lang/afrikaans.txt
#	src/lang/arabic_egypt.txt
#	src/lang/basque.txt
#	src/lang/belarusian.txt
#	src/lang/brazilian_portuguese.txt
#	src/lang/bulgarian.txt
#	src/lang/catalan.txt
#	src/lang/croatian.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/dutch.txt
#	src/lang/english.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/esperanto.txt
#	src/lang/estonian.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/frisian.txt
#	src/lang/gaelic.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/lang/greek.txt
#	src/lang/hebrew.txt
#	src/lang/hungarian.txt
#	src/lang/icelandic.txt
#	src/lang/indonesian.txt
#	src/lang/irish.txt
#	src/lang/italian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latin.txt
#	src/lang/latvian.txt
#	src/lang/lithuanian.txt
#	src/lang/luxembourgish.txt
#	src/lang/malay.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/norwegian_nynorsk.txt
#	src/lang/persian.txt
#	src/lang/polish.txt
#	src/lang/portuguese.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/slovenian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/thai.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/lang/welsh.txt
#	src/saveload/afterload.cpp
 2023-01-12 20:59:34 +00:00
PeterN
c18a171028 Fix #10331: Starting new company during load must happen after AI start. (#10332) 
This situation occurs when loading a savegame in single-player which only
has AI companies.
 2023-01-08 18:09:38 +00:00
Jonathan G Rennison
62d524eaef Merge branch 'master' into jgrpp 
# Conflicts:
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/spritecache.cpp
#	src/timetable_gui.cpp
 2023-01-06 20:02:04 +00:00
Rubidium
3c54344825 Fix: comparison of narrow type with wide type in loop condition 
Technically this can't be triggered with the currently returned values though.
 2023-01-06 19:34:35 +01:00
Rubidium
375a5b8e3f Codechange: refactor FindClosestDepot to not use pointers, but return a struct 2023-01-04 22:30:48 +01:00
Jonathan G Rennison
24b744f7c8 Merge branch 'master' into jgrpp 
# Conflicts:
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/saveload/saveload.h
 2023-01-02 01:23:36 +00:00
Michael Lutz
150f05dc15 Change: Heading for 14 now. (#10302) 2023-01-01 22:52:23 +01:00
Jonathan G Rennison
1a5b485b41 Road stops: Use a struct for road stop tile data 2022-12-31 22:51:54 +00:00
Jonathan G Rennison
2c65b050e4 Saveload: Add SLEG_CONDVARVEC macros 2022-12-31 21:24:58 +00:00
Jonathan G Rennison
a1f6aaa58f Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/korean.txt
#	src/saveload/afterload.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/game_sl.cpp
#	src/script/script_instance.cpp
 2022-12-31 18:17:24 +00:00
Loïc Guilloux
fe30f66570 Fix #9720: Delay start of GS/AI to after loading of savegame (#9745) 2022-12-28 05:02:26 +01:00
Jonathan G Rennison
64c210f770 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/engine.cpp
#	src/engine_func.h
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/newgrf.cpp
#	src/saveload/oldloader_sl.cpp
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
 2022-12-28 01:46:29 +00:00
PeterN
961e66df30 Fix #10224: Don't fiddle with fast-forward when saving. (#10230) 
The original comment about saving with fast-forward on was written 18 years
ago, and predates lots of changes to how saveload work.
 2022-12-26 00:05:14 +01:00
Peter Nelson
cbf48c4dd9 Change: Add extra random seed to StartupEngines(). 
This means that calling reset_engines will rerandomise introduction dates
and reliability.

Probably not necessary.
 2022-12-25 16:41:58 +00:00
Peter Nelson
3485709f53 Add: Additional vehicle flags to control variants. 2022-12-25 16:41:58 +00:00
Jonathan G Rennison
3435e74c0c Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	os/macosx/Info.plist.in
#	src/fileio.cpp
#	src/landscape.cpp
#	src/league_cmd.h
#	src/saveload/ai_sl.cpp
#	src/saveload/game_sl.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.cpp
 2022-12-17 23:19:23 +00:00
Jonathan G Rennison
e0cb31ff07 Fix #10214: Header and footer missing from league table saveload 2022-12-16 21:07:36 +01:00
Jonathan G Rennison
3877bb31ef Changing day length or date no longer changes time in minutes 
Add offset variables for scaled date ticks.
Adjust offset when changing day length or date, such that scaled
date ticks remain the same.
Store _scaled_tick_counter and scaled date ticks offset in the savagame.
 2022-12-16 19:15:46 +00:00
Loïc Guilloux
4f9893cc98 Fix 55a1171: Restore skipping of "colour" character (#10244) 2022-12-16 01:56:25 +01:00
Loïc Guilloux
2848483810 Fix #10206: Disable scripts in intro game (#10241) 2022-12-15 21:43:07 +01:00
Jonathan G Rennison
5c2d5782a4 Fixes incorrect link graph edge travel times with non-unity day length 
Change vehicle last_loading_tick to be relative to _scaled_tick_counter
 2022-12-11 00:27:18 +00:00
Jonathan G Rennison
37a270e65c Add header and footer to league table saveload descriptor 
See: https://github.com/OpenTTD/OpenTTD/issues/10214
 2022-12-09 21:13:39 +00:00
Jonathan G Rennison
ce0dddc714 Saveload: Fix load and load check mixup with upstream chunks 
Fixes 690ef6cc
 2022-12-07 22:08:41 +00:00
Jonathan G Rennison
e647075870 Change LinkGraph::EdgeMatrix to a sparse storage format 
Use a btree_map instead of a SmallMatrix.
This avoids excessive storage requirements for large graphs,
and overly expensive edge matrix resize operations.
Remove next_edge iteration mechanism.
 2022-12-05 18:17:25 +00:00
Loïc Guilloux
13d2d11fa8 Fix #10216: Initialise RoadStop caches before using them and don't try to teleport crashed vehicles (#10217) 2022-12-05 12:46:46 +01:00
dP
c91033ac5e Feature: [GS] Scriptable league tables (#10001) 
(cherry picked from commit 5e14a20b3b)
 2022-12-03 22:28:49 +00:00
Jonathan G Rennison
690ef6cc22 Saveload: Add support for using upstream save/load for specific chunks 2022-12-03 22:28:49 +00:00
dP
5e14a20b3b Feature: [GS] Scriptable league tables (#10001) 2022-11-26 18:03:03 +01:00
Jonathan G Rennison
3d7e5d5369 Avoid unnecessary viewport redraws for unused tile loop house triggers 2022-11-24 02:38:10 +00:00
Jonathan G Rennison
1e769d050f Leave PLYP chunk unchanged when loading/saving server saves in non-MP 2022-11-17 00:40:12 +00:00
Jonathan G Rennison
dc03bac241 Saveload: Change SlLoadFromBuffer to take a template functor 2022-11-17 00:33:53 +00:00