dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,204 Commits 1 Branch 0 Tags
009fea0e14f3aa31285f4a46476c0e02d68c3633
Commit Graph

43907 Commits

Author SHA1 Message Date
rubidium42
27082f9efa Codechange: pass std::string references to OpenBrowser 2023-11-29 02:02:30 +01:00
Jonathan G Rennison
8437b20fed Fix: Deleting towns did not check for waypoints referencing the town 2023-11-29 00:27:16 +01:00
Peter Nelson
7b0afec11f Codechange: Use max_element to find highest cargo amount. 2023-11-28 22:30:48 +00:00
Peter Nelson
3f853d8003 Codechange: Use range-for to simplify getting first non-zero value. 
This reduces indexed array access.
 2023-11-28 22:30:48 +00:00
Jonathan G Rennison
944b2901dd Disallow deleting towns which are referenced by a waypoint 
See: #614
 2023-11-28 21:59:00 +00:00
Tyler Trahan
4181d3c1ff Codechange: Don't use a magic number for the number of DiagDirections 2023-11-28 14:24:33 -05:00
Tyler Trahan
2dad9263d7 Doc: Add, fix, and clean up documentation inside town_cmd.cpp 2023-11-28 14:24:33 -05:00
Tyler Trahan
745945c4d3 Codechange: Be consistent with how we name common parameters 
TileIndex is always tile and Town is always *t. Don't use t and *town.
 2023-11-28 14:24:33 -05:00
Tyler Trahan
1b14eca9d9 Codechange: Rename TryClearTile() for clarity 
The function does not execute the clearing action.
 2023-11-28 14:24:33 -05:00
Tyler Trahan
a98fe9f317 Codechange: Rename MakeTownHouseBigger() for clarity 2023-11-28 14:24:33 -05:00
Tyler Trahan
060672428d Codechange: Merge confusingly-named helper functions into their timer 2023-11-28 14:24:33 -05:00
Tyler Trahan
1f41e773d6 Codechange: Use consistent name for bay road stops 
As of #10494, this is how we describe original dead-end road stops.
 2023-11-28 14:24:33 -05:00
translators
5f442c9127 Update: Translations from eints 
english (us): 1 change by 2TallTyler
 2023-11-28 18:38:40 +00:00
