dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,177 Commits 1 Branch 0 Tags
c6c7191b16e4f5422c19b640b236b4b15a45d99d
Commit Graph

1690 Commits

Author SHA1 Message Date
Jonathan G Rennison
3436e0a781 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/error.h
#	src/error_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/misc_gui.cpp
#	src/newgrf_gui.cpp
#	src/news_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/gamelog_sl.cpp
#	src/script/api/script_text.cpp
#	src/script/script_instance.cpp
#	src/statusbar_gui.cpp
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
#	src/table/settings/gui_settings.ini
#	src/table/settings/linkgraph_settings.ini
#	src/textbuf_gui.h
 2023-11-09 01:55:23 +00:00
Peter Nelson
ab535c0a86 Codechange: Add base() method to StrongType to allow access to the base type without casting. (#11445) 
This removes the ability to explicitly cast to the base type, but the requirement
to use .base() means the conversion is still explicit.
 2023-11-06 20:29:35 +00:00
Michael Lutz
86e28e79fb Fix #11402: Make string filter locale-aware. 2023-11-03 22:34:01 +01:00
Peter Nelson
18fb8e153f Codechange: Add __FILE__/__LINE__ of WindowDesc to WindowDesc. 
This is to allow unit-tests to produce more useful output.
 2023-11-02 22:25:01 +00:00
Rubidium
c6411168d8 Cleanup: missing spaces before continuation * in some comments 2023-11-01 22:56:11 +01:00
Rubidium
c9276c2959 Codechange: replace x.size() == 0 with x.empty() 2023-10-20 23:05:43 +02:00
Peter Nelson
fd6f1e844a Codechange: Avoid emplace_back(new()) into a unique_ptr. (#11384) 
This could theoretically leave an unmanaged pointer in certain circumstances, and directly using
make_unique shows intent.
 2023-10-20 18:40:48 +01:00
Peter Nelson
9602de474d Codechange: Use iterators and/or range-for on cargo related loops. 2023-10-19 17:03:25 +01:00
Patric Stout
e5673a1756 Codechange: cleanup CargoPacket in terms of variable/function names (#11278) 
Over the years, things got reused and changed, making the current
names somewhat unclear in what they actually mean and do.

(cherry picked from commit 30172fc037)
 2023-10-01 23:40:38 +01:00
Peter Nelson
49dae08a3b Codechange: Add missing override specifiers. 2023-09-25 21:27:45 +01:00
frosch
f40816503f Codechange: Add enum items for dynmically created setting dropdowns. 2023-09-20 22:35:32 +02:00
frosch
b5885295f0 Codechange: Use parameters, which should be used. 2023-09-19 22:49:59 +02:00
frosch
b6c8f301be Codechange: Silence warnings about intentionally unused parameters. 2023-09-19 22:49:59 +02:00
Jonathan G Rennison
f5d1b1d8f8 Change window close/deallocation to match upstream 2023-09-17 13:10:21 +01:00
Rubidium
8ab0936491 Codechange: use parameter pack/folding instead of va_arg macros for widget states 2023-09-16 23:09:53 +02:00
Jonathan G Rennison
a18f3274b4 Rename close window functions to match upstream 2023-09-15 21:17:25 +01:00
Patric Stout
ba67f39db6 Codechange: vendor the nlohmann-json library (#11290) 2023-09-13 16:11:34 +02:00
Jonathan G Rennison
c8817d7f4e Merge branch 'master' into jgrpp 
# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h
 2023-09-12 20:06:47 +01:00
Jonathan G Rennison
1b61dfabe3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_gui.cpp
#	src/core/math_func.hpp
#	src/highscore.cpp
#	src/tests/math_func.cpp
 2023-09-12 18:25:49 +01:00
PeterN
acd7d3c913 Codechange: Rename *Railtype* to *RailType* for consistency. (#11287) 2023-09-11 08:55:12 +00:00
Tyler Trahan
701a61c9af Codechange: Delete date_type.h 2023-09-10 08:40:25 -04:00
Tyler Trahan
77173a6a10 Codechange: Move date consts and functions to CalendarTime and TimerGameCalendar classes 2023-09-10 08:40:25 -04:00
Tyler Trahan
fca2b37726 Codechange: Move Ticks into their own class 2023-09-10 08:40:25 -04:00
Patric Stout
30172fc037 Codechange: cleanup CargoPacket in terms of variable/function names (#11278) 
Over the years, things got reused and changed, making the current
names somewhat unclear in what they actually mean and do.
 2023-09-09 23:21:21 +02:00
Patric Stout
00f13282a9 Codechange: keep how we convert string <-> JSON private (#11269) 2023-09-08 19:03:10 +02:00
Patric Stout
5f9b8aaa95 Codechange: [Script] use nlohmann for Squirrel <-> JSON conversion (#11251) 2023-09-06 13:14:12 +02:00
Peter Nelson
e8015e497d Codechange: Use begin/end of nwidget parts of begin/length. 
This simplifies processing nwidget parts as, unlike the remaining length, the pointer to the end of the list never changes. This is the same principle as we use(d) for tracking end instead of length for C-style strings.

And this removes 160~ instances of the lengthof() macro.
 2023-09-04 10:20:45 +01:00
Michael Lutz
fb6d85dbe5 Add: [Script] Custom news message text for industry SetProductionLevel. 
(cherry picked from commit 0089323542)
 2023-09-02 19:33:00 +01:00
Michael Lutz
4c6ed36b6a Add: [Script] Game script control of industry production level. 
(cherry picked from commit 1c56991213)
 2023-09-02 19:26:54 +01:00
Andy
7839a71d7e Add: [Script] GSIndustry.GetConstructionDate() method (#11145) 
(cherry picked from commit ce9305a5ee)
 2023-09-02 19:26:54 +01:00
mrmbernardi
74c0678015 Feature: [GS] Goal destination can be updated (#10817) 
(cherry picked from commit 35ef6c1723)
 2023-09-02 19:26:54 +01:00
Patric Stout
6550f3a049 Fix 3effb893: mention GSAsyncMode in changelog (#10924) 
(cherry picked from commit 6b1c38e303)
 2023-09-02 18:21:18 +01:00
Michael Lutz
0089323542 Add: [Script] Custom news message text for industry SetProductionLevel. 2023-09-02 16:20:59 +02:00
Michael Lutz
1c56991213 Add: [Script] Game script control of industry production level. 2023-09-02 16:20:59 +02:00
Patric Stout
7afd686541 Codechange: add tests for GS <-> AdminPort JSON conversion (#11252) 
While at it, fix a bug where booleans were made integers.
 2023-08-31 19:38:15 +00:00
Patric Stout
993e7be707 Fix: [Script] GSAdmin.Send() could generate invalid JSON (#11250) 2023-08-31 16:52:52 +00:00
Joan Josep
5e6b5d981f Codechange: Use existing functions in GetMonthlyInfrastructureCosts. (#11237) 2023-08-27 22:12:44 +02:00
Jonathan G Rennison
19835b51ee Move StationCargoList and FlowStatMap out of GoodsEntry struct 
Move them into a new GoodsEntryData struct referenced
using a std::unique_ptr from GoodsEntry.
The unique_ptr may be nullptr if the cargo list and flow stat map
are both empty (this is the case for unused cargoes).

This reduces GoodsEntry from 128 to 24 bytes,
and Station from 8680 to 2024 bytes,
(on Linux x86_64).
 2023-08-19 21:24:29 +01:00
Jonathan G Rennison
e912cfc19d Ring buffer: Use as backing for std::queue uses 2023-08-19 15:28:45 +01:00
Jonathan G Rennison
a403a0c8e3 Use ring buffer for script log line data 2023-08-18 21:25:36 +01:00
Patric Stout
07730584d7 Codechange: make explicit when a TileIndex is cast to its basetype (#11190) 
This prevents people accidentially assigning a TileIndex to a Date
or any other type they shouldn't.
 2023-08-15 18:12:05 +02:00
Jonathan G Rennison
6ccbd7cce2 Saveload: Remove test pass from ScriptInstance::Save 
Use SlConditionallySave to discard the saved data instead if there
was an error
 2023-08-14 18:51:58 +01:00
Jonathan G Rennison
d0c6b7136d Saveload: Improve performance of script data save/load 
Avoid unnecessarily using SlObject wrappers
 2023-08-14 17:28:49 +01:00
Patric Stout
299570b2c1 Codechange: make TimerGameCalendar Date and Year types strongly typed (#10761) 2023-08-12 18:14:21 +00:00
Patric Stout
5fba47b0f7 Codechange: make no assumptions on how the internals of TileIndex work (#11183) 
Basically, avoid ".value", and just cast it to its original type
if you want to retrieve this.
 2023-08-11 14:53:51 +02:00
Jonathan G Rennison
752b0bce47 ScriptList: Defer creation of sorter and values map until first used 2023-08-05 20:03:33 +01:00
Jonathan G Rennison
24a77e5b36 ScriptList: Update iterators when swapping lists 
Safe btree iterators store a pointer to the parent container
 2023-08-05 19:54:05 +01:00
Jonathan G Rennison
bdbc631e6c Script: Simplify implementation of ScriptList 
Use btrees instead of set/map
Replace bucket mechanism for reverse mapping
Avoid redundant operations
 2023-08-03 22:05:26 +01:00
Andy
ce9305a5ee Add: [Script] GSIndustry.GetConstructionDate() method (#11145) 2023-07-20 20:35:37 +02:00
Jonathan G Rennison
508f871c5f Use core/format.hpp for fmt includes 2023-07-20 16:34:59 +01:00