⏴ go to previous day
00:08:55 <DorpsGek> [OpenTTD/OpenGFX] zephyris opened pull request #105: Feature: Bridge deck overlays for vanilla infrastructure types https://github.com/OpenTTD/OpenGFX/pull/105
00:12:23 <DorpsGek> [OpenTTD/OpenTTD] James103 commented on pull request #13545: Fix #10995: Terraform end tile of aqueducts when building on slopes https://github.com/OpenTTD/OpenTTD/pull/13545#issuecomment-3677059543
00:15:13 <_zephyris> Ah, this repo doesn't bridge to Discord/IRC: https://github.com/OpenTTD/infra/pull/1/files
00:15:17 <_zephyris> (if anyone has the power)
00:16:09 *** MinchinWeb[m] has quit IRC (Remote host closed the connection)
00:16:33 *** MinchinWeb[m] has joined #openttd
00:59:15 <_glx_> well I can merge it, but I think it won't take effect without a restart of bananas, which I can't do
01:01:31 *** tokai has joined #openttd
01:01:31 *** ChanServ sets mode: +v tokai
01:08:35 *** tokai|noir has quit IRC (Ping timeout: 480 seconds)
01:50:17 *** MinchinWeb[m] has quit IRC (Ping timeout: 480 seconds)
01:51:16 *** MinchinWeb[m] has joined #openttd
02:52:37 *** WormnestAndroid has quit IRC (Ping timeout: 480 seconds)
02:56:07 *** WormnestAndroid has joined #openttd
03:17:07 *** Wormnest has quit IRC (Quit: Leaving)
06:49:06 *** Flygon has quit IRC (Read error: Connection reset by peer)
06:50:04 *** keikoz has quit IRC ()
06:51:35 *** keikoz has joined #openttd
08:17:16 <_zephyris> Good point
08:46:22 *** teemu has joined #openttd
08:46:41 *** teemu has quit IRC (Remote host closed the connection)
09:50:51 <xarick> hi
09:51:04 <ahyangyi> Would OpenGFX 1 receive updates to get the missing sprites though
09:51:10 <ahyangyi> even if just copying from OpenGFX 2
09:56:02 <xarick> RemoveItemTests (2'000'000) - 10 iterations
09:56:02 <xarick> openttd master g598d8fd65c: 467 466 466 465 466 465 465 466 467 465
09:56:02 <xarick> openttd rubidium script-list 1.0 - move to super class: 464 466 465 465 467 466 465 466 465 465
09:56:02 <xarick> openttd rubidium script-list 1.1 - constructors const: 464 465 465 463 464 465 467 465 466 464
09:56:02 <xarick> openttd rubidium script-list 1.2 - deduplicate by templating: 477 477 478 479 477 478 477 477 478 478
09:59:11 *** Wolf01 has joined #openttd
10:16:54 <xarick> https://cdn.discordapp.com/attachments/1008473233844097104/1451881037360791563/image.png?ex=6947c915&is=69467795&hm=5ee52ddcf49126a35aea43a8b9b3486b22f1dd240f42453648438dac20085ffc&
10:16:54 <xarick> best results
10:18:23 <Rubidium> I'm completely flabbergasted by my gprof results. I've tried disabling any CPU frequency scaling and related shit and still. Baseline 1.90, moving some stuff to the super class 1.87, making things const 1.70, templating with pointers 1.94, templating with references 3.23. Really, https://github.com/OpenTTD/OpenTTD/pull/14937/commits/0ac7176f6452bb7954841c8a6e12388a1f2a609a improves performance by 10%?
10:19:15 <andythenorth> 👀
10:20:54 <xarick> compilers have a mind of their own
10:21:36 <Rubidium> and replacing `[](const ScriptList *list) constexpr { return &list->values; }` with `[](const ScriptList *list) constexpr -> const ScriptList::ScriptListSet& { return list->values; }` basically halfs the performance? It makes literally no sense to me
10:23:14 <xarick> don't forget SwapList exists
10:23:35 <xarick> maybe it's doing a copy? or whatever
10:34:39 <Rubidium> if it'd make a copy, then you'd end up with dangling pointers and crashes
11:09:28 <xarick> hmm speaking of dangling pointers: [#14805](https://github.com/OpenTTD/OpenTTD/pull/14805)
11:11:57 <xarick> hmm I see youre not doing this->End() at construction
11:13:08 <xarick> ah, it's now the default member values
11:13:13 <xarick> shortcutted
11:29:36 <xarick> question, could `CollectionProjection(this->list);` and
11:29:36 <xarick> `auto MapCollectionProjection = [](const ScriptList *list) constexpr { return &list->items; };`
11:29:36 <xarick> be inside their respective classes?
11:29:59 <xarick> just wondering if this is the source of slowdowns
11:31:41 <xarick> also `auto`, what does auto resolve to here?
11:35:39 <xarick> ah, resolves to Range
11:42:54 <xarick> `typename Range::const_iterator iter; ///< The iterator over the value/item pairs in the set.`
11:42:54 <xarick> iterator over either item/value map or value/item set
11:44:38 <xarick> typename Range - heh, so this is either the std::map or std::set contents
11:45:02 <xarick> very reliant on auto
11:48:05 *** Heiki has quit IRC (Quit: issued !quit command)
11:49:59 *** Heiki2 has joined #openttd
11:54:09 <_glx_> I found a way to suspend AddRectangle
12:17:01 *** gelignite has joined #openttd
12:31:30 <xarick> I'm butchering rubidium's code
12:31:42 <xarick> making it not use lambdas
12:33:12 <xarick> well i failed
12:52:48 <xarick> regression_stationlist is failing
12:53:02 <xarick> because SwapList
12:55:10 <xarick> ScriptStationList_CargoWaiting(selector, station_id, cargo, other_station).SwapList(this);
12:55:37 <xarick> and friends
13:49:17 <xarick> what does final mean?
13:56:11 <xarick> ok i fixed regression_stationlist
13:56:26 <xarick> must retarget &ranges on SwapList
13:59:11 <DorpsGek> [OpenTTD/website] 2TallTyler opened pull request #366: Add: Announcement post for 15.0-RC3 https://github.com/OpenTTD/website/pull/366
14:01:40 <talltyler> Anybody want to do the backport PR? I am confused by Git today but can do the changelog. 🙂
14:02:04 *** Wormnest has joined #openttd
14:14:31 <DorpsGek> [OpenTTD/OpenTTD] 2TallTyler opened pull request #14940: Update: Changelog for 15.0-RC3 https://github.com/OpenTTD/OpenTTD/pull/14940
14:15:47 *** gelignite has quit IRC ()
14:29:03 *** Wolf01 has quit IRC (Quit: Once again the world is quick to bury me.)
14:31:15 <xarick> https://cdn.discordapp.com/attachments/1008473233844097104/1451945048563257526/diff.diff?ex=694804b3&is=6946b333&hm=0186a997d6d451e00c03253f2cb859ca81b5f7c7dd4088cb4cf8badbf28af0b7&
14:31:15 <xarick> @rubidium i made something
14:33:16 <xarick> gonna benchmark
14:46:22 <_glx_> you just add complexity I think
14:47:36 <DorpsGek> [OpenTTD/OpenTTD] rubidium42 opened pull request #14941: Codechange: [Script] Make member functions that do not change state const https://github.com/OpenTTD/OpenTTD/pull/14941
14:57:30 <DorpsGek> [OpenTTD/OpenTTD] LordAro approved pull request #14941: Codechange: [Script] Make member functions that do not change state const https://github.com/OpenTTD/OpenTTD/pull/14941#pullrequestreview-3601141689
15:05:00 <DorpsGek> [OpenTTD/OpenTTD] glx22 opened pull request #14942: Codechange: [Script] Specify underlying type for ScriptList::SorterType https://github.com/OpenTTD/OpenTTD/pull/14942
15:07:01 <DorpsGek> [OpenTTD/OpenTTD] rubidium42 approved pull request #14942: Codechange: [Script] Specify underlying type for ScriptList::SorterType https://github.com/OpenTTD/OpenTTD/pull/14942#pullrequestreview-3601146083
15:21:03 <xarick> yay
15:21:20 <xarick> reduced to 470 seconds
15:21:25 <xarick> from 477
15:24:33 <DorpsGek> [OpenTTD/OpenTTD] glx22 opened pull request #14943: Change: [Script] Spread load of heavy Script[Tile]List functions over multiple ticks https://github.com/OpenTTD/OpenTTD/pull/14943
15:36:38 <DorpsGek> [OpenTTD/OpenTTD] rubidium42 merged pull request #14941: Codechange: [Script] Make member functions that do not change state const https://github.com/OpenTTD/OpenTTD/pull/14941
15:52:09 *** Flygon has joined #openttd
16:01:44 <DorpsGek> [OpenTTD/OpenTTD] glx22 merged pull request #14942: Codechange: [Script] Specify underlying type for ScriptList::SorterType https://github.com/OpenTTD/OpenTTD/pull/14942
16:03:07 <xarick> if constexpr is good
16:19:51 <xarick> I wonder if we can just merge all these classes into one singular ScriptListSorter
16:26:08 <xarick> screw virtuals
16:31:38 <xarick> hmm i fail at templates, mr copilot halp!
16:42:02 *** Wormnest has quit IRC (Ping timeout: 480 seconds)
16:49:53 *** WormnestAndroid has quit IRC (Ping timeout: 480 seconds)
16:50:05 *** WormnestAndroid has joined #openttd
17:09:12 <xarick> yah, i reduced to 207 lines! that's more than rubidium's 229
17:10:42 <LordAro> mm, 22 lines difference
17:10:48 <LordAro> that is... nothing.
17:11:59 <xarick> need to test performance
17:12:14 <xarick> I now expect it to be at the level of 1.1
17:24:51 <peter1138> Meep, I am now home.
17:27:03 <LordAro> yay
17:27:12 <peter1138> So do we want to do a backport PR, and are we happy with the current backport-requested PRs?
17:30:53 *** WormnestAndroid has quit IRC (Ping timeout: 480 seconds)
17:31:04 *** WormnestAndroid has joined #openttd
17:33:32 <talltyler> I don’t have time/brainpower to figure out the backport script today but am happy to update changelog/website PRs as needed.
17:34:45 <Rubidium> peter1138: seems fine to me
17:37:13 <Rubidium> though I would have kind-of expected there to be some eints commit last night given the changes to english.txt for the colour popping
17:38:31 <peter1138> Hmm, no, colour changes will be manual.
17:38:36 <peter1138> Perhaps we should leave that one off.
17:40:02 <peter1138> Colour code differences don't give a language file warning, it's possible for colours to be wrong forever.
17:46:16 <DorpsGek> [OpenTTD/OpenTTD] rubidium42 commented on pull request #14943: Change: [Script] Spread load of heavy Script[Tile]List functions over multiple ticks https://github.com/OpenTTD/OpenTTD/pull/14943#pullrequestreview-3601196380
17:47:16 <talltyler> The colour pop/push changes show up for me in WebTranslator (en-US) but silently fail to save
17:47:21 <peter1138> On the other hand, the old strings are not really a problem, they just contain now-redundant push/pop codes.
17:47:31 <peter1138> talltyler, Oh/
17:47:31 <peter1138> ?
17:48:11 <peter1138> Are you saving it with or without the codes?
17:48:28 <talltyler> They show as Outdated at least, not Invalid, so if I understand correctly, the old translations should be used instead of falling back to English.txt
17:49:25 <talltyler> I am copying the base translations except for the ou->o change
17:51:28 *** WormnestAndroid has quit IRC (Read error: Connection reset by peer)
17:58:47 *** Wormnest has joined #openttd
18:00:04 *** WormnestAndroid has joined #openttd
18:00:55 <DorpsGek> [OpenTTD/OpenTTD] PeterN opened pull request #14944: Backport master into release/15 https://github.com/OpenTTD/OpenTTD/pull/14944
18:04:36 *** gelignite has joined #openttd
18:06:33 <DorpsGek> [OpenTTD/OpenTTD] PeterN commented on pull request #14944: Backport master into release/15 https://github.com/OpenTTD/OpenTTD/pull/14944#issuecomment-3678003377
18:07:14 *** hpiirai has joined #openttd
18:07:14 <hpiirai> talltyler: Same problem here with fi\_FI
18:12:14 <hpiirai> for me, `STR_NEWGRF_BROKEN_VEHICLE_LENGTH`, `STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK`, and `STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK` are the ones that don’t get saved
18:18:17 <Heili> (the last one should have been STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK, but apparently the IRC bridge ignores edits on the Discord side)
18:33:17 <DorpsGek> [OpenTTD/OpenTTD] rubidium42 approved pull request #14944: Backport master into release/15 https://github.com/OpenTTD/OpenTTD/pull/14944#pullrequestreview-3601220494
18:33:45 <DorpsGek> [OpenTTD/OpenTTD] rubidium42 commented on pull request #14940: Update: Changelog for 15.0-RC3 https://github.com/OpenTTD/OpenTTD/pull/14940#pullrequestreview-3601220627
18:35:25 <DorpsGek> [OpenTTD/OpenTTD] 2TallTyler updated pull request #14940: Update: Changelog for 15.0-RC3 https://github.com/OpenTTD/OpenTTD/pull/14940
18:37:36 *** WormnestAndroid has quit IRC (Read error: Connection reset by peer)
18:37:37 *** WormnestAndroid has joined #openttd
18:37:48 *** WormnestAndroid has quit IRC (Read error: Connection reset by peer)
18:39:05 <xarick> oops, no gains
18:39:58 <xarick> https://cdn.discordapp.com/attachments/1008473233844097104/1452007638232600616/image.png?ex=69483efd&is=6946ed7d&hm=7b6c40319b5c153315c63d326b7079293ab3f4cb4fb1c7409b2e576141e43307&
18:40:33 <xarick> 1.1 still the best
18:44:07 *** WormnestAndroid has joined #openttd
18:44:28 <rito12_51026> hpiirai: I had same problem with pl_PL, but adding an additional word, saving and then removing the added word helped
18:45:10 <peter1138> I wondered if it was something like that -- stripping the codes before comparing the strings, making it look like there's no difference.
18:48:20 <hpiirai> rito12_51026: Thanks, that did it.
18:53:48 <xarick> rubidium: https://github.com/OpenTTD/OpenTTD/commit/762d0def7538f2635603404e4d3813f36ea12cb1
18:53:48 <xarick> commit message by copilot, code by me
18:54:04 <xarick> that's the 1.4 in the graph
18:58:56 <xarick> I tried to make it a single class for the sorter, but couldn't do it
18:59:11 <xarick> it's reduced to 2 classes
19:07:55 <DorpsGek> [OpenTTD/OpenTTD] PeterN merged pull request #14944: Backport master into release/15 https://github.com/OpenTTD/OpenTTD/pull/14944
19:08:39 <DorpsGek> [OpenTTD/OpenTTD] PeterN approved pull request #14940: Update: Changelog for 15.0-RC3 https://github.com/OpenTTD/OpenTTD/pull/14940#pullrequestreview-3601230769
19:10:19 <DorpsGek> [OpenTTD/OpenTTD] 2TallTyler merged pull request #14940: Update: Changelog for 15.0-RC3 https://github.com/OpenTTD/OpenTTD/pull/14940
19:15:10 <talltyler> Ready for release as soon as someone approves the website PR. 🙂
19:15:10 <talltyler> https://github.com/OpenTTD/website/pull/366
19:18:22 <DorpsGek> [OpenTTD/website] rubidium42 approved pull request #366: Add: Announcement post for 15.0-RC3 https://github.com/OpenTTD/website/pull/366#pullrequestreview-3601233562
19:20:51 <DorpsGek> [OpenTTD/OpenTTD] rubidium42 approved pull request #14939: Include ScriptList contents in script memory allocation total https://github.com/OpenTTD/OpenTTD/pull/14939#pullrequestreview-3601234227
19:21:18 <DorpsGek> [OpenTTD/OpenTTD] 2TallTyler created new tag: 15.0-RC3 https://github.com/OpenTTD/OpenTTD/releases/tag/15.0-RC3
19:22:17 <DorpsGek> [OpenTTD/OpenTTD] Release workflow was not successful https://github.com/OpenTTD/OpenTTD/actions/runs/20398945657
19:22:47 <_zephyris> ``` -- Version string: 15.0-RC3
19:22:47 <_zephyris> -- Generating .ottdrev
19:22:47 <_zephyris> Changelog doesn't start with current version (15.0-RC3)
19:22:47 <_zephyris> Error: Process completed with exit code 1.```
19:22:50 <DorpsGek> [OpenTTD/OpenTTD] PeterN commented on pull request #14939: Include ScriptList contents in script memory allocation total https://github.com/OpenTTD/OpenTTD/pull/14939#issuecomment-3678051501
19:23:47 <DorpsGek> [OpenTTD/OpenTTD] Release workflow was not successful https://github.com/OpenTTD/OpenTTD/actions/runs/20398945657
19:23:48 <talltyler> But I updated the changelog...?
19:24:00 <Rubidium> talltyler: you tagged master, not 15
19:24:37 <talltyler> Ah, let's try again 🙂
19:26:49 <DorpsGek> [OpenTTD/OpenTTD] 2TallTyler created new tag: 15.0-RC3 https://github.com/OpenTTD/OpenTTD/releases/tag/15.0-RC3
19:30:57 <DorpsGek> [OpenTTD/OpenTTD] rubidium42 updated pull request #14937: Codechange: [Script] Reduce code duplication for list sorters https://github.com/OpenTTD/OpenTTD/pull/14937
19:34:28 <DorpsGek> [OpenTTD/OpenTTD] Rito13 updated pull request #14870: Codefix: Use proper widget type and update widgets properly. https://github.com/OpenTTD/OpenTTD/pull/14870
19:45:53 <DorpsGek> [OpenTTD/OpenTTD] Rito13 updated pull request #14870: Codefix: Use proper widget type and update widgets properly. https://github.com/OpenTTD/OpenTTD/pull/14870
19:51:19 <DorpsGek> [OpenTTD/OpenTTD] Release workflow was not successful https://github.com/OpenTTD/OpenTTD/actions/runs/20399007350
19:53:06 <xarick> `enum SorterType : uint8_t {` it should have been int8_t
19:53:21 <xarick> safer for squirrel
19:54:50 <_jgr_> uint8_t is fine
19:55:32 <xarick> i think enums are translated to int64-t
19:56:00 <xarick> need a sign
19:56:23 <xarick> forgot the exact details, but whatever
19:58:27 <_jgr_> It doesn't need one, it is fine
20:01:14 <DorpsGek> [OpenTTD/website] 2TallTyler merged pull request #366: Add: Announcement post for 15.0-RC3 https://github.com/OpenTTD/website/pull/366
20:04:22 <kaji_kaede> Heh, good luck for this one.
20:04:51 <talltyler> Website, Discord, TT-Forums, and Steam are done. Can someone do Reddit and Mastodon?
20:05:29 <DorpsGek> [OpenTTD/OpenTTD] SamuXarick commented on pull request #14937: Codechange: [Script] Reduce code duplication for list sorters https://github.com/OpenTTD/OpenTTD/pull/14937#pullrequestreview-3601246022
20:05:40 <talltyler> Poor GOG is still broken 🙁
20:06:00 <peter1138> kaji_kaede, what does that mean?
20:06:09 <_zephyris> Can reddit...
20:06:10 <_glx_> talltyler: well it's hard to fix when nobody can access the tools
20:06:34 <kaji_kaede> peter1138: Hopefully this release candidate doesn't have issues that justify making a fourth :>
20:09:11 <peter1138> Ah, I kinda consider it a success when people find bugs in RCs.
20:09:35 <talltyler> Better than the actual release, yeah 🙂
20:11:03 <peter1138> Point-releases :)
20:12:48 <xarick> _glx_: this fix works! <https://github.com/OpenTTD/OpenTTD/commit/5d702a96d6f17b74aa0f765ab368b386adf1c277>
20:12:48 <xarick> no more duplicated crash log <https://github.com/OpenTTD/OpenTTD/actions/runs/20372254999/job/58541494434>
20:13:40 <_glx_> I already knew it was working
20:22:49 *** _auxilian has joined #openttd
20:22:49 <_auxilian> How long should I expect reviews on my prs to take? It got an immediate review two months ago but once I fixed it there were no more comments. I'm not trying to rush anything, I'm just curious.
20:23:09 <xarick> https://cdn.discordapp.com/attachments/1008473233844097104/1452033604698771536/image.png?ex=6948572c&is=694705ac&hm=d5e3557c06e9b5898e0d60a030e352fa1c492181526c0581bcc342b9ec91c940&
20:23:09 <xarick> _jgr_: looks like it's 48, double that, 96 bytes per item
20:24:32 *** MinchinWeb[m] has quit IRC (Ping timeout: 480 seconds)
20:25:22 *** MinchinWeb[m] has joined #openttd
20:25:47 <xarick> https://cdn.discordapp.com/attachments/1008473233844097104/1452034267684012102/image.png?ex=694857ca&is=6947064a&hm=8b6d96091a0dee69c2214604d325a011677a783f4b829ebccca4e99b49ec9ee3&
20:25:47 <xarick> https://cdn.discordapp.com/attachments/1008473233844097104/1452034268002783263/image.png?ex=694857ca&is=6947064a&hm=b6f4c647f7c1f7a004b4c16f718bc486befdd35b50907065d9682a3f9877aee0&
20:28:01 <xarick> 1,820,250,207 / 18,960,632 = 96
20:35:16 <peter1138> Well, there's two containers.
20:42:25 <DorpsGek> [OpenTTD/OpenTTD] SamuXarick commented on pull request #14939: Include ScriptList contents in script memory allocation total https://github.com/OpenTTD/OpenTTD/pull/14939#pullrequestreview-3601274262
20:42:48 <xarick> KEK
20:51:46 <DorpsGek> [OpenTTD/OpenTTD] Rito13 updated pull request #14870: Codefix: Use proper widget type and update widgets properly. https://github.com/OpenTTD/OpenTTD/pull/14870
20:57:04 <Rubidium> _auxilian: not really. There is a bit of recency bias. What PR are you talking about?
20:57:38 <DorpsGek> [OpenTTD/OpenTTD] PeterN commented on pull request #14939: Include ScriptList contents in script memory allocation total https://github.com/OpenTTD/OpenTTD/pull/14939#pullrequestreview-3601285192
21:00:54 <_auxilian> Rubidium: #14709
21:09:29 <DorpsGek> [OpenTTD/OpenTTD] glx22 updated pull request #14943: Change: [Script] Spread load of heavy Script[Tile]List functions over multiple ticks https://github.com/OpenTTD/OpenTTD/pull/14943
21:15:00 <DorpsGek> [OpenTTD/OpenTTD] rubidium42 commented on pull request #14709: Allow the computer to go to sleep when the game is paused https://github.com/OpenTTD/OpenTTD/pull/14709#pullrequestreview-3601303235
21:16:51 <_auxilian> rubidium42viaGitHub: Thank you 👍 I'll fix the issues when I can
21:17:48 *** firepup650 has quit IRC (Ping timeout: 480 seconds)
21:18:46 <DorpsGek> [OpenTTD/OpenTTD] rubidium42 approved pull request #14943: Change: [Script] Spread load of heavy Script[Tile]List functions over multiple ticks https://github.com/OpenTTD/OpenTTD/pull/14943#pullrequestreview-3601309418
21:23:03 <DorpsGek> [OpenTTD/OpenTTD] zephyris opened issue #14945: [Crash]: OpenTTD becomes unresponsive https://github.com/OpenTTD/OpenTTD/issues/14945
21:25:01 <locosage> hangs indeed
21:26:18 <peter1138> Still compiling...
21:26:24 <DorpsGek> [OpenTTD/OpenTTD] glx22 dismissed a review for pull request #14943: Change: [Script] Spread load of heavy Script[Tile]List functions over multiple ticks https://github.com/OpenTTD/OpenTTD/pull/14943#pullrequestreview-3601309418
21:26:27 <DorpsGek> [OpenTTD/OpenTTD] glx22 updated pull request #14943: Change: [Script] Spread load of heavy Script[Tile]List functions over multiple ticks https://github.com/OpenTTD/OpenTTD/pull/14943
21:26:53 <talltyler> Worth testing in some older versions of OpenTTD?
21:27:04 <peter1138> Worth testing before we make an RC ;-)
21:27:32 <_glx_> description looks like an infinite loop
21:28:22 <_glx_> did it happen in RC1 ot RC2 ?
21:28:45 <locosage> did you not "make" RC3?
21:28:49 <locosage> it's on the website
21:28:57 <_zephyris> RC3
21:29:00 <_zephyris> Via Steam
21:29:25 <_glx_> oh hard to test previous RC via steam
21:30:17 <locosage> well, RC2 hangs
21:30:39 <_glx_> so it's not a new thing 🙂
21:30:47 <peter1138> Okay... phew.
21:31:53 <peter1138> Implicit orders.
21:32:03 <_zephyris> I bet it's an old bug, some odd combo of implicit orders and cargodist
21:32:13 <_zephyris> But I haven't managed to work out a minimal reproduction
21:34:38 <peter1138> So it's likely caused by the OrderList changes earlier in the year.
21:37:06 <_glx_> hard to be precise when using pause button in debugger, but it seems to be DeleteOrder
21:37:37 <_glx_> or BeginLoading
21:38:43 <peter1138> The code around there is obviously wrong, looking now.
21:39:12 <peter1138> Tb
21:39:19 <_glx_> yeah the infinite loop is obvious
21:39:28 <peter1138> Taking a span of the orders, then deleting something within it.
21:39:41 <peter1138> And that is definitely my OrderList changes.
21:40:05 <peter1138> 7 months ago. And you find it just after we push a fresh RC :sadface:
21:42:50 <DorpsGek> [OpenTTD/OpenTTD] glx22 commented on pull request #14943: Change: [Script] Spread load of heavy Script[Tile]List functions over multiple ticks https://github.com/OpenTTD/OpenTTD/pull/14943#pullrequestreview-3601329721
21:45:30 <_zephyris> Yeah, unfortunate timing!
21:47:34 <_zephyris> I was just trying to make a fun cargodist screenshot for 2TallTyler...
21:47:39 <_zephyris> Devs shouldn't play the game
21:47:56 <_glx_> it's actually the opposite 😉
21:48:07 <_glx_> we don't play enough to trigger bugs
21:48:42 <_zephyris> Totally, should've made my irony more obvious! 🙂
21:49:53 <_glx_> and I think most of us don't use implicit orders
21:52:11 <_zephyris> Not sure I've ever used the combo of cargodist and implicit orders before
21:52:44 <peter1138> Not sure it's anything to do with cargodist.
21:53:16 <_zephyris> Oh, really? Just the implicit order recalc?
21:53:36 <_glx_> no it's implicit order cleanup
21:53:53 <DorpsGek> [OpenTTD/OpenTTD] PeterN opened pull request #14946: Fix #14945: Hang when deleting implicit orders during vehicle loading. https://github.com/OpenTTD/OpenTTD/pull/14946
21:54:19 <DorpsGek> [OpenTTD/OpenTTD] PeterN updated pull request #14946: Fix #14945: Hang when deleting implicit orders during vehicle loading. https://github.com/OpenTTD/OpenTTD/pull/14946
21:54:25 <peter1138> Whoops, didn't push the correct version :)
21:57:12 *** Wormnest has quit IRC (Quit: Leaving)
21:58:31 <DorpsGek> [OpenTTD/OpenTTD] rubidium42 approved pull request #14943: Change: [Script] Spread load of heavy Script[Tile]List functions over multiple ticks https://github.com/OpenTTD/OpenTTD/pull/14943#pullrequestreview-3601340995
22:00:42 <DorpsGek> [OpenTTD/OpenTTD] glx22 commented on pull request #14946: Fix #14945: Hang when deleting implicit orders during vehicle loading. https://github.com/OpenTTD/OpenTTD/pull/14946#pullrequestreview-3601341866
22:08:02 <xarick> Building openttd takes 3 minutes, I get distracted with youtube. When I'm done it's been 30 minutes :|
22:08:25 <xarick> then i forget what i was doing with that build
22:09:06 <jfkuayue> Were you watching AI generated videos?
22:09:18 <xarick> probably, i can't tell anymore
22:13:35 <DorpsGek> [OpenTTD/OpenTTD] PeterN commented on pull request #14946: Fix #14945: Hang when deleting implicit orders during vehicle loading. https://github.com/OpenTTD/OpenTTD/pull/14946#pullrequestreview-3601347207
22:29:00 <xarick> `SetMapIterValue` nearly ambiguous
22:32:18 <peter1138> Were you testing my version of the memory tracking?
22:32:41 <peter1138> Or I could try writing Squirrel and do it all wrong :p
22:32:54 <xarick> I wasn't
22:33:27 *** WormnestAndroid has quit IRC (Ping timeout: 480 seconds)
22:34:10 *** WormnestAndroid has joined #openttd
22:38:13 *** WormnestAndroid has quit IRC (Read error: Connection reset by peer)
22:40:49 <xarick> annoying const_iterator requirements
22:42:47 <DorpsGek> [OpenTTD/OpenTTD] Rito13 opened pull request #14947: Fix: Company query popups do not update in multiplayer. https://github.com/OpenTTD/OpenTTD/pull/14947
22:44:19 <DorpsGek> [OpenTTD/OpenTTD] Rito13 updated pull request #14947: Fix: Company query popups do not update in multiplayer. https://github.com/OpenTTD/OpenTTD/pull/14947
22:45:55 <xarick> what's the difference between `typedef` and `using`
22:46:38 <xarick> typedef allows me using `iterator`, `using` forces me to set up a `const_iterator`. Other than that...
22:46:52 *** WormnestAndroid has joined #openttd
22:50:12 <andythenorth> naptime?
22:50:36 <xarick> gah, im so going back to typedef...
22:50:40 <rito12_51026> xarick: https://stackoverflow.com/a/62196340
22:55:39 <xarick> i can't be bothered to implement a const_iterator atm
22:55:45 <xarick> going back to typedef
22:56:38 <xarick> oh, nevermind, there were no more conflicts out of 90 commits
22:56:44 <xarick> maybe i'll implement const_iterator
23:06:50 <talltyler> Heh, I just realized we released 15.0-beta1 on Christmas Eve of last year. Longest release cycle ever. 😄
23:12:34 <LordAro> lol woops
23:18:28 *** gelignite has quit IRC ()
23:23:20 <_auxilian> rubidium42viaGitHub: Any chance I could get a little help with this?
23:23:38 <_auxilian> I have an updated master but `git rebase -i master` doesn't have the commits I wrote.
23:24:01 <_auxilian> I'm trying to rebase to remove all the merge commits
23:24:14 <_auxilian> But there's, like, 1200 commits the merge added
23:25:20 <_auxilian> Am I using the rebase wrong?
23:28:17 <talltyler> Should be upstream/master, assuming you’ve set OpenTTD as your remote (and named it upstream as the contributing guide suggests)
23:28:36 <talltyler> You’ll need to fetch upstream before you rebase, too
23:33:20 <_auxilian> It just says `noop` in the rebase file?
23:34:28 <_auxilian> It's trying to rebase the most recent master commit onto itself
23:34:29 <_auxilian> Despite me running it from my branch
23:35:06 <_auxilian> Is it because master is merged into my branch?
23:35:26 <_auxilian> I think I messed this up 😅 sorry
23:37:04 <DorpsGek> [OpenTTD/OpenTTD] glx22 merged pull request #14943: Change: [Script] Spread load of heavy Script[Tile]List functions over multiple ticks https://github.com/OpenTTD/OpenTTD/pull/14943
23:41:33 <_jgr_> _auxilian: You may want to use the `--onto` option for git rebase
23:43:04 <_jgr_> Starting with HEAD at your new commits you can do a `git rebase [parent commit after yours] --onto master`
23:43:32 <_auxilian> Is there an easy way to find thst parent commit without scrolling through hundreds of pages of `git log`?
23:43:38 <_auxilian> It was two months ago...
23:43:51 <_auxilian> Wait github has the commit hash
23:44:26 <_jgr_> If you've got gitk installed that's usually the easiest way to work out what is going
23:45:16 <_glx_> usually `git fetch upstream` then `git rebase upstream/master` is enough
23:49:51 <_auxilian> I screwed something up irreparably. I'm just going to restart.
23:52:54 <_jgr_> How many commits are actually yours?
23:53:39 <_glx_> 5 it seems
23:54:49 <_jgr_> That is few enough that you could cherry-pick each of them and not worry about complicated rebases
23:55:09 <_auxilian> Wait I just made a new branch and retyped them
23:55:13 <_glx_> I just fetched your branch and tried the usual fetch upstream followed by rebase, everything went smoothly
23:59:49 <DorpsGek> [OpenTTD/OpenTTD] mrixner opened pull request #14948: Fix #12937: Allow the computer to go to sleep while the game is paused https://github.com/OpenTTD/OpenTTD/pull/14948
continue to next day ⏵