Peter Nelson
519fe33175 Fix ab1a4c6c: Changing baseset/playlist while shuffle is on does not change song. (#11510) 
The change-playlist function relied on toggling shuffle to restart playing which is no longer the case, so always handle it when changing playlist instead.
 2023-11-28 17:44:31 +00:00
Peter Nelson
e3924f3231 Fix #10811: Allow dragging vehicle in depot to any free row. (#11508) 2023-11-28 13:52:36 +00:00
Peter Nelson
e6d132d24b Fix #10926: New free wagons no longer split by type. (#11507) 
NormalizeTrainVehInDepot() should only be called if an engine was built, not for wagons.
 2023-11-28 13:48:09 +00:00
Peter Nelson
3df7d1aff9 Codechange: Template input buffer type in audio mixer. (#11505) 
This reduces code duplication.
 2023-11-28 00:05:30 +00:00
Peter Nelson
e5aed24395 Codechange: Use std::array for industry tile cargo acceptance. (#11498) 
This avoids use of memcpy/memset to copy or fill.
 2023-11-27 23:17:55 +00:00
Peter Nelson
f268c90bd3 Change: Use sparse padding for content download window. (#11501) 2023-11-27 23:17:16 +00:00
Peter Nelson
ab1a4c6c80 Change: Don't restart playback when toggling playlist shuffle. 
Instead update the selected playlist entry for the current song.
 2023-11-27 23:16:41 +00:00
Peter Nelson
6c91c4b99d Fix: Invalidate playlist window when (un)shuffling playlist. 2023-11-27 23:16:41 +00:00
Peter Nelson
4c6ccb5248 Change: Try stopping extmidi player with SIGINT first. (#11404) 
This may give the player a chance to issue MIDI note-off commands.

The kill/waitpid cycle is also less aggressive, waiting 50ms each time.
 2023-11-27 20:39:22 +00:00
Peter Nelson
e3622da408 Fix #11500: Rename Textfile GUI's LinkType to HyperlinkType. (#11502) 
This disambiguates it with LinkType in league tables.
 2023-11-27 10:06:46 +00:00
Peter Nelson
46098449b6 Fix 7cfcf65: cargo_filter_criteria is now a CargoID instead of a index. (#11497) 2023-11-26 19:30:22 +00:00
Peter Nelson
7bee955a4b Change: Set height of larger heightmap/scenario worldgen buttons by text height. (#11496) 
This allows the button height to scale properly by font size.
 2023-11-26 17:56:51 +00:00
Jonathan G Rennison
ca23e31986 Add railtype variable for adjacent crossing information 2023-11-26 17:29:27 +00:00
Jonathan G Rennison
a3371fccc6 Remove Cheats/ExtraCheats distinction 
It is not necessary as there is no longer a need to preserve
the size/order of struct Cheats
 2023-11-26 11:32:26 +00:00
Jonathan G Rennison
c5a292c0df Fix #11493: Incorrect flow values in LinkGraphJob::EdgeAnnotation (#11494) 2023-11-25 20:57:20 +00:00
translators
c6b9227dbb Update: Translations from eints 2023-11-25 18:37:21 +00:00
Tyler Trahan
3902acb13d Codechange: Define a TickCounter variable type for TimerGameTick::counter 2023-11-25 11:50:46 -05:00
Tyler Trahan
d28caa3ced Codechange: Use ticks for timetable start date 2023-11-25 11:50:46 -05:00
Peter Nelson
bc1d49ebf4 Codechange: Add missing ar from Toolb. 2023-11-25 16:45:01 +00:00
Peter Nelson
5489b9fc0c Codechange: Undo #11447, drop down list divider lines are now explicit. 2023-11-25 16:45:01 +00:00
Peter Nelson
667be98ce8 Codechange: List toolbar menu items and dividers explicitly. 
This makes it clearer what items will be shown in the list, allows for non-consecutive
string IDs, and means unused enum values are not necessary.
 2023-11-25 16:45:01 +00:00
Jonathan G Rennison
7d65fbd6e8 Link graph: Fix incorrect job start/join dates when loading upstream saves 2023-11-25 16:32:21 +00:00
Jonathan G Rennison
acc54fabfe Link graph: Fix last_compression adjustments for link graph jobs 2023-11-25 16:32:21 +00:00
Jonathan G Rennison
4874381943 Link graph: Fix date shifting after max year 2023-11-25 16:32:21 +00:00
Jonathan G Rennison
b03064e55b Fix IniLoadSettings 2023-11-25 16:32:21 +00:00
Jonathan G Rennison
21b49a213e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/cheat_gui.cpp
#	src/main_gui.cpp
#	src/network/network_gui.cpp
#	src/saveload/saveload.h
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/timetable_cmd.cpp
#	src/toolbar_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown_type.h
 2023-11-25 14:14:00 +00:00
Peter Nelson
7fb369c732 Fix: extmidi did not move on to next song after playing ends. (#11469) 
`song` is no longer a C-style string so cannot be cleared by writing a NUL char.
Use `.clear()` to properly clear a std::string.

(cherry picked from commit 08778094f4)
 2023-11-25 13:35:29 +00:00
Peter Nelson
96d4538055 Fix #11437: Flipped shorter rail vehicles disappear in windows. (#11446) 
Mixed signed/unsigned strikes again, causing an incorrect sprite offset for shortened vehicles.

(cherry picked from commit 43aa91a7f5)
 2023-11-25 13:35:03 +00:00
Peter Nelson
480e03360b Fix #9545: Crash when all cargo types are disabled. (#11432) 
This is not a very useful state, but it's nice to not crash.

Some parts of the game don't (yet) check for cargo types being redefined, that is out-of-scope here.

(cherry picked from commit bbd64bbe2b)
 2023-11-25 13:34:53 +00:00
Patric Stout
0b226865d5 Fix cda6f24f: don't ignore binary-dir if it happens to be working-dir (#11431) 
Some of our code ignores the SP_WORKING_DIR for some actions, which
means that if, for example, your SP_BINARY_DIR is the same as your
SP_WORKING_DIR, neither is scanned.

Instead, only add SP_WORKING_DIR if it is unique.

(cherry picked from commit c059ce0c97)
 2023-11-25 13:34:43 +00:00
Peter Nelson
63ed5de957 Fix: Some NWidget lists were not properly closed. (#11425) 
(cherry picked from commit d4a77411a5)
 2023-11-25 13:33:18 +00:00
Rubidium
57efeec5bb Fix: allow same length server password in the UI 
(cherry picked from commit a849b4e175)
 2023-11-25 13:32:55 +00:00
Peter Nelson
609eb46ba7 Fix 233aac5: Set newline default comment for new groups. (#11411) 
The newline space between ini groups is actually recorded as a comment of the group. This got inadvertantly dropped in #11364.

(cherry picked from commit 35a7770fde)
 2023-11-25 13:31:04 +00:00
Jonathan G Rennison
2a31095118 Merge branch 'master' into jgrpp 
# Conflicts:
#	regression/regression/result.txt
#	src/aircraft_cmd.cpp
#	src/airport_gui.cpp
#	src/articulated_vehicles.cpp
#	src/console_cmds.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/hotkeys.cpp
#	src/network/core/tcp_connect.cpp
#	src/network/core/tcp_listen.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_engine.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_station.cpp
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/os/macosx/osx_main.cpp
#	src/pathfinder/yapf/yapf_node_rail.hpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_industrytype.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settingsgen/settingsgen.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/strings.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_game_calendar.h
#	src/timer/timer_manager.h
#	src/timer/timer_window.cpp
#	src/timetable_cmd.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/vehicle_cmd.h
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_func.h
#	src/window_gui.h
 2023-11-25 13:30:06 +00:00
Jonathan G Rennison
38df621e62 Improve train speed adaptation with realistic braking 
Take into account recorded speeds at signals along the reservation
As noted in the lookahead

See: #613
 2023-11-25 00:23:27 +00:00
Peter Nelson
47eabe0cd9 Fix 7cfcf65: Check if last-remembered build vehicle cargo filter is valid. (#11486) 
This can be invalid when switching between games with different cargoes loaded.
 2023-11-23 22:46:22 +00:00
Jonathan G Rennison
3f90910bb8 Show train speed adaptation info in debug window 2023-11-23 18:19:18 +00:00