IRC logs for #openttd on OFTC at 2016-10-30
⏴ go to previous day
00:23:58 *** Nothing4You has joined #openttd
00:30:19 *** LordAro has joined #openttd
00:39:35 *** welshdragon has joined #openttd
00:52:06 *** welshdragon has joined #openttd
00:55:15 *** Sirenia has joined #openttd
01:03:30 *** TinoDidriksen has joined #openttd
01:43:05 *** behalebabo has joined #openttd
01:46:16 *** ConductorCat has joined #openttd
01:51:48 *** XeryusTC has joined #openttd
02:02:54 *** goodger has joined #openttd
02:20:52 *** manjaro has joined #openttd
02:41:51 *** innocenat has joined #openttd
02:46:52 *** DorpsGek has joined #openttd
02:46:52 *** ChanServ sets mode: +o DorpsGek
03:24:40 *** welshdragon has joined #openttd
03:38:07 *** mikegrb has joined #openttd
04:08:18 *** planetmaker has joined #openttd
04:08:19 *** ChanServ sets mode: +o planetmaker
04:11:50 *** Alkel_U3 has joined #openttd
04:20:20 *** lastmikoi has joined #openttd
04:39:03 *** Clockworker has joined #openttd
04:50:55 *** jonty-comp has joined #openttd
05:14:42 *** Webster has joined #openttd
05:26:09 *** theholyduck has joined #openttd
05:42:45 *** LadyHawk has joined #openttd
05:53:55 *** Antheus has joined #openttd
06:53:11 *** luaduck has joined #openttd
07:05:40 *** sla_ro|master has joined #openttd
07:17:11 *** andythenorth has joined #openttd
07:18:46 *** Alberth has joined #openttd
07:18:46 *** ChanServ sets mode: +o Alberth
07:18:54 *** Extrems has joined #openttd
07:29:08 *** Sheogorath has joined #openttd
08:28:26 *** zwamkat has joined #openttd
08:32:07 <Wolf01> I got up in time to feel the last earthquake :|
08:38:28 * andythenorth is patching nml for tramtypes
08:38:38 <andythenorth> but it’s a huge copy-paste patch of roadtypes
08:39:02 <andythenorth> ~100% duplication, except for maybe an ID or two
08:39:18 <Wolf01> Move same code in functions?
08:39:28 <Wolf01> If there are "functions"
08:39:36 <andythenorth> it’s just a python app
08:39:52 <andythenorth> but it’s slightly magic, becuase it’s a compile
08:40:16 *** Progman has joined #openttd
08:40:17 <Wolf01> Better keeping everything separate then, so it's easy to track bugs
08:41:44 <andythenorth> at least copy-paste requires no skill
08:42:21 <andythenorth> and I have a whole extra hour to do it in
08:50:44 <andythenorth> all it has to do is substitute a different feature ID when writing out the grf
08:50:59 <andythenorth> seems to be a lot of duplication to change a single byte
08:51:28 <andythenorth> but making it conditional on [something] might cause failures, dunno :|
08:54:06 <Alberth> in theory, you can write the optimal code the first time
08:54:37 <Alberth> in practice, you first figure out how it works and what you must do/change to make it work
08:54:40 <andythenorth> concerned I might get colliding data structures
08:54:50 <andythenorth> the parser might build structures for ‘roadtype’
08:55:00 <andythenorth> and they’d collide with ‘tramtype'
08:55:06 <Alberth> and then you write it all again a second or third time for good code
08:55:36 <andythenorth> this is tending to convince me I should just copy-paste the existing code :)
08:56:10 <Alberth> if you don't need to change anything, you might just as easily call the existing code :)
08:56:32 <Alberth> and make a duplicate when things do need to be changed
08:56:56 <Alberth> no point in making more mess you have to sort out later than needed
08:57:55 <andythenorth> in this case, I think the mess comes in the other way, from trying to unify classes and functions
08:58:05 <andythenorth> the copy-paste is clean
08:58:20 <andythenorth> but I’m worried that no-one will review it, because it will look like a big patch
08:59:02 <Alberth> lots of duplicate code is not something you want to add to the compiler
09:00:15 <Alberth> as it makes any future maintenance or extensions a big mess
09:00:50 <andythenorth> I’m unclear atm on the goal
09:00:51 <Alberth> so it needs refactoring to better code
09:01:03 <Alberth> as I said, first make it work
09:01:04 <andythenorth> nml has a pretty clear stance on NewGRF features
09:01:19 <andythenorth> it doesn’t try to unify any code across features, except the most basic stuff
09:01:30 <andythenorth> i.e. common language structures
09:01:37 <Alberth> it's very much newgrf spec driven, I think
09:01:39 <andythenorth> each feature has self-contained code for what it needs
09:02:07 <andythenorth> so extension is safe, because no surprises
09:02:20 <andythenorth> tramtypes and roadtypes are being added as separate features
09:02:22 <andythenorth> but they’re identical
09:02:35 <andythenorth> they’re only being split for internal OpenTTD reasons, not newgrf spec reasons
09:02:57 <Alberth> nml follows newgrf specs afaik
09:03:54 <Alberth> ie it generates something that is newgrf compliant, it doesn't care about openttd
09:04:30 <andythenorth> that suggests again to copy-paste everything
09:04:38 <andythenorth> because they’re separate features under the spec
09:05:00 <andythenorth> they just happen to be identical
09:06:56 <andythenorth> I will see how vehicles do it wrt shared code versus duplicated
09:07:36 *** Lejving has joined #openttd
09:15:32 *** Tharbakim has joined #openttd
09:16:49 <andythenorth> some of the ‘duplication’ would actually be the declaring of properties for the feature
09:17:01 <andythenorth> which are identical - by coincidence, not by design
09:17:27 <andythenorth> vehicles declare properties and such separately
09:17:46 <andythenorth> even where the values are identical
09:27:50 <Wolf01> I think that to avoid duplication you need to deduplicate things which do the exact same thing, doesn't matter if for trains or rvs or road or industry
09:32:38 *** greeter has joined #openttd
10:02:04 *** Stimrol has joined #openttd
10:10:45 <andythenorth> Wolf01: there are separate tables for road and tram labels?
10:11:13 <Wolf01> Yes, they are separate
10:11:57 <Wolf01> I think you can define the "ROAD" label even for tram
10:13:15 <Wolf01> I don't know how the function which finds by label will behave
10:14:54 <andythenorth> we’ll find out :P
10:15:12 <andythenorth> I could define ROAD for railtype as well :)
10:15:41 <andythenorth> seems like road and tram get 100% separated for data structures
10:29:08 <andythenorth> something for V :)
10:31:26 <Eddi|zuHause> <Wolf01> It's like suing lego because they started producing your moc <-- that's totally a legitimate thing to do...
10:33:20 <Wolf01> Eddi, ideas website clearly states you give all rights to lego when you post it there, that already happened with the Ghostbuster's HQ and lego just sent a preview set to the original creator because even if they didn't accept the submission they produced the exact same thing
10:34:24 <Wolf01> I don't know how the story is now with pepaquin's Johnny 5, he's selling the instructions on bricklink after it didn't pass the review process
10:34:33 <Wolf01> I think lego could sue him
10:38:23 <Alberth> brickland project should get a home, so people aren't tempted to again make green-ish ground plates, and never get anywhere
10:39:47 <Eddi|zuHause> Wolf01: there's always some doubt whether clauses like "you lose all rights" are even valid in a single-sided contract like that
10:40:58 <Eddi|zuHause> Wolf01: at least in german law, any such doubt will be interpreted in favour of the person that didn't draft the contract
10:43:28 <Wolf01> Yes, I attached the ldr file to the topic
10:44:01 <andythenorth> Alberth: there was a queue of stuff to do :)
10:44:31 <Alberth> great! now to find time to play with the new gadgets.... :)
10:46:57 <Alberth> in particular as it's such nice weather outside :)
10:49:03 <andythenorth> Wolf01: presumably NRT fork doesn’t yet read tramtypes on feature 0x13?
10:49:12 <andythenorth> otoh, my grf isn’t crashing the game
10:50:35 <andythenorth> grf might be borked
10:51:28 *** ToBeFree has joined #openttd
10:52:14 <andythenorth> bytecode is always a bit hard to check
10:58:08 *** frosch123 has joined #openttd
10:59:06 *** Keridos has joined #openttd
11:01:02 <andythenorth> Wolf01: where do I find the code for loading newgrf roadtypes?
11:01:19 <andythenorth> I tried searching, but I get a lot of results for ‘roadtype’ :P
11:03:10 <andythenorth> I am trying to see where it knows that roadtype is feature 0x12
11:03:32 <Wolf01> What the actual fuck.... Argument const RoadTypeInfo * is incompatible with parameter RoadTypeInfo *
11:03:47 <Wolf01> Fuck constants and pointers
11:04:06 <andythenorth> frosch123: tramtype is now feature 0x13 :P
11:04:17 <andythenorth> that was my understanding of what to do last time it was discussed
11:09:11 <Wolf01> andythenorth, the grf works
11:09:18 <Wolf01> It replaces the base tram
11:09:46 <andythenorth> I have no fricking trams loaded in this test game :P
11:09:50 * andythenorth forgot about that
11:10:37 <andythenorth> ok I’ll add a second type to the example now
11:11:22 <Wolf01> Let me commit some changes for sprite handling, maybe you can change sprites too
11:16:43 <andythenorth> trying to get second type to show
11:17:32 <andythenorth> can only get one tramtype currently
11:18:04 <Wolf01> I copy/pasted the roadtype, it should work the same way
11:20:02 <andythenorth> multiple roads I can add
11:20:12 <andythenorth> is there still code checking for vehicles with tram type?
11:20:53 <andythenorth> I’ll post a grf in a minute
11:20:59 <Wolf01> But it enables the base type not the sub type, so every sub type should be enabled
11:22:29 *** welshdragon has joined #openttd
11:25:15 <andythenorth> default road, two extra roads, default tram, two extra trams
11:25:27 <andythenorth> I only see one tram, the last defined
11:31:00 <Wolf01> It seem that everything uses roadtype reserve info instead of tramtype reserve info
11:31:58 <Wolf01> Roadtypes have grf spec feature 18, Tramtypes have 19
11:32:53 <andythenorth> must be an offset from newgrf spec, it’s 0x12 and 0x13 there :)
11:33:01 <Wolf01> Oh, wait, I could have missed a check
11:37:27 <Wolf01> I think even spritegroups might work
11:38:19 *** gelignite has joined #openttd
11:38:50 <andythenorth> Wolf01: awesome, that works :D
11:39:15 <Wolf01> You can define 16 roadbits as an array (I don't know if it should be split up to 16 variables as rail bits are), slope offset, oneway base, excavation sprites
11:39:34 <andythenorth> well maybe graphics next?
11:39:38 <andythenorth> or vehicle compatibility? o-O
11:39:47 <Wolf01> I would go with graphics
11:40:18 <Wolf01> Vehicles are a different beast, try to keep the thing contained :P
11:41:12 <Wolf01> Once we'll have a full working roadtytpes and a full patch against trunk, we'll revise it, clean and submit, then vehicles
11:41:17 <andythenorth> I _think_ they’re probaly quite easy, but yeah
11:41:43 <andythenorth> so currently the grf is encoding some sprites, but not sure what
11:41:52 *** LongyanG has joined #openttd
11:42:00 <Wolf01> Also it was requested to add a "cities don't build houses along this roadtype"-flag
11:42:18 <andythenorth> grf has only UI sprites it seems
11:42:36 <Wolf01> Which don't seem to work :|
11:45:44 <Wolf01> I think we'll need to start to look for serious help here, because I'm reaching my limit too
11:46:03 <andythenorth> maybe it’s quak-shaped
11:47:49 <andythenorth> ok the test grf does encode some rail sprites (for legacy reasons, it’s copied from a railtype grf)
11:49:34 <andythenorth> Wolf01: road_rti->base_sprites?
11:49:40 <andythenorth> there’s some support for sprites already?
11:50:09 <Wolf01> <Wolf01> You can define 16 roadbits as an array (I don't know if it should be split up to 16 variables as rail bits are), slope offset, oneway base, excavation sprites <-
11:51:26 <Wolf01> I think I'll remove slope offset as it should only be used to load base sprites in orig_roadtypes
11:51:37 <Wolf01> And add 4 slope variables
11:52:14 <frosch123> andythenorth: Wolf01 18=0x12, 19=0x13
11:52:45 <Wolf01> Yes, I know, I'm only lazy to do the conversion as VS tells me the decimal value
11:54:05 <Wolf01> I was only surprised to find trams in the road code (0x12) while they should have been in the tram code
11:58:27 <andythenorth> Wolf01: so what’s the goal?
11:58:34 <andythenorth> get some sprites on the screen?
11:59:00 <Wolf01> Code and spec might change a lot with this goal
11:59:10 *** ChanServ sets mode: +v tokai
12:04:04 <Wolf01> Do you know what is missing on the settings? The real name of the setting...
12:04:22 <Wolf01> Now I have to look up what to change with rcon
12:04:24 *** tycoondemon has joined #openttd
12:04:37 <frosch123> yay, i managed to update git checkout
12:04:54 <frosch123> million of warnings :p
12:05:36 <Wolf01> Also why tab suggest city names in chat?
12:06:10 <andythenorth> although would be better if clickable :P
12:07:38 <andythenorth> is it Sariel’s hamster?
12:08:27 <Wolf01> He sent me a phone photo, because taking screenshots is too mainstream
12:09:30 <frosch123> my customers always do that
12:10:04 <frosch123> some also use the regular print function of the application and then scan the paper result to email
12:10:54 * andythenorth should draw some roads or something
12:10:59 <frosch123> no, just modern copy machines being able to send emails
12:11:00 <andythenorth> must be lots of GPL road sets
12:11:27 <frosch123> at least they add handwriting notes to the latter to point out the issue
12:11:34 <Wolf01> How do I change cargodist with rcon?
12:11:36 <frosch123> it's better than an uncommented screenshot :)
12:12:42 <Wolf01> andythenorth, start by using *cough*toyland*burp* sprites
12:16:58 <Wolf01> Oh, I finally found the setting
12:23:38 <frosch123> let's see whether it actually starts :p
12:30:11 *** JacobD88 has joined #openttd
12:31:32 <frosch123> i have 3 raodtypes in the menu
12:32:14 <frosch123> what kind of sprites does the grf add for them?
12:32:29 <andythenorth> it’s a copy of the railtype sprites in nml examples
12:32:50 <andythenorth> obviously junk for a real grf, but anything will do to start with :P
12:34:03 <Wolf01> Ok, we should manage to have 16 sprites on the first line, and load them into the array
12:34:07 <andythenorth> but the interpretation of spec within nml might be inappropriate currently, as it’s just straight copy of railtypes
12:40:15 <andythenorth> frosch123: are walkways in the drawing order list?
12:40:32 <frosch123> at the bottom, via baseset
13:02:21 *** JacobD88 has joined #openttd
13:05:01 *** welshdragon has joined #openttd
13:08:27 <frosch123> @calc 0x546 + 15 - 19
13:09:06 <Wolf01> Eddi already did the counts, I'll search it
13:13:27 <frosch123> hmm, so do we want to keep the hillarious ordering of the baseset
13:13:36 <frosch123> or change it to something intuitive?
13:14:16 <Eddi|zuHause> what would that solve?
13:14:27 <frosch123> the rail ones is just as bonkers
13:14:30 <Wolf01> Let's do the intuitive way, with a converter for the hardcoded ones
13:14:32 <frosch123> so, i guess keep the baseset ordering
13:29:05 <Eddi|zuHause> i think keeping the order makes it easier for a "dumb" person to just copy the baseset and overdraw it
13:29:39 <Eddi|zuHause> being consistent might be more valuable than an intrinsic logic behind it
13:31:05 <Eddi|zuHause> also, it's "hilarious", has nothing to do with "hillary" :p
13:34:18 <frosch123> it compiles, but i have no custom graphics
13:35:05 <Eddi|zuHause> there are about 5 basesets you could scramble together
13:38:24 <frosch123> andythenorth: does the grf only provide bridge graphics?
13:38:31 <frosch123> or it the loading borked?
13:41:27 <frosch123> looks like the loading is borked
13:46:30 *** sim-al2 has joined #openttd
13:54:37 *** Eddi|zuHause has joined #openttd
13:54:46 <frosch123> do i need to register to github to transmit the stuff to you?
13:55:16 <Wolf01> Mmmh, my friend is still able to run trains without brake wagon
14:00:22 <andythenorth> frosch123: one of us can paste them in, or you can fork the repo on github and make pull requests...
14:00:32 <andythenorth> Wolf01: do I have commit rights on your repo? o_O
14:00:47 <Wolf01> No, I don't even know how it works
14:01:08 <Wolf01> I would use yours as hub
14:06:35 * andythenorth has to do chores
14:07:55 <andythenorth> Wolf01: could you apply the patches from frosch123? o_O
14:09:09 <frosch123> "What are you interested in?" <- does github ban me, if i enter "mercurial"?
14:09:25 <asie> try entering "subversion"
14:09:47 <andythenorth> github is a bit weird
14:10:00 <andythenorth> and the fork->pull request workflow is weird for a small group
14:10:08 <andythenorth> but it’s free and convenient :P
14:14:22 <andythenorth> frosch123: got a username? o_O
14:14:43 <frosch123> without the number it was taken
14:15:12 <andythenorth> I just invited you to the NotRoadTypes repo
14:15:19 <Wolf01> Always happen with animals :P
14:17:38 <andythenorth> might need a new branch to pull Wolf’s current branch in
14:17:44 <andythenorth> kids are fighting :P
14:19:10 *** markjones has joined #openttd
14:20:26 <Eddi|zuHause> in my experience, when kids are fighting, the older one wins...
14:20:32 <Eddi|zuHause> nothing you can do about it
14:21:09 <frosch123> were you the younger one?
14:21:19 <Eddi|zuHause> some of the time...
14:37:31 *** argoneus has joined #openttd
14:39:02 *** Alberth has joined #openttd
14:39:02 *** ChanServ sets mode: +o Alberth
14:41:45 *** HerzogDeXtEr has joined #openttd
14:50:06 <frosch123> some grf with actual graphics, so you can tell what is going on?
14:50:39 <frosch123> purr-style red/green/blue roads and trams should be possible
14:54:17 <Wolf01> I was able to patch my working copy, but I should pull from your repo instead
14:54:24 *** JacobD88 has joined #openttd
14:56:02 <Alberth> :o congratulations to you and andy
14:59:35 <Ethereal_Whisper> Wolf01, I made a mistake again and have almost 1000 trains what do I do
14:59:50 <Wolf01> Start from scratch? :O
15:08:19 <Alberth> send all to the depot?
15:09:07 <Wolf01> Load in scenario editor and remove the companies :D
15:14:02 *** OsteHovel has joined #openttd
15:22:02 *** welshdragon has joined #openttd
15:34:52 *** Cursarion has joined #openttd
15:54:24 *** Myhorta has joined #openttd
16:23:16 <andythenorth> so we’re keeping the UI branch separate, yes?
16:24:51 <Wolf01> We could merge it if you want
16:26:38 <andythenorth> I am going to tidy up branches
16:28:30 *** LadyHawk has joined #openttd
16:29:28 <andythenorth> Wolf01: we call this branch ‘newgrf’?
16:29:43 <andythenorth> or something else?
16:30:41 <Wolf01> Full patch will be in master
16:31:34 <andythenorth> in my repo, ‘dev’ contains ‘gui’ :|
16:32:09 <andythenorth> I could revert it, but reverting merges can have surprising results :)
16:44:06 <andythenorth> I made a road-and-tram-types branch
16:44:14 <andythenorth> and merged your dev branch in Wolf01
16:44:55 * andythenorth lives in a world where branch names match ticket numbers
16:45:00 <andythenorth> don’t usually have to think about the name :D
16:48:11 <Wolf01> I would have merged in my master dev+gui, and then you could pull my master to one of your branches
16:48:37 <andythenorth> so frosch123 have you got patches? o_O
16:49:35 <frosch123> i didn't know where to push :)
16:49:52 <Wolf01> road-and-tram-types branch <- seem a god idea
16:50:34 <andythenorth> Wolf01: pull that branch into your fork?
16:50:49 <andythenorth> the fork stuff is overhead in github :|
16:51:33 <Wolf01> I think I made a mistake with the first fork, I forked the entire repo instead of master
16:51:47 <andythenorth> I think that’s how it works
16:51:57 <andythenorth> but tbh, you could just work in my repo, but in a branch
16:52:06 <Wolf01> So we now have different things in same branches and I don't even know how to push/pull :D
16:52:17 <andythenorth> for small number of people, one repo, and many branches works well
16:52:54 <Wolf01> Also we should sync with trunk
16:53:11 <andythenorth> I’ll figure that out
16:58:32 <andythenorth> Wolf01: looks like trunk conflicts with the NRT gui branch
16:58:37 <andythenorth> saveload code changed
16:58:53 <andythenorth> can probably fix that later tbh
16:59:12 <Wolf01> I'm trying to figure out the merge
16:59:47 <andythenorth> frosch123: are all 3 patches one commit, or separate?
16:59:48 <Wolf01> base (yours) -> head (mine)?
16:59:55 <frosch123> andythenorth: separate :)
17:00:06 <andythenorth> are they applied in the order you pasted them at 3.49?
17:00:11 <frosch123> first one fixes warnings
17:00:15 <frosch123> the rest have messages in them
17:00:28 <frosch123> andythenorth: yes, but i guess they don't conflict
17:01:56 *** welshdragon has joined #openttd
17:03:28 <Wolf01> Bah, why is github the reverse of how a decent VCS should work?
17:03:37 <Wolf01> Ignore my pull request
17:04:10 <andythenorth> Wolf01: I don’t really understand github :)
17:04:15 <andythenorth> or any git gui tools
17:04:20 <andythenorth> I just shell git
17:04:49 <andythenorth> just clone the NRT main repo and work in that, our lives will be much simpler :)
17:05:01 *** Myhorta has joined #openttd
17:05:31 <Wolf01> Nice, I can't merge your changes int mine, it won't let me do that
17:08:02 *** sla_ro|master has joined #openttd
17:08:43 <Wolf01> Wolfolo wants to merge 45 commits into Wolfolo:master from andythenorth:master ... then ... Add more commits by pushing to the master branch on andythenorth/NotRoadTypes.
17:09:11 <andythenorth> that looks right
17:09:27 <andythenorth> I have never done it this way before, but let’s see
17:09:50 <Wolf01> But I'm pushing into mine, why it says yours? Because it's a fork?
17:10:04 <andythenorth> it’s just explaining how to get more commits in the PR
17:10:21 <andythenorth> if I pushed more to master, this pull request might get bigger maybe
17:10:34 <andythenorth> this won’t modify the andythenorth repo
17:10:44 <andythenorth> if it does, I’ll go buy a hat and eat it
17:10:49 <Wolf01> Github is a total mess
17:11:13 <andythenorth> even if tried (which would be weird) it can’t modify andythenorth repo, becuase there’s no diff
17:11:34 <andythenorth> all the commits in your master are already in mine
17:11:50 <andythenorth> git isn’t magic, just fiddly sometimes :)
17:13:49 <andythenorth> frosch123: I like the construction sprites for road :D
17:23:11 <Wolf01> How do I select only the last 3 revisions to merge?
17:23:42 <andythenorth> which fork:branch on each side?
17:23:57 <andythenorth> usually that would be cherry-picked using the cherry-pick tool
17:24:04 <Wolf01> Your road+tram to my master
17:24:59 <Wolf01> If I do it as it tells, I'll revert trunk sync
17:25:32 <Wolf01> Maybe I should have done it later
17:25:46 <andythenorth> nah it will be fine, just needs a bit of care
17:26:58 <andythenorth> problem is, your dev branch is in road-and-tram-types
17:27:10 <andythenorth> so that will get merged to your master if we just merge last 5 commits
17:27:21 <Wolf01> Ok, I'll do it with SVN
17:28:40 <andythenorth> I could do it if I had access to your repo
17:28:40 <Wolf01> Oh... SVN relies on rev number...
17:28:50 <andythenorth> but I can’t push back to that
17:29:36 <Wolf01> I think I sent you an invite
17:30:09 <Wolf01> I only need the frosch commits
17:32:15 <andythenorth> Wolf01: these into your master branch, yes?
17:32:46 <Wolf01> I'll discard dev and guy once I'll merge the gui one
17:34:44 <andythenorth> Wolf01: pushed one of them
17:35:46 <andythenorth> Wolf01: all there now
17:37:01 <Wolf01> Github doesn't work well with svn... it timeouts everytime when I try to get the commits history of my branches to do a merge :|
17:37:35 <andythenorth> I just did it with shell
17:37:49 <andythenorth> git hashes are unique across repos, afaik
17:38:04 <andythenorth> so you can cherry-pick individual commits in from another remote source
17:38:23 <Wolf01> Yes, that's why git works between repos and svn doesn't
17:38:38 <Wolf01> But with svn you just do a patch
17:39:42 <andythenorth> before I learnt to cherry-pick, I was doing patch > foo.diff
17:41:37 *** welshdragon has joined #openttd
17:43:05 * Wolf01 is still waiting for the revision history...
17:45:43 <Wolf01> Tell it to tortoise svn :D
17:46:15 *** Supercheese has joined #openttd
17:47:10 <Wolf01> No, tortoise svn, I don't even have git installed
17:47:18 <Wolf01> I must use bash for git
17:55:00 <Wolf01> Oh, at least not it managed to close the window
17:55:03 * andythenorth must ISO 270001 for a bit
18:04:04 <Wolf01> 9MB transferred of what... the diff was 120kb
18:07:05 <Wolf01> Bah, going out to dine, I'll leave it running... yes, it's still merging 1 revision
18:10:10 <andythenorth> I wonder what it’s doing
18:10:28 <andythenorth> I added andythenorth repo as a git remote so I could cherrypick from it
18:10:38 <andythenorth> but git doesn’t need to copy all of the data for that, as it has it already
18:10:44 <Wolf01> And it's a dry-run, so I'll have to run it again
18:10:45 <andythenorth> would make no sense :P
18:11:19 <Wolf01> It's downloading the entire source?
18:11:49 <Wolf01> Btw, got to go, see you later
18:14:48 <frosch123> 46.09 MiB was the whole clone for me :p
18:18:55 *** ccfreak2k has joined #openttd
18:22:01 <andythenorth> frosch123: if I get this ISO stuff done, I’ll draw some rainbow road style sprites
18:22:08 <andythenorth> then we can have mario-kart trams
18:24:22 *** m1cr0man has joined #openttd
18:29:40 <DorpsGek> Commit by frosch :: r27670 /trunk/src (13 files in 7 dirs) (2016-10-30 18:29:33 +0100 )
18:29:41 <DorpsGek> -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
18:37:02 <DorpsGek> Commit by frosch :: r27671 /trunk/src (toolbar_gui.cpp widgets/toolbar_widget.h) (2016-10-30 18:36:57 +0100 )
18:37:03 <DorpsGek> -Codechange: Replace magic numbers in the toolbar with the already existing WID_TN_xxx. (Wolf01)
19:04:26 <DorpsGek> Commit by frosch :: r27672 trunk/src/vehicle_gui.cpp (2016-10-30 19:04:20 +0100 )
19:04:27 <DorpsGek> -Doc [FS#6489]: Fix comment. (Yho)
19:23:01 <DorpsGek> Commit by michi_cc :: r27673 /trunk/src (7 files in 5 dirs) (2016-10-30 19:22:55 +0100 )
19:23:02 <DorpsGek> -Add: [Win32] Thread names for windows debuggers.
19:30:24 <andythenorth> I shouldn’t get Sierra then
19:30:39 <Snail> well, you can still use the precompiled version
19:30:51 <Snail> and I still code my own set (through “make”)
19:31:43 <Snail> and frankly, the new OS’s graphics totally sucks
19:32:11 <Snail> it’s like a dumbed-down version of Mavericks… all the icons and windows are so simplistic, not to say plain ugly
19:32:22 <Snail> well, it changed a lot from Mavericks
19:32:28 <Snail> don’t know about the newer OS
19:32:40 <andythenorth> ah, I got Yosemite a while ago
19:32:42 <andythenorth> you get used to it
19:32:43 <goodger> it got turned into a ten-minute photoshop mockup of itself
19:32:47 <andythenorth> got a retina screen Snail ?
19:38:09 <Snail> yes I do… I have a 2013 macbook pro
19:38:37 <Snail> I think you can get used to it, but I still think Mavericks was just the best with its nice 3d effects
19:40:12 <andythenorth> I got used to it quick :)
20:25:17 <andythenorth> Snail: you have up-to-date XCode, right?
20:25:37 <Snail> yep, I updated it right after installing the new OS
20:25:51 <andythenorth> what does /usr/bin/clang --version
20:27:01 <Snail> Apple LLVM version 8.0.0 (clang-800.0.38)
20:27:02 <Snail> Target: x86_64-apple-darwin16.0.0
20:27:04 <Snail> InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
20:27:14 <DorpsGek> Commit by michi_cc :: r27674 trunk/src/os/windows/win32.h (2016-10-30 20:27:07 +0100 )
20:27:15 <DorpsGek> -Fix (r27673): Mingw...
20:29:57 <Snail> yep… no idea why it’s giving me the error message
20:30:04 <andythenorth> Snail: FWIW, CC=/usr/bin/clang ./configure works for me on Yosemite :|
20:31:00 <Snail> If I do “cd /usr/bin/clang"
20:31:05 <Snail> it gives me “not a directory"
20:31:15 <andythenorth> it’s probably a binary
20:31:31 <Snail> but if I do “ls”, it does list “clang” ...
20:31:39 <Snail> I mean it’s in the list
20:31:56 <Snail> no idea why I can’t go there
20:33:17 <Alberth> does the ourtput start with a "-" or a "d" ?
20:33:27 <Alberth> for comparison: ls -l /usr
20:34:02 <Alberth> "-" means it's a normal file
20:36:40 *** Defaultti has joined #openttd
20:37:16 <Snail> -rwxr-xr-x 1 root wheel 18240 Sep 13 20:57 /usr/bin/clang
20:37:32 <Snail> Alberth: that’s the output of “ls -l /usr/bin/clang”
20:38:06 <Alberth> it starts with a - so it's a file
20:38:28 <Alberth> why do you want to cd into a file?
20:38:49 <Snail> ah ok, I thought it was a directory
20:39:50 <Snail> so if I go to /usr/bin and I type “clang ./configure”, this the output I get:
20:39:51 <Snail> clang: error: no such file or directory: './configure'
20:39:52 <Snail> clang: error: no input files
20:40:23 <Alberth> you can use ls -F then you get / at the end of a directory name, and * at the end of an executable program
20:40:34 <Alberth> the "CC=" is essential
20:41:08 <Alberth> FOO=bar program means "set environment var FOO to "bar", and run "program"
20:41:41 <Alberth> no spaces in FOO=bar or the shell breaks it into pieces
20:42:16 <Alberth> and yeah, I would hope you don't have the configure file in /usr/bin :)
20:42:19 <Snail> ok, so I went into /usr/bin and tried "CC=clang ./configure"
20:42:55 <Snail> well, what made me perplex, is that “CC=/usr/bin/clang ./configure” works for Andy on Yosemite
20:42:59 <Snail> but not for me on Sierra
20:43:36 <Alberth> "./foo" means "in the current directory find 'foo', and run it"
20:45:03 <Alberth> it's a protection that you don't have "." in your path, so you don't run arbitrary programs by accident. Instead you have to explicitly say you want to run the thing in your current directory by prefixing it with "./"
20:45:23 <Alberth> or "./thing" rather :)
20:46:43 <Alberth> does plain ./configure work? (if you are in the directory with the configure file)
20:47:18 <michi_cc> Snail: I suspect you don't have your source checkout in /usr/bin. You need to be in the source directory and reference to clang and not the other way around.
20:47:51 <Snail> Alberth: yes, if I go to the “trunk” directory of a freshly-downloaded openttd (from SVN), ./configure works
20:48:15 <Alberth> ok, so the file itself is fine
20:49:41 <Alberth> the CC=<stuff> doesn't work apparently?
20:50:10 <Alberth> no doubt something insane :p
20:51:07 <Alberth> maybe it doesn't understand the CC=<stuff> prefix
20:51:16 <Snail> is it strange? but I guess it’s the one that shipped with the OS
20:51:21 <Snail> I never actively changed it
20:51:24 <Alberth> try CC=/usr/bin/clang
20:51:47 <Alberth> you don't actually trust Apple to do sane things do you?
20:51:47 <Snail> “CC=/usr/bin/clang: Command not found.”
20:51:59 <Snail> Alberth: you might have a point :)
20:52:06 <Alberth> setenv CC=/usr/bin/clang
20:52:39 <Snail> setenv: Variable name must contain alphanumeric characters.
20:52:51 *** sim-al2 has joined #openttd
20:53:18 <Snail> oh, so “setenv CC/usr/bin/clang"?
20:53:25 <Snail> or “setenv CC /usr/bin/clang"?
20:53:49 <Alberth> (setenv CC /usr/bin/clang ; ./configure )
20:54:00 <Alberth> maybe add a space after (
20:54:12 <michi_cc> stackoverflow suggest the latter, or alternative env CC=/usr/bin/clang ./configure
20:55:01 <Snail> ok it’s doing something
20:55:50 <Snail> it gave me a long output
20:56:13 <Alberth> yep, all the stuff it found and did not find
20:56:23 <Snail> it appears there are no errors. Should I attempt to “make” OTTD now?
20:56:45 <Snail> yeah, worst case, it fails, right
20:56:50 *** welshdragon has joined #openttd
20:56:53 <Snail> ok let me give it a try
20:56:55 <Alberth> although you may be missing some crucial libraries to get it really working
20:57:11 <Alberth> you'll have to read the output more carefully for that
20:58:37 <Alberth> where "really working" means you have screen output, can load arbitrary save games and save them, and have sound
20:59:35 <Snail> I’m getting many warnings, for example: “/roba/ottd2016/trunk/src/fontdetection.cpp:504:21: warning: 'ATSFontIteratorNext' is deprecated: first
20:59:36 <Snail> deprecated in macOS 10.8 [-Wdeprecated-declarations]”
21:00:32 <Snail> AUGraphNodeInfo(graph, node, &desc, &unit);
21:00:46 <Snail> sorry here is the full text
21:00:50 <Snail> AUGraphNodeInfo(graph, node, &desc, &unit);
21:01:01 <Snail> ottd2016/trunk/src/music/cocoa_m.cpp:76:4: error: no matching function for call to 'AUGraphNodeInfo'
21:01:01 <Snail> AUGraphNodeInfo(graph, node, &desc, &unit);
21:01:17 <Snail> Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/AudioToolbox.framework/Headers/AUGraph.h:179:1: note:
21:01:17 <Snail> candidate function not viable: no known conversion from 'ComponentDescription *' to
21:01:18 <Snail> 'AudioComponentDescription * _Nullable' (aka 'AudioComponentDescription *') for 3rd argument
21:01:20 <Snail> AUGraphNodeInfo( AUGraph inGraph,
21:01:36 <Snail> ottd2016/trunk/src/music/cocoa_m.cpp:162:7: error: no matching function for call to
21:01:37 <Snail> 'MusicSequenceFileLoad'
21:01:38 <Snail> if (MusicSequenceFileLoad(_sequence, url, 0, 0) != noErr) {
21:01:47 <Snail> Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/AudioToolbox.framework/Headers/MusicPlayer.h:799:1: note:
21:01:48 <Snail> candidate function not viable: no known conversion from 'int' to 'MusicSequenceFileTypeID' for 3rd
21:01:50 <Snail> MusicSequenceFileLoad (MusicSequence inSequence,
21:01:54 <Snail> looks like something’s wrong with the music?
21:02:06 <Alberth> probably you don't have a sound library
21:02:16 <Alberth> ./configure output should indicate that
21:10:36 <andythenorth> Snail: did you try it with the .configure option from ottd wiki?
21:10:46 <andythenorth> ./configure sorry - it links a different SDK
21:11:10 <andythenorth> LDFLAGS="-stdlib=libstdc++"
21:11:39 <Snail> tried them all. They worked before I upgraded
21:11:48 <Snail> looks like neither works on Sierra
21:11:58 <andythenorth> tried it now that you have the environment var set?
21:13:08 <Snail> so do you suggest —> ./ configure LDFLAGS="-stdlib=libstdc++"
21:14:03 <Snail> think I tried it already, but I’m doing it again
21:18:24 <Wolf01> Ha! Merge error after 60MB
21:18:42 <Wolf01> "Malformed xml: no element found"
21:20:59 <michi_cc> Snail: Try commenting out (add a #) lines 1616, 1621, 1624 of config.lib (i.e. the CFLAGS="$CFLAGS ... lines). If that still doesn't work, I'd suspect that some older API was completely removed while OTTD doesn't support a replacement.
21:21:02 <Wolf01> [18:37:04] <DorpsGek> -Codechange: Replace magic numbers in the toolbar with the already existing WID_TN_xxx. (Wolf01) <- funny, I was trying to merge exactly that
21:22:37 <Snail> michi_cc: I’ll give it a try
21:23:45 <Snail> 1616 —> CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
21:23:58 <Snail> 1621 —> CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
21:24:07 <Snail> 1624 —> CFLAGS="$CFLAGS -mmacosx-version-min=10.4"
21:24:12 <Snail> I’ll comment these three
21:25:35 <michi_cc> Hmm, will probably not help. At least for the lines you quoted in your errors the min version isn't checked.
21:25:39 <Snail> michi_cc: now ./configure gives me an error
21:25:40 <Snail> line 1617: syntax error near unexpected token `else'
21:26:03 <Snail> I think it’s because I’m commenting the only line in the “if-then-else” clause
21:26:27 <Snail> i.e. it becomes meaningless now, because there are no commands in either “if” or “else”
21:26:28 <michi_cc> Yeah, but it won't help anyway I'd think.
21:30:47 <michi_cc> It's coding by guessing tough, might work or might not work (and even if it works, it'll break all older SDKs :)
21:33:02 *** welshdragon has joined #openttd
21:35:34 <andythenorth> michi_cc: I can test on Yosemite in a bit
21:36:08 <michi_cc> That's not old :) 10.5 is old (compile farm old :)
21:36:35 *** umgeher_ has joined #openttd
21:36:50 <andythenorth> I know :) I just don’t have old
21:37:56 *** welshdragon has joined #openttd
21:38:15 <Snail> michi_cc: should I type all that into the terminal window?
21:38:44 <michi_cc> No, it's a diff that you either apply with patch or by hand to the source file.
21:39:41 <Snail> so just run “ diff --git a/src/music/cocoa_m.cpp b/src/music/cocoa_m.cpp “ right?
21:40:07 <Snail> diff: unrecognized option `--git’
21:43:55 <Eddi|zuHause> something makes my clock go wrong, and it's not the summer time shift
21:44:19 <Eddi|zuHause> i put it correctly earlier today, and now it's like 15 minutes off
21:44:19 <andythenorth> Snail: should be
21:44:36 <Snail> we haven’t shifted yet on this side
21:44:48 <andythenorth> but that has failed hunks (on line-endings I think)
21:45:15 <Eddi|zuHause> you can make patch ignore those?
21:45:26 <Snail> 2 out of 2 hunks FAILED -- saving rejects to file src/music/cocoa_m.cpp.rej
21:45:49 *** welshdragon has joined #openttd
21:45:54 <Snail> you need to see what’s in that .rej file?
21:46:20 <andythenorth> I can’t figure out what’s wrong there
21:46:27 * andythenorth doing too many things at once right now :)
21:47:38 <Wolf01> I lost my battle to it
21:48:01 <Eddi|zuHause> i was just about to, when someone sent me some free game i should try
21:48:45 <Wolf01> Oh, I purchased the Talos principle too
21:53:09 <Eddi|zuHause> also, master of orion is on sale, and i was debating whether to get one or the other
21:55:15 <Wolf01> I'm not too much on that genre, but I have some of its derivates
21:59:16 <andythenorth> Snail: I don’t know why those hunks failed
22:01:04 <andythenorth> looks like same failure I got
22:11:18 *** welshdragon has joined #openttd
22:26:31 <andythenorth> music doesn’t play for me in game, but that’s not new
22:28:25 <Snail> should I run configure now?
22:28:50 <andythenorth> I didn’t need to configure
22:30:22 <Snail> I’m getting an incredible number of warnings...
22:31:15 <Snail> all the warnings say, —> unused typedef ‘__ct_assert__’
22:31:40 <Wolf01> Uhm, shit... I broke my working copy beyond any known imagination
22:34:45 <Wolf01> I forgot to update before merge
22:35:03 <andythenorth> you’re using svn as the client?
22:35:06 <Wolf01> Luckily there are only 3 conflicts
22:35:12 <andythenorth> got a mergetool?
22:35:44 <Snail> nope, still get an error
22:36:10 <Snail> ottd2016/trunk/src/video/cocoa/wnd_quartz.mm:115:7: error: use of undeclared identifier
22:36:12 <Snail> if (CMGetSystemProfile(&sysProfile) == noErr) {
22:36:13 <andythenorth> Wolf01: it’s usually ok with git, unlesss 2 parts of the 3 way merge change same code
22:36:19 <Snail> ottd2016/trunk/src/video/cocoa/wnd_quartz.mm:117:4: error: use of undeclared identifier
22:36:20 <Snail> CMCloseProfile(sysProfile);
22:36:21 <andythenorth> then it’s manual unpicking :P
22:37:08 <Wolf01> Thats not a problem even on svn merge, but I got 3 changes of the same code which I need to fix by hand
22:37:40 <andythenorth> no magic for that :)
22:52:39 <Wolf01> Nice, I need to convert a const StringID to WindowDesc*
22:54:59 *** Darksecond has joined #openttd
23:21:47 <michi_cc> Ah, of course, configure manually sets the min version. Change (patched) line 119 of wnd_quartz.mm from MAC_OS_X_VERSION_10_6 to MAC_OS_X_VERSION_10_5
23:32:51 *** Xaroth|Work has joined #openttd
23:41:19 *** Hirundo has joined #openttd
23:47:23 *** michi_cc has joined #openttd
23:47:23 *** ChanServ sets mode: +v michi_cc
continue to next day ⏵
