Times are UTC Toggle Colours
07:20:09 *** Alberth has joined #openttd.dev 07:20:09 *** ChanServ sets mode: +v Alberth 08:58:40 *** JVassie has joined #openttd.dev 09:13:23 *** JVassie has quit IRC 09:36:36 *** frosch123 has joined #openttd.dev 09:36:36 *** ChanServ sets mode: +v frosch123 10:23:17 *** FLHerne has joined #openttd.dev 11:30:31 *** Supercheese has quit IRC 11:31:01 *** Supercheese has joined #openttd.dev 11:38:29 *** ntoskrnl has joined #openttd.dev 12:01:12 *** Ristovski has joined #openttd.dev 13:22:48 *** FLHerne has quit IRC 13:29:53 *** FLHerne has joined #openttd.dev 15:47:56 *** Zuu has joined #openttd.dev 15:47:56 *** ChanServ sets mode: +v Zuu 16:25:53 *** ntoskrnl has quit IRC 16:40:25 *** FLHerne has quit IRC 17:23:45 *** FLHerne has joined #openttd.dev 17:42:08 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25286 || 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:15:23 <frosch123> http://devs.openttd.org/~frosch/diffs/windowcfg/ <- add a new ini cfg file "windows.cfg", which can store settings for WindowDescs 18:15:55 <frosch123> ctrl+clicking the stickybox then stores the stickyness as default value and restores it when the window is opened 18:15:57 <Alberth> phew, just for openttd windows :) 18:16:10 <frosch123> then add a "default window size" button to the window caption 18:16:13 <Alberth> fancy 18:16:17 <frosch123> clicknig it resizes the window to its default size 18:16:26 <frosch123> ctrl+clicking again saves the current size as default 18:17:05 <frosch123> http://devs.openttd.org/~frosch/diffs/windowcfg/windows.cfg <- that's what the cfg looks like 18:17:31 <frosch123> i tried to somewhat name the windows consistently 18:17:50 <frosch123> instead of using the "random" names in the code 18:18:08 <frosch123> the consistency results in stuff like "build_town" instead of "found_town" and such though :) 18:19:19 <Alberth> :) 18:36:46 <Alberth> ah, the positioning magic in the news gui was already fixed 18:37:55 <frosch123> what magic? 18:39:32 <Alberth> magically jumping to above the chat window 18:39:45 <frosch123> ah, the Z ordering :) 18:40:03 <Alberth> 40 + const char *ini_key; ///< Key to store window defaults in openttd.cfg <-- perhaps also mention the meaning of \c NULL ? 18:40:04 <frosch123> i think there were about a dozen changes to Z orders until the reports declined :p 18:40:29 <Alberth> no, in Y direction, afaik 18:41:03 <Alberth> ie it left a gap wide enough for the chat line 18:43:16 <frosch123> + const char *ini_key; ///< Key to store window defaults in openttd.cfg. NULL if nothing shall be stored. 18:45:04 <Alberth> \c NULL :) 18:46:51 <Alberth> what does 50 do? ie the new window_settings.ini file ? 18:47:37 <frosch123> it loads and saves the ini group for every windowdesc 18:47:41 <frosch123> though the groups are empty for now 18:47:50 <frosch123> nothing to load/store there yet 18:50:58 <Alberth> you can generate an ini file with the save/load code? 18:51:25 <Alberth> 60 +void Window::ApplyDefaults() needs some doxymentation 18:51:32 <frosch123> settings are stored both in openttd.cfg and in savegame :) 18:51:40 <Zuu> r25259 added a new SL version comment but didn't increment the SAVEGAME_VERSION constant. Isn't that an error? http://vcs.openttd.org/svn/changeset/25259/#file7 18:51:50 <frosch123> the documentation for ApplyDefaults is in the header, like for the other members there 18:52:31 <frosch123> Zuu: not necessarily 18:52:33 <Zuu> In my patch against that file I had added a comment for 182 and updated the constant to 182, but this commit has only updated the comment. 18:53:03 <Alberth> s/preferance/preference/ in the ApplyDefaults() function 18:53:05 <frosch123> hmm, oh true 18:53:25 <frosch123> Rubidium: is that your desync? 18:53:58 <frosch123> Ristovski: SAVEGAME_VERSION is 181 currently, but should be 182 18:55:42 <Alberth> the other functions around ApplyDefaults also have an implementation there 18:56:03 <frosch123> OnInitialPosition doesn't :) 18:56:23 <Alberth> yeah, I noticed :( 18:57:16 <frosch123> but ok, i'll move it :) 19:00:51 <Rubidium> frosch123: desync? Which one? 19:01:17 <frosch123> i read something in the cdist topic 19:01:29 <frosch123> anyway, the new stuff for 182 is not saved 19:01:43 <Rubidium> oops ;) 19:01:50 <Rubidium> but that's not the cargodist desync 19:03:02 <Alberth> 80 +max = 2048 don't we have a constant for that? 19:03:12 <frosch123> no idea :) 19:03:15 <frosch123> do we? 19:03:16 <Alberth> but it looks very good 19:03:34 <frosch123> i think i have to put some number there 19:03:50 <Rubidium> Zuu: do you have a patch ready with savegame bump? 19:03:51 <Alberth> SL_MAX_VERSION ? 19:03:51 <frosch123> so i just choosed *some* number :p 19:04:12 <frosch123> Alberth: it's the maximum value for the setting 19:04:21 <frosch123> i.e. the maximum default window size 19:04:32 <Alberth> oh :D 19:04:33 <frosch123> maybe 2048 is too low though :p 19:04:44 <Zuu> Rubidium: It allow you to mark goals as completed and/or set a completion string which is shown in a column of its own in the goal window. 19:04:44 <frosch123> it's lower than my virtual screen width 19:04:46 <Alberth> yeah, I was thinking that too :) 19:05:05 <Zuu> http://devs.openttd.org/~zuu/goal-gui/10-goal-gui-completed-column.patch 19:05:08 <Alberth> wide screens are dangerous close to that value already :) 19:05:28 <Alberth> add a 0 :p 19:05:49 <Alberth> but probably 32767 is better 19:06:03 <frosch123> ok, 32000 :) 19:06:37 <Alberth> close enough :) 19:07:21 <Zuu> Rubidium: or do you want just a patch that fixes 181 -> 182 without adding any new features? 19:08:13 <Alberth> frosch123: I have no other comments. It's big but surprisingly straightforward 19:08:39 <frosch123> yeah, touching all windows :) 19:09:52 <Rubidium> Zuu: don't think the bump to 182 is really useful now; the bad (if any) has already been done 19:10:01 <Rubidium> so using it for another one might be better 19:10:23 <frosch123> are the values only used for the gui? 19:10:31 <frosch123> (currently) 19:10:55 <Rubidium> furthermore, in goal_sl.cpp you add two items and indent the rest as well. However, looking at the spaces, it was prepared for conditionals (the 4 spaces after the tab) 19:12:03 <Rubidium> and you seem to add the functions to 1.3.0 in the game changelog 19:12:24 <Zuu> The patch is about a year old so the changelog changes needs updating 19:12:41 <Zuu> regarding goal_sl.cpp, you are right, I'll fix that. 19:16:22 <Rubidium> StrEmpty handles NULL as empty string, so you don't need to check for NULL before doing StrEmpty 19:17:21 <Zuu> At eg 19:17:22 <Zuu> + EnforcePrecondition(false, goal != NULL); 19:17:22 <Zuu> + EnforcePrecondition(false, !StrEmpty(goal->GetEncodedText())); 19:17:25 <Zuu> It is needed. 19:17:40 <Zuu> Otherwise goal->GetEncodedText() will blow up 19:17:53 <Rubidium> hmm, my bad 19:18:12 <Rubidium> SetCompleted's second doxygen param is wrong 19:18:57 <Rubidium> the rest looks okay to me 19:20:40 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25287 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 19:21:09 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25288 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 19:21:35 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25289 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 19:21:59 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25290 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 19:24:20 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25291 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 19:24:42 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25292 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 19:25:08 <Zuu> In saveload.cpp, should I update the version number in the comment for SL version 182 or increase the revision to one number higher than the current revision (when the ongoing commit flow has ended) 19:25:31 <Rubidium> just increase the one for 182 19:26:41 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25293 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 19:27:05 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25294 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 19:27:30 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25295 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 19:27:55 <Zuu> I've updated the patch with your comments and for r25292 as the last version at the time of the commit, which is obviously already wrong. :-) 19:28:11 <Zuu> s/with your comments/based on your comments/ 19:28:19 <Rubidium> yeah, you might want to coordinate with frosch123 about the revision 19:28:32 <frosch123> i am done :) 19:31:05 <Zuu> Ok 19:35:28 <Zuu> Another thing I was thinking about was if we should perhaps raise the goal limit from 256. As far as I can see it is a constant in the Pool declaration that is all that needs changing. While it may not directly affect savegame storage(?) loading a game with 300 goals in an old client would obviously cause some issues. 19:36:13 <Rubidium> if you bump the savegame version near to it, that shouldn't be a problem ;) 19:36:44 <Alberth> for MP raising the max goals seems useful 19:37:17 <Zuu> hmm, savegame version is uint16, so I guess it is not very expansive if that change get a bump of its own. 19:39:28 <Rubidium> check SL_MAX_VERSION ;) 19:40:06 <Zuu> Oh, thats quite near 19:41:04 <Zuu> In that case I could prepare a raise of goal count so that we can get that in before raising the SL version. 19:41:40 <frosch123> raising SL_MAX_VERSION to 64k should be no problem, would it? 19:41:56 <frosch123> (i.e. only changing the constant, nothnig elsE) 19:41:58 <Rubidium> gheheh ;) 19:44:07 * Rubidium wonders what the low byte of hdr[0] is used for 19:45:21 <Rubidium> but yes, it seems safe 19:45:34 <frosch123> you mean the low byte of hdr[1] ? 19:45:51 <Rubidium> yup 19:46:43 <frosch123> i guess it is reserved for introducing a minor-minor version :) 19:47:17 <Rubidium> yay... 19:47:45 <Rubidium> though... we are earlier with out versioning system than mozilla and chrome ;) 19:47:50 <Rubidium> s/out/our/ 19:48:29 <Zuu> In that case, I go and commit, and look at goal limit later. 19:48:59 * Rubidium wouldn't care too much about the goal limit increase needing a savegame bump 19:49:20 <Rubidium> I doubt *trunk* goal games are often loaded in earlier versions 19:49:20 <frosch123> yeah, it does not need any bumop 19:49:31 <Zuu> Indeed 19:49:40 <Rubidium> and I smell some bumps coming before the next stable branch 19:49:59 <Rubidium> likewise I smell an opengfx release 19:50:14 <frosch123> :p 19:50:35 <Rubidium> that's due again after 5 months 19:50:40 <Alberth> in about 8 months :) 19:51:40 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25296 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 20:03:50 <Zuu> frosch123: I get a compilation error in window.cpp:140 when updating to last trunk. http://paste.openttdcoop.org/show/jbMUbeKXlBjoH7oNPfu0/ 20:04:38 <frosch123> the compile farm was happy 20:04:39 <Zuu> (using visual studio 2008) 20:06:41 <frosch123> http://paste.openttdcoop.org/show/2292/ <- does that work? 20:08:49 *** Alberth has left #openttd.dev 20:09:28 <Zuu> That does compile 20:09:55 <Zuu> sorry, it doesn't. 20:10:12 <frosch123> then you have to try :) 20:10:24 <Zuu> http://paste.openttdcoop.org/show/2293/ 20:10:45 <frosch123> ah, cdecl is missing 20:11:55 <frosch123> http://paste.openttdcoop.org/show/2294/ <- that? 20:12:25 <frosch123> you are on 32bit, right? 20:13:06 <Zuu> That works. And yes I'm compiling 32bit. 20:13:23 <Zuu> The os/system is 64 bit. 20:14:05 *** DorpsGek changes topic to "OpenTTD Dev Channel || Latest SVN: r25297 || Logs: http://webster.openttdcoop.org/?channel=openttd.dev || Voice (talk-right) upon request via #openttd; make sure you are registered to NickServ before asking" 20:14:12 <frosch123> thanks :) 20:55:51 *** Ristovski has quit IRC 21:36:52 *** frosch123 has quit IRC 22:17:25 <Zuu> This "more goals" patch seem to work for me. I can load games created with current trunk with this patch applied. If I create a save with more than 256 goals, I get an error message in Windows-style and then OpenTTD closes down. 22:17:25 <Zuu> http://devs.openttd.org/~zuu/goal-gui/15-more-goals.patch 22:18:44 <Zuu> In the patch I have allowed for 16 * 255 goals. As I understand it, the pool will allocate memory for the maximum amonut of goals no matter how many that are used. Therefore I have not maxed out but picked a number that I hope is enough for most games. 22:19:23 <Zuu> Though if someone want to have one goal for each combination of cargo, town and player, then they will fast hit the new limit. 22:19:53 <Zuu> Also just combination of town and player will hit the limit on larger maps with many players. 22:22:34 <Zuu> Another factor is that it may be nice to keep completed goals when the story book is used so that it will not display broken goal references if a goal is removed. 22:57:29 *** FLHerne has quit IRC 23:01:44 *** Zuu has quit IRC