Times are UTC Toggle Colours
01:00:13 *** LordAro has quit IRC 03:23:23 *** JGR has joined #openttd.dev 03:28:56 *** JGR_ has quit IRC 06:06:28 *** adf88 has joined #openttd.dev 07:36:57 *** LordAro has joined #openttd.dev 07:36:57 *** ChanServ sets mode: +v LordAro 07:46:01 *** LordAro has quit IRC 07:47:44 *** LordAro has joined #openttd.dev 07:47:44 *** ChanServ sets mode: +v LordAro 07:50:17 *** Lord_Aro has joined #openttd.dev 07:51:21 *** LordAro is now known as Guest2639 07:51:21 *** Lord_Aro is now known as LordAro 07:51:41 *** ChanServ sets mode: +v LordAro 07:52:57 *** Guest2639 has quit IRC 08:01:05 *** Supercheese has quit IRC 08:26:53 *** adf88 has quit IRC 09:23:22 *** adf88 has joined #openttd.dev 09:56:06 *** zydeco has joined #openttd.dev 13:43:39 *** Ristovski has joined #openttd.dev 14:52:18 *** adf88 has quit IRC 15:45:52 *** Alberth has joined #openttd.dev 15:45:52 *** ChanServ sets mode: +v Alberth 15:49:05 *** ntoskrnl has joined #openttd.dev 15:57:17 *** Sturmi has joined #openttd.dev 16:56:45 *** frosch123 has joined #openttd.dev 16:56:45 *** ChanServ sets mode: +v frosch123 17:10:23 *** adf88 has joined #openttd.dev 17:13:24 * LordAro continues to poke people https://www.dropbox.com/sh/dmj7ld3m2s6wryy/net05D2XY4 17:16:16 <planetmaker> :-) 17:17:30 <LordAro> :p 17:18:34 * Rubidium pokes LordAro with https://secure.openttd.org/bugs/?do=index&project=1&type[0]=1&sev[0]=&pri[0]=&due[0]=&cat[0]=&status[0]=open&percent[0]=&reported[0]=&order=id&sort=desc 17:19:30 <Rubidium> oh... even blathijs has more recent commits than I have... 17:19:42 <Rubidium> ah well... back to moving house stuff... 17:19:59 <LordAro> have fun Rubidium :) 17:45:10 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25869 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 18:42:04 *** Supercheese has joined #openttd.dev 19:09:54 <planetmaker> I guess the object placement on mapgen now should work: http://hg.openttdcoop.org/pm-openttd/graph (follow the yellow commits from tip downwards) 19:14:30 <planetmaker> @op Supercheese 19:14:30 *** DorpsGek sets mode: +o Supercheese 19:14:34 <planetmaker> @deop Supercheese 19:14:34 *** DorpsGek sets mode: -o Supercheese 19:14:37 <planetmaker> @voice Supercheese 19:14:37 *** DorpsGek sets mode: +v Supercheese 19:14:38 <planetmaker> :D 19:14:42 <Supercheese> Haha 19:15:28 <frosch123> planetmaker: add "static" in front of functions, which are not external 19:15:36 <planetmaker> Supercheese> No voice at the .dev channel, so: For objects-at-mapgen, are they still built with view 0 always, or is that randomized? <-- it *should* be randomized 19:16:26 <planetmaker> http://hg.openttdcoop.org/pm-openttd/rev/c867672e4c10#l1.63 @ Supercheese 19:16:45 <planetmaker> frosch123, so basically the Try* functions? 19:16:56 <Supercheese> Righto 19:17:24 <frosch123> planetmaker: yes, i am no futher :) 19:18:12 <planetmaker> no further functions get introduced which are local 19:19:15 <frosch123> "WasEverAvailable" sounds weird 19:20:13 <frosch123> but i cannot think of a better one :) 19:20:26 <frosch123> just add a "." at the end of the doxygen to make albert happy :) 19:20:38 <Belugas> Eternal ? 19:20:52 <planetmaker> Belugas, not covering future here 19:21:03 <planetmaker> that is covered by IsEverAvailable ;-) 19:21:04 <Alberth> WasAvailableBefore ? 19:21:28 <planetmaker> WasEverAvailable is true iff it was or is available 19:22:32 <Alberth> WasIntroduced? 19:22:49 <planetmaker> WasEverIntroduced? 19:22:53 <frosch123> HasBeenIntroduced? 19:22:59 <planetmaker> it need not be available anymore either 19:23:01 <frosch123> WasIntroduced 19:23:21 <frosch123> well, stay with WasEverAvailable :) 19:23:46 <frosch123> s/obiwan/c\&p/ ? 19:24:09 <planetmaker> yeah, possibly 19:25:38 <frosch123> c867672e4c10: count the number of water tiles only once? 19:25:42 <frosch123> instead of per object type 19:25:46 <frosch123> they do not change, do they? 19:25:57 <planetmaker> indeed not. Good point 19:27:32 <frosch123> you are lacking a if case for OBJECT_FLAG_SCALE_BY_WATER && !freeform_edges 19:27:41 <frosch123> ScaleByMapSize1D went missing 19:29:31 <frosch123> uint8 view = RandomRange(spec->views - 1); <- the "-1" is too much 19:29:38 <frosch123> RandRange returns 0 to (max -1) 19:30:50 <planetmaker> ah, k. And I'll move ScaleByMapSize1D outside the if 19:31:11 <planetmaker> actually, no 19:31:42 <planetmaker> where does ScaleByMapSize1D go missing? it's in http://hg.openttdcoop.org/pm-openttd/rev/c867672e4c10#l1.31 19:31:47 <planetmaker> line 31 19:32:02 <planetmaker> scaling before water calculation. Then scaling by water amount 19:32:36 <frosch123> if ((spec->flags & OBJECT_FLAG_SCALE_BY_WATER) && _settings_game.construction.freeform_edges) { 19:32:45 <planetmaker> yes, then I scale 19:32:47 <frosch123> that freeform_edges check is wrong 19:33:02 <frosch123> there is also water when freeform_edges is disabled 19:33:07 <planetmaker> no. If we have freeform edges, it's 100% water 19:33:17 <planetmaker> +no 19:33:27 <frosch123> that makes it even more wrong 19:33:37 <planetmaker> I didn't touch that logic 19:33:45 <frosch123> when freeform is disabled you are currently scaling everything by map area 19:34:01 <frosch123> you ignore SCALE_BY_WATER when freform is disabled 19:34:07 <planetmaker> yes 19:34:29 <planetmaker> hm, let's see what we do currently 19:36:11 <planetmaker> http://hg.openttd.org/openttd/trunk.hg/file/ad0907b800a2/src/object_cmd.cpp#l652 19:36:45 <planetmaker> we scale by 1D. And then if that condition holds, we scale by that water amount. Yes, that needs fixing 19:37:22 <planetmaker> two if conditions with the 1D scaling in between 19:37:57 <planetmaker> if (flag) { scale 1D; if (freeform) { ... } } 19:46:28 <frosch123> i guess, unless it is better for rounding to put the 1D inside the if and in an else 19:47:37 <planetmaker> well. The scale1D need be done always if the flag is set 19:48:40 <planetmaker> why do I make two ifs: if (flag & freeform) {...} else if (flag) { ... } else { scale2d} 19:56:33 <planetmaker> thanks for the thorough review, frosch123 :-) 20:04:15 <frosch123> planetmaker: the point is that "ScaleByMapSize1D(amount * num_water_tiles ) / (2 * MapMaxY() + 2 * MapMaxX() - 6)" might result in better values than "ScaleByMapSize1D(amount) * num_water_tiles / ( ... )" or "ScaleByMapSize1D(amount * num_water_tiles / (...))" 20:04:24 <frosch123> it's integers 20:04:36 <frosch123> so, first all-multiplications, then all devisions is better 20:09:54 <planetmaker> frosch123, if it's like 20:11:17 <planetmaker> if (flag) { amount = Scale1D(amount); if (freeform) amount = amount * num_water / whatever; } 20:11:38 <planetmaker> the multiplication is done first. 20:11:50 <frosch123> Scale1D can be both multiplication or division 20:12:33 <planetmaker> ah, you mean first mult by water tiles. ok 20:12:37 <planetmaker> and then scale 20:22:28 *** Sturmi has quit IRC 20:42:00 *** Alberth has left #openttd.dev 20:42:09 <LordAro> mwaha. https://www.dropbox.com/sh/dmj7ld3m2s6wryy/net05D2XY4 20:42:09 <LordAro> oh, and Rubibium asked me to share this link also: https://secure.openttd.org/bugs/?do=index&project=1&type[0]=1&sev[0]=&pri[0]=&due[0]=&cat[0]=&status[0]=open&percent[0]=&reported[0]=&order=id&sort=desc 20:43:12 <LordAro> :p 20:44:29 <frosch123> https://secure.openttd.org/bugs/?do=index&project=1&type[0]=1&sev[0]=&pri[0]=&due[0]=&cat[0]=&status[0]=open&percent[0]=&reported[0]=&order=status&sort=asc <- i use that one usually 20:44:34 <frosch123> is anyone better? 20:45:30 <LordAro> :p 20:47:00 <Rubidium> frosch123: in the perfect (and very very good) case, there's no difference 20:48:12 <frosch123> how is server-downtime good? 20:49:08 <Rubidium> oh... so also in the worst case there's no difference 21:22:05 *** zydeco has quit IRC 21:22:40 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25870 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 21:25:16 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25871 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 21:26:05 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25872 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 21:27:08 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25873 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 21:31:54 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25874 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 21:32:18 *** ntoskrnl has quit IRC 21:37:26 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25875 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 21:41:17 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25876 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 21:41:59 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25877 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 21:45:40 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25878 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 21:47:17 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25879 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 21:52:19 *** frosch123 has quit IRC 21:59:23 *** adf88 has quit IRC 22:07:54 *** Ristovski has quit IRC