February 27, 2017 
< | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | >
February 27, 2017 [00:05:37] *** waltervn <waltervn!~waltervn@541B2DBA.cm-5-4a.dynamic.ziggo.nl> has quit IRC (Quit: Leaving)[00:21:08] *** D0SFreak <D0SFreak!~D0SFreak@172.98.67.25> has joined #scummvm[00:24:48] *** RLP__ <RLP__!~D0SFreak@172.98.67.25> has quit IRC (Ping timeout: 260 seconds)[00:38:57] *** D0SFreak <D0SFreak!~D0SFreak@172.98.67.25> has quit IRC (Ping timeout: 268 seconds)[00:42:01] *** D0SFreak <D0SFreak!~D0SFreak@172.98.67.25> has joined #scummvm[00:59:33] *** nutron <nutron!~nutron@unaffiliated/nutron> has quit IRC (Remote host closed the connection)[01:00:00] *** nutron <nutron!~nutron@unaffiliated/nutron> has joined #scummvm[01:02:10] *** WooShell <WooShell!~Markus@ipbcc071f7.dynamic.kabel-deutschland.de> has quit IRC (Quit: If you understand or if you don't, if you believe or if you doubt - There's a universal justice, and the eyes of truth are always watching you.)[01:02:28] *** GitHub72 <GitHub72!~GitHub72@192.30.252.42> has joined #scummvm[01:02:28] <GitHub72> [scummvm] Strangerke pushed 1 new commit to master: https://git.io/vykpo[01:02:28] <GitHub72> scummvm/master e4b7f69 Strangerke: CRYO: Fix crash when restarting the game[01:02:28] *** GitHub72 <GitHub72!~GitHub72@192.30.252.42> has left #scummvm[01:08:54] *** m_kiewitz <m_kiewitz!~m_kiewitz@scummvm/undead/m-kiewitz> has quit IRC (Quit: technology isn't intrinsically good or evil. It's how it's used. Like the Death Ray.)[01:14:57] *** nutron <nutron!~nutron@unaffiliated/nutron> has quit IRC (Remote host closed the connection)[01:15:21] *** nutron <nutron!~nutron@unaffiliated/nutron> has joined #scummvm[01:22:03] *** Henke37 <Henke37!~Henrik@81-227-16-59-no133.bredband.skanova.com> has quit IRC (Quit: ERR_SHUTDOWN)[01:41:32] *** RLP__ <RLP__!~D0SFreak@172.98.67.25> has joined #scummvm[01:45:03] *** D0SFreak <D0SFreak!~D0SFreak@172.98.67.25> has quit IRC (Ping timeout: 240 seconds)[02:30:40] *** RLP__ <RLP__!~D0SFreak@172.98.67.25> has quit IRC (Quit: Leaving)[03:31:43] *** exmensa_ <exmensa_!~exmensa@66.43.202.238> has quit IRC (Ping timeout: 240 seconds)[03:36:40] *** TMM <TMM!~hp@fsf/member/pdpc.professional.tmm> has quit IRC (Ping timeout: 240 seconds)[03:38:10] *** Dominus <Dominus!~dominus@unaffiliated/dominus> has quit IRC (Ping timeout: 240 seconds)[03:39:32] *** Dominus <Dominus!~dominus@88-117-67-78.adsl.highway.telekom.at> has joined #scummvm[03:39:32] *** Dominus <Dominus!~dominus@88-117-67-78.adsl.highway.telekom.at> has quit IRC (Changing host)[03:39:32] *** Dominus <Dominus!~dominus@unaffiliated/dominus> has joined #scummvm[03:42:23] *** TMM <TMM!~hp@fsf/member/pdpc.professional.tmm> has joined #scummvm[03:42:23] *** ChanServ sets mode: +o TMM[03:43:04] *** Vampire0 <Vampire0!~Vampire@jEdit/Vampire> has joined #scummvm[03:45:56] *** Vampire0_ <Vampire0_!~Vampire@jEdit/Vampire> has quit IRC (Ping timeout: 260 seconds)[04:07:50] *** exmensa <exmensa!~exmensa@66.43.202.238> has joined #scummvm[04:50:32] *** vinayakvivek <vinayakvivek!uid121616@gateway/web/irccloud.com/x-crcbsptashkdbpcw> has joined #scummvm[04:58:49] *** SylvainTV <SylvainTV!~SylvainTV@LFbn-1-8392-241.w81-254.abo.wanadoo.fr> has quit IRC (Read error: Connection reset by peer)[05:00:18] *** Littleboy <Littleboy!~littleboy@c-73-186-252-231.hsd1.ma.comcast.net> has quit IRC (Quit: Être dans le vent, une ambition de feuille morte.)[05:01:17] *** heroux <heroux!~heroux@gateway02.insomnia247.nl> has quit IRC (Read error: Connection reset by peer)[05:16:11] *** heroux <heroux!~heroux@gateway02.insomnia247.nl> has joined #scummvm[05:20:09] *** heroux <heroux!~heroux@gateway02.insomnia247.nl> has quit IRC (K-Lined)[05:22:06] *** Axy <Axy!~Mia@88.224.2.68> has joined #scummvm[05:22:06] *** Axy <Axy!~Mia@88.224.2.68> has quit IRC (Changing host)[05:22:06] *** Axy <Axy!~Mia@unaffiliated/mia> has joined #scummvm[05:25:05] *** Mia <Mia!~Mia@unaffiliated/mia> has quit IRC (Ping timeout: 268 seconds)[05:47:45] *** dreammaster <dreammaster!~dreammast@c-73-149-116-247.hsd1.ma.comcast.net> has quit IRC ()[06:32:15] *** te_lanus <te_lanus!~te_lanus@154.66.195.97> has joined #scummvm[06:41:39] *** diehumblex <diehumblex!uid209517@gateway/web/irccloud.com/x-iphlbcpfpfmrgybh> has joined #scummvm[07:18:29] *** waltervn <waltervn!~waltervn@541B2DBA.cm-5-4a.dynamic.ziggo.nl> has joined #scummvm[07:18:29] *** ChanServ sets mode: +o waltervn[07:18:38] <waltervn> morning[07:53:11] <wjp> morning[08:49:25] *** ajax16384 <ajax16384!~User@109.60.138.138> has joined #scummvm[08:49:25] *** ChanServ sets mode: +o ajax16384[09:01:43] *** Lightkey <Lightkey!~Darklock@p200300764C04548522CF30FFFE083718.dip0.t-ipconnect.de> has quit IRC (Ping timeout: 240 seconds)[09:15:10] *** Lightkey <Lightkey!~Darklock@p200300764C04540122CF30FFFE083718.dip0.t-ipconnect.de> has joined #scummvm[09:31:32] *** te_lanus <te_lanus!~te_lanus@154.66.195.97> has quit IRC (Read error: Connection reset by peer)[09:54:27] *** TMM <TMM!~hp@fsf/member/pdpc.professional.tmm> has quit IRC (Quit: Ex-Chat)[09:55:24] *** LittleToonCat <LittleToonCat!~littlecat@sydnns0115w-047054148237.dhcp-dynamic.FibreOP.ns.bellaliant.net> has quit IRC (Remote host closed the connection)[09:57:33] *** _sev|work <_sev|work!~sev@5.57.20.50> has joined #scummvm[09:57:33] *** _sev|work <_sev|work!~sev@5.57.20.50> has quit IRC (Changing host)[09:57:33] *** _sev|work <_sev|work!~sev@scummvm/undead/sev> has joined #scummvm[09:57:33] *** ChanServ sets mode: +o _sev|work[10:45:08] *** vinayakvivek <vinayakvivek!uid121616@gateway/web/irccloud.com/x-crcbsptashkdbpcw> has quit IRC (Quit: Connection closed for inactivity)[10:49:22] *** wanwan <wanwan!~wanwan@ppp46-138-171-120.pppoe.spdop.ru> has quit IRC (Remote host closed the connection)[10:52:49] *** wanwan <wanwan!~wanwan@ppp46-138-171-120.pppoe.spdop.ru> has joined #scummvm[10:57:00] *** Henke37 <Henke37!~Henrik@81-227-16-59-no133.bredband.skanova.com> has joined #scummvm[11:09:49] *** TMM <TMM!~hp@fsf/member/pdpc.professional.tmm> has joined #scummvm[11:09:49] *** ChanServ sets mode: +o TMM[11:11:38] *** TMM <TMM!~hp@fsf/member/pdpc.professional.tmm> has quit IRC (Client Quit)[11:12:12] *** Strangerke|work <Strangerke|work!5bb7582b@gateway/web/freenode/ip.91.183.88.43> has joined #scummvm[11:12:16] <Strangerke|work> hi guys[11:14:07] *** TMM <TMM!~hp@fsf/member/pdpc.professional.tmm> has joined #scummvm[11:14:08] *** ChanServ sets mode: +o TMM[11:15:51] <Strangerke|work> Today Google will announce which projects are selected for the GSoC[11:15:55] <Strangerke|work> Fingers crossed[11:38:23] *** h00ligan <h00ligan!~User@109.60.138.138> has joined #scummvm[11:38:23] *** ChanServ sets mode: +o h00ligan[11:42:24] *** ajax16384 <ajax16384!~User@109.60.138.138> has quit IRC (Ping timeout: 260 seconds)[12:23:08] *** pegartillo <pegartillo!93607642@gateway/web/cgi-irc/kiwiirc.com/ip.147.96.118.66> has joined #scummvm[12:49:58] *** pegartillo <pegartillo!93607642@gateway/web/cgi-irc/kiwiirc.com/ip.147.96.118.66> has quit IRC (Quit: http://www.kiwiirc.com/ - A hand crafted IRC client)[13:17:13] *** Henke37 <Henke37!~Henrik@81-227-16-59-no133.bredband.skanova.com> has quit IRC (Quit: ERR_SHUTDOWN)[13:19:35] *** jamm <jamm!~jam@unaffiliated/jamm> has joined #scummvm[13:48:49] *** Vampire0_ <Vampire0_!~Vampire@jEdit/Vampire> has joined #scummvm[13:49:56] *** Vampire0 <Vampire0!~Vampire@jEdit/Vampire> has quit IRC (Ping timeout: 252 seconds)[13:59:24] *** m_kiewitz <m_kiewitz!~m_kiewitz@x4d03eec6.dyn.telefonica.de> has joined #scummvm[13:59:24] *** m_kiewitz <m_kiewitz!~m_kiewitz@x4d03eec6.dyn.telefonica.de> has quit IRC (Changing host)[13:59:24] *** m_kiewitz <m_kiewitz!~m_kiewitz@scummvm/undead/m-kiewitz> has joined #scummvm[13:59:24] *** ChanServ sets mode: +o m_kiewitz[14:48:03] *** dreammaster <dreammaster!~dreammast@c-73-149-116-247.hsd1.vt.comcast.net> has joined #scummvm[14:48:03] *** ChanServ sets mode: +o dreammaster[14:48:08] *** marcus_c <marcus_c!~marcus@bahamut-int.mc.pp.se> has quit IRC (Ping timeout: 240 seconds)[14:56:15] *** GitHub150 <GitHub150!~GitHub150@192.30.252.41> has joined #scummvm[14:56:15] <GitHub150> [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vyIp0[14:56:15] <GitHub150> scummvm/master 93cd3ec Paul Gilbert: TITANIC: Implemented CStarControl doAction[14:56:15] *** GitHub150 <GitHub150!~GitHub150@192.30.252.41> has left #scummvm[14:56:32] *** GitHub177 <GitHub177!~GitHub177@192.30.252.42> has joined #scummvm[14:56:32] <GitHub177> [scummvm] criezy pushed 1 new commit to master: https://git.io/vyIpg[14:56:32] <GitHub177> scummvm/master 2dab510 Ben Castricum: I18N: Update translation (Dutch)...[14:56:32] *** GitHub177 <GitHub177!~GitHub177@192.30.252.42> has left #scummvm[14:57:01] *** _sev|work <_sev|work!~sev@scummvm/undead/sev> has quit IRC (Quit: This computer has gone to sleep)[15:00:22] *** _sev|work <_sev|work!~sev@scummvm/undead/sev> has joined #scummvm[15:00:22] *** ChanServ sets mode: +o _sev|work[15:08:50] *** GitHub90 <GitHub90!~GitHub90@192.30.252.40> has joined #scummvm[15:08:50] <GitHub90> [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vyIjJ[15:08:50] <GitHub90> scummvm/master 1f99c01 Paul Gilbert: TITANIC: Added remainder of CStarControl class[15:08:50] *** GitHub90 <GitHub90!~GitHub90@192.30.252.40> has left #scummvm[15:21:15] *** GitHub186 <GitHub186!~GitHub186@192.30.252.42> has joined #scummvm[15:21:15] <GitHub186> [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vyLeg[15:21:15] <GitHub186> scummvm/master 0c64023 Paul Gilbert: TITANIC: Fix initialization of FRect[15:21:15] *** GitHub186 <GitHub186!~GitHub186@192.30.252.42> has left #scummvm[15:22:04] *** GeekShadow <GeekShadow!~antoine@reactos/tester/GeekShadow> has quit IRC (Ping timeout: 245 seconds)[15:23:26] *** marcus_c <marcus_c!~marcus@bahamut-int.mc.pp.se> has joined #scummvm[15:29:16] *** GeekShadow <GeekShadow!~antoine@nzf.turmel.info> has joined #scummvm[15:29:16] *** GeekShadow <GeekShadow!~antoine@nzf.turmel.info> has quit IRC (Changing host)[15:29:16] *** GeekShadow <GeekShadow!~antoine@reactos/tester/GeekShadow> has joined #scummvm[15:29:51] *** dreammaster <dreammaster!~dreammast@c-73-149-116-247.hsd1.vt.comcast.net> has quit IRC ()[16:03:47] *** GitHub38 <GitHub38!~GitHub38@192.30.252.34> has joined #scummvm[16:03:47] <GitHub38> [scummvm] wjp pushed 1 new commit to master: https://git.io/vyLmT[16:03:47] <GitHub38> scummvm/master 8bac883 Willem Jan Palenstijn: SCI: Fix up readString writing into too small buffer...[16:03:47] *** GitHub38 <GitHub38!~GitHub38@192.30.252.34> has left #scummvm[16:03:57] *** GitHub22 <GitHub22!~GitHub22@192.30.252.34> has joined #scummvm[16:03:57] <GitHub22> [scummvm] criezy pushed 1 new commit to master: https://git.io/vyLmI[16:03:57] <GitHub22> scummvm/master 7e933e5 Thierry Crozat: I18N: Update translations templates[16:03:57] *** GitHub22 <GitHub22!~GitHub22@192.30.252.34> has left #scummvm[16:08:36] <m_kiewitz> wjp: do you have a tool to dump resource.aud resources?[16:08:43] <wjp> no[16:08:58] <m_kiewitz> i noticed that several audio recordings are missing in King's Quest 6, and I would like to make sure that they are really missing.[16:09:41] <m_kiewitz> (text/subtitles exist, but audio doesn't)[16:12:58] *** _sev|work <_sev|work!~sev@scummvm/undead/sev> has quit IRC (Quit: This computer has gone to sleep)[16:16:13] *** Vampire0 <Vampire0!~Vampire@jEdit/Vampire> has joined #scummvm[16:17:16] *** Vampire0_ <Vampire0_!~Vampire@jEdit/Vampire> has quit IRC (Ping timeout: 260 seconds)[16:18:39] *** _sev|work <_sev|work!~sev@5.57.20.50> has joined #scummvm[16:18:39] *** _sev|work <_sev|work!~sev@5.57.20.50> has quit IRC (Changing host)[16:18:39] *** _sev|work <_sev|work!~sev@scummvm/undead/sev> has joined #scummvm[16:18:39] *** ChanServ sets mode: +o _sev|work[16:25:12] <wjp> waltervn: do you have time to walk me through SCI2 scis today?[16:25:33] <wjp> (not having much luck with your getangle.s in SCI2 so far)[16:27:14] *** Vampire0_ <Vampire0_!~Vampire@jEdit/Vampire> has joined #scummvm[16:28:28] *** Vampire0 <Vampire0!~Vampire@jEdit/Vampire> has quit IRC (Ping timeout: 260 seconds)[16:29:20] <wjp> (missing c_Str, s_data, s_format or something?)[16:30:01] <waltervn> wjp: right, that's probably because I use symbol files that are written by a hacked scummvm[16:31:20] <waltervn> https://github.com/waltervn/scummvm/tree/debugger Unfortunately, that branch hasn't been updated in almost 4 years[16:33:07] *** TMM <TMM!~hp@fsf/member/pdpc.professional.tmm> has quit IRC (Quit: Ex-Chat)[16:34:27] <waltervn> so c_Str is the Str class id, s_format is the 'format' selector. Those constants are output by a 'dump_symbols' debug command in that branch[16:35:31] <wjp> ah, that does ring a bell[16:35:51] <waltervn> scis then uses cpp to include that file... it's a bit of a hack I suppose, but it worked at some point in time :P[16:36:18] <wjp> ah right, 3 years ago you talked me through it for qg1new[16:40:36] <wjp> the good news is that the debugger branch merges with master without too much difficulty[16:41:20] <waltervn> the sci2 stuff in scis probably needs some fixed, like that exports thing that was figured out recently[16:41:23] <waltervn> *fixes[16:46:03] <waltervn> unfortunately, it can be rather tricky to navigate the scummvm heuristics. Often you need to include certain things in the code to get scummvm to detect the right SCI version[16:51:03] <wjp> the merge of debugger with master is the branch sci_dump_symbols in my fork, if you're interested[16:53:13] <wjp> now trying to figure out how to actually get SSCI to run this[16:56:16] <wjp> gk1 doesn't appear to react to the presence of this new 0.scr/0.hep at all[16:56:24] *** jamm <jamm!~jam@unaffiliated/jamm> has quit IRC (Ping timeout: 240 seconds)[16:56:47] <waltervn> are there are other patches?[16:57:03] <wjp> yes[16:59:12] <waltervn> it's quite possible that I only tested it with SQ6[16:59:51] <wjp> let me try that[17:01:57] <wjp> ok, that works :-)[17:05:26] <snover> wjp: what are you testing again? fileio? i’ve forgotten already.[17:05:34] <wjp> (whole bunch of SCUMM games on sale on GOG, by the way)[17:05:54] <wjp> snover: was thinking of trying these kRandom corner cases[17:06:25] <snover> ah, right.[17:07:04] *** h00ligan <h00ligan!~User@109.60.138.138> has quit IRC (Read error: Connection reset by peer)[17:08:07] <wjp> snover: I pushed a readstring patch, by the way[17:09:17] <snover> i saw that! i need to clean up some stuff i was working on, then i’ll see what happens with Inside the Chest[17:09:53] <snover> i suspect it will run into the (int)bytesRead > dest_r.maxSize path, but we’ll see[17:20:11] *** pegartillo <pegartillo!532c1228@gateway/web/cgi-irc/kiwiirc.com/ip.83.44.18.40> has joined #scummvm[17:20:17] <wjp> SQ6 kRandom doesn't behave like the comments in kRandom say SCI16 kRandom behaves[17:20:32] <wjp> kRandom(5, 10) -> [5, 10][17:20:39] <wjp> kRandom(10, 5) -> (5, 10)[17:20:52] <wjp> kRandom(0, -1) -> 0[17:21:02] <wjp> ( [] = inclusive on both ends, () = exclusive on both ends)[17:24:25] *** ajax16384 <ajax16384!~User@109.60.130.33> has joined #scummvm[17:24:25] *** ChanServ sets mode: +o ajax16384[17:25:18] <snover> hm, no, i have a bad memory. inside the chest uses kFileIOReadRaw, not ReadString.[17:33:45] *** _sev|work <_sev|work!~sev@scummvm/undead/sev> has quit IRC (Quit: This computer has gone to sleep)[17:34:59] *** TMM <TMM!~hp@fsf/member/pdpc.professional.tmm> has joined #scummvm[17:34:59] *** ChanServ sets mode: +o TMM[17:42:43] <wjp> any idea if bytesRead < size there too?[17:43:57] <snover> it is not[17:44:02] <snover> bytesRead == size[17:45:52] <snover> but the whole thing is pretty messed up; it does a raw read into an int16 array, which blows up on master because int16 arrays aren’t considered “raw” so it tries to set reg_t values and eventually overflows. fixing that so int16s are treated as raw, nothing happens[17:46:02] <snover> it reads in 8 bytes and then no more reads[17:47:48] *** hurricos <hurricos!~user@cl-130-49-13-15.wireless.pitt.edu> has joined #scummvm[17:48:30] <wjp> so it might be ok on the script side but not on ours?[17:49:00] <wjp> (related: are int16 arrays LE, BE, SE or native?)[17:50:12] *** Vampire0 <Vampire0!~Vampire@jEdit/Vampire> has joined #scummvm[17:50:50] *** Vampire0_ <Vampire0_!~Vampire@jEdit/Vampire> has quit IRC (Ping timeout: 252 seconds)[17:51:54] <snover> i’m not sure, the scripts seemed to be setting up objects with an element size smaller than the amount of data to read (elems: 8, bytes: 20)[17:52:08] <snover> (so 16 bytes of storage for 20 bytes of read)[17:52:31] *** WooShell <WooShell!~Markus@ipbcc071f7.dynamic.kabel-deutschland.de> has joined #scummvm[17:54:50] <snover> oh. actually that change to make int16 arrays raw is wrong[17:54:57] <snover> int16 arrays are internally reg_ts[17:55:20] <snover> i forgot, that change had to be made because games would request int arrays and then store memids in them[17:56:38] *** ny00123 <ny00123!~ny00123@89-139-182-239.bb.netvision.net.il> has joined #scummvm[17:58:30] *** hurricos <hurricos!~user@cl-130-49-13-15.wireless.pitt.edu> has quit IRC (Quit: ERC (IRC client for Emacs 24.5.1))[17:58:54] <WooShell> meow =^.^=[17:59:08] *** Vampire0_ <Vampire0_!~Vampire@jEdit/Vampire> has joined #scummvm[18:00:57] *** Vampire0 <Vampire0!~Vampire@jEdit/Vampire> has quit IRC (Ping timeout: 260 seconds)[18:02:08] <Strangerke|work> Guys, we have been accepted for GSoC 2017[18:02:19] <Strangerke|work> I'll write an announcement in the evening to advertise about it[18:02:40] <wjp> Great![18:03:04] <fydo> Awesome![18:03:42] <Strangerke|work> :)[18:03:59] <m_kiewitz> wjp: interesting, so they must have changed some things (and/or the RNG used in sci32 behaves differently)[18:04:27] <m_kiewitz> but wait, kRandom(0, -1) -> 0[18:04:37] <m_kiewitz> while at the same time kRandom(10,5) -> (5,10)[18:04:38] <m_kiewitz> ???[18:05:05] <m_kiewitz> ah, so maybe they use a signed int32[18:07:42] <Strangerke|work> 201 orgs this year, which means GSoC 2017 is the largest GSoC ever[18:10:48] <m_kiewitz> wjp: can you please try what it does on for example 60.000? i guess it should read the 16-bit value as unsigned[18:11:38] <Strangerke|work> So, the student period start now and ends on 20/3 with the student application forms deadline. We should all be ready to answer student's questions[18:12:30] <wjp> m_kiewitz: that doesn't sound consistent[18:12:31] *** pegartillo <pegartillo!532c1228@gateway/web/cgi-irc/kiwiirc.com/ip.83.44.18.40> has quit IRC (Quit: http://www.kiwiirc.com/ - A hand crafted IRC client)[18:12:46] <m_kiewitz> huh?[18:13:12] <wjp> because then it would treat kRandom(0,-1) as kRandom(0,65535)[18:13:34] <m_kiewitz> that would be a major change then[18:13:42] <m_kiewitz> larry 5 requires it to be unsigned[18:13:56] <m_kiewitz> i don't know how you tested it out[18:14:09] <m_kiewitz> i thought maybe you used a -1 sint32)[18:14:50] <wjp> I'm not sure how I would pass a sint32 to kRandom in SSCI[18:15:04] <m_kiewitz> i don't know that you passed it that way[18:15:50] <wjp> in any case, kRandom(0, 60000) returns values between 60000 and 65536 when treating the output as uint16[18:15:52] <m_kiewitz> anyway, so kRandom(0, 32767) -> (0...32767)[18:16:02] <wjp> (don't have enough samples to see if it's inclusive or exclusive)[18:16:28] <m_kiewitz> that's definitely completely different to kRandom in sci16[18:17:00] <m_kiewitz> kRandom(0, 32768) would then return (32768 ... 65535)?[18:17:43] <m_kiewitz> which one did you test?[18:17:47] <m_kiewitz> SQ6?[18:17:52] <wjp> SQ6[18:19:12] <m_kiewitz> <wjp> kRandom(10, 5) -> (5, 10)[18:19:25] <m_kiewitz> () exclusive on both ends[18:19:39] <m_kiewitz> does this mean effectively 6 up to 9? so it won't return 5 nor 10?[18:19:48] <wjp> indeed[18:20:08] <m_kiewitz> really weird behavior[18:20:11] <wjp> kRandom(0, 32768) indeed returns values between 32768 and 65536 (i.e., -32768 up to 0)[18:21:08] *** FleetAdmiral <FleetAdmiral!0e8b5206@gateway/web/freenode/ip.14.139.82.6> has joined #scummvm[18:21:56] <FleetAdmiral> Hey guys! I'm interested in participating through GSoC this year, i have a few questions regarding the project[18:22:29] <wjp> m_kiewitz: yeah, that (10, 5) doesn't seem to make much sense[18:22:40] <FleetAdmiral> I'd like to work on the GUI part, could i know what technology is used for the same?[18:23:00] <m_kiewitz> i guess they used some RNG which behaved so weird and also sees the parameters as signed[18:23:06] <m_kiewitz> this definitely was not the case in sci16[18:23:43] <m_kiewitz> but good that we found out. this would be one of the things that can create really weird issues and would take ages to figure out[18:24:35] <Strangerke|work> FleetAdmiral: hi :) And welcome![18:25:26] <Strangerke|work> FleetAdmiral: We have two GUI tasks, both of them would be mentored by _sev[18:27:39] <Strangerke|work> FleetAdmiral: He may not be available right now, because at this time of the day he may be on his way back home.[18:27:56] <FleetAdmiral> Oh alright, any pointers on where i could start working for the same?[18:29:02] <Strangerke|work> sorry, I don't understand "for the same?"[18:29:22] *** _sev|work <_sev|work!~sev@scummvm/undead/sev> has joined #scummvm[18:29:22] *** ChanServ sets mode: +o _sev|work[18:30:00] <FleetAdmiral> for GUI related tasks[18:30:04] <Strangerke|work> There are some details about the GUI tasks on the wiki[18:30:11] * Strangerke|work pokes _sev|work[18:30:38] <_sev|work> I'll be able to talk only in 2-3 hours or so[18:30:48] *** GitHub12 <GitHub12!~GitHub12@192.30.252.45> has joined #scummvm[18:30:48] <GitHub12> [scummvm] sev- pushed 2 new commits to master: https://git.io/vyLoz[18:30:48] <GitHub12> scummvm/master 9278380 Eugene Sandulenko: DIRECTOR: Improved debug output[18:30:48] <GitHub12> scummvm/master 63f168c Eugene Sandulenko: DIRECTOR: Fix frame script execution...[18:30:48] *** GitHub12 <GitHub12!~GitHub12@192.30.252.45> has left #scummvm[18:31:05] <Strangerke|work> FleetAdmiral: Could you wait 2 or 3 hours and ask more detailed questions to _sev?[18:31:14] <FleetAdmiral> Yea sure i'll do that[18:31:21] <FleetAdmiral> i'll look about the wiki in the meantime[18:31:45] <Strangerke|work> that sounds perfect :)[18:32:01] <FleetAdmiral> Awesome, thanks for the help guys :D[18:32:12] <Strangerke|work> yw :)[18:33:19] *** _sev|work <_sev|work!~sev@scummvm/undead/sev> has quit IRC (Client Quit)[18:39:44] *** diehumblex <diehumblex!uid209517@gateway/web/irccloud.com/x-iphlbcpfpfmrgybh> has quit IRC (Ping timeout: 240 seconds)[18:41:19] *** diehumblex <diehumblex!uid209517@gateway/web/irccloud.com/x-tgtxeaqbsbvvffaa> has joined #scummvm[18:43:25] *** Strangerke|work <Strangerke|work!5bb7582b@gateway/web/freenode/ip.91.183.88.43> has quit IRC (Quit: Bbl)[18:46:02] *** LittleToonCat <LittleToonCat!~littlecat@sydnns0115w-047054148237.dhcp-dynamic.FibreOP.ns.bellaliant.net> has joined #scummvm[18:46:08] *** Littleboy <Littleboy!~littleboy@c-73-186-252-231.hsd1.ma.comcast.net> has joined #scummvm[18:46:08] *** ChanServ sets mode: +o Littleboy[18:46:20] <_sev> FleetAdmiral: all the GUI code is custom. You may find it in gui/ directory in our repository. Also, there is a custom XML description file, you may find all info on our Wiki in http://wiki.scummvm.org/index.php/GUI_Themes/Specs[18:46:33] <_sev> FleetAdmiral: perhaps you have more specific question?[18:47:07] <FleetAdmiral> No, i just wanted leads to the GUI content, i'll let you know if i want more, thanks :D[18:50:06] *** Henke37 <Henke37!~Henrik@81-227-16-59-no133.bredband.skanova.com> has joined #scummvm[18:59:15] <rsn8887> sev: I am thinking of doing the rebase myself and then simply do a pull request from my rebased branch to cpasjuste's branch? If he pulls it, the changes should show up on the current Vita PR, and everything should be ok.[18:59:49] <rsn8887> But he will have to do a "forced" merge I guess. I am not familiar how that works[19:00:08] <rsn8887> sev: I am not the owner of cpasjuste's branch[19:05:53] <_sev> rsn8887: yes, but he might give you access to that, so then you can do it[19:06:07] <_sev> rsn8887: but yes, do it in your branch and then he could fetch it from you[19:22:21] <wjp> m_kiewitz: thinking about it some more, this kRandom behaviour does make some sense if you assume (positiveNumber % negativeNumber) returns a value in (negativeNumber, 0][19:23:21] <wjp> then it's just "if (to - from + 1 == 0) return from; else return from + (random() % (to - from + 1))"[19:23:35] <wjp> depending on the implementation-defined behaviour of %[19:24:26] <wjp> or maybe in [negativeNumber, 0)[19:24:55] <wjp> yeah, that last one[19:49:00] *** vinayakvivek <vinayakvivek!uid121616@gateway/web/irccloud.com/x-hiardwjuljxxjwot> has joined #scummvm[19:59:39] *** FleetAdmiral <FleetAdmiral!0e8b5206@gateway/web/freenode/ip.14.139.82.6> has quit IRC (Ping timeout: 260 seconds)[20:03:28] *** SylvainTV <SylvainTV!~SylvainTV@LFbn-1-8392-241.w81-254.abo.wanadoo.fr> has joined #scummvm[20:03:28] *** ChanServ sets mode: +o SylvainTV[20:27:43] *** Farmboy0 <Farmboy0!~quassel@p5DD107DB.dip0.t-ipconnect.de> has joined #scummvm[20:27:43] *** Farmboy0 <Farmboy0!~quassel@p5DD107DB.dip0.t-ipconnect.de> has quit IRC (Changing host)[20:27:43] *** Farmboy0 <Farmboy0!~quassel@xoreos/farmboy0> has joined #scummvm[20:34:47] <rsn8887> sev: Ok I will do it in my branch.[20:44:49] <rsn8887> sev: so quick question, I rebase everything, then merge it into a local copy of master, do the manual merges, push it to my repo, make a PR for Cpasjuste so he can fetch it?[21:07:28] <wjp> that sounds like the gist of it[21:07:32] <rsn8887> Hmm I am getting merge conflicts on my rebase on old commits I have nothing to do with[21:07:39] <rsn8887> How is this possible?[21:07:50] <rsn8887> Those have all been merged into master already.[21:07:59] <wjp> then you may be doing the wrong thing[21:08:23] <wjp> it's relative easy to accidentally rebase a bunch of old commits onto the wrong branch[21:09:20] <wjp> if you don't already do it, you should always double-check the result of a rebase with a (graphical) history viewer to ensure everything went right[21:09:58] <wjp> (and if doing complicated merges it is also always a good idea to make backup branches)[21:10:45] <rsn8887> Can I just checkout a fresh version of vita branch. Then do a git pull --rebase from scummvm/scummvm master? Then rebase everything. Then push to Cpasjuste?[21:11:23] <rsn8887> That is my usual workflow, only normally I git pull --rebase from cpasjuste/scummvm:master not scummvm/scummvm:master[21:12:09] <wjp> I don't know your setup or the vita branch[21:12:18] <rsn8887> I will try it.[21:12:32] <rsn8887> On copies of my branches to be sage[21:12:35] <rsn8887> safe[21:12:43] <wjp> also make sure to abort any in-progress rebases/merges[21:13:08] <rsn8887> wjp: yes I learned that the hard way lost a night fiddling with reflog. Quite easy to break everything in git.[21:13:20] <rsn8887> Surprisingly easy[21:13:26] <wjp> it's also quite easy to avoid breaking everything, fortunately :-)[21:13:42] <rsn8887> If it wasn't for reflog, I would have quite this project 3 weeks ago.[21:13:43] <wjp> (backup branches, visual checks after steps, abort if strange things happen)[21:22:20] <rsn8887> I don't understand. I am doing git rebase -i HEAD~2 and it is showing me dozens of commits. I thought it would only show the last two.[21:23:05] <wjp> is one of the last two a merge?[21:23:37] <rsn8887> Yes.[21:23:44] <wjp> that would do it[21:24:13] <wjp> you can try rebase -ip, but YMMV[21:25:00] <wjp> (and you'll have to re-do any merge conflict resolutions anyway)[21:28:47] *** GitHub158 <GitHub158!~GitHub158@192.30.252.40> has joined #scummvm[21:28:47] <GitHub158> [scummvm] criezy pushed 1 new commit to master: https://git.io/vytUS[21:28:47] <GitHub158> scummvm/master fc0f366 Ben Castricum: I18N: Update translation (Dutch)...[21:28:47] *** GitHub158 <GitHub158!~GitHub158@192.30.252.40> has left #scummvm[21:33:06] <rsn8887> lots of conflicts. Strange, I thought the branch was already pretty much merged.[21:33:11] <rsn8887> Last time I merged in scummvm/scummvm master, I only had 3 conflicts.[21:33:41] <rsn8887> Also it doesn't show me AT ALL where those conflicts are from (which commits have caused them)[21:35:07] <wjp> what exactly are you trying to rebase/merge into what?[21:42:06] <rsn8887> I am taking my local up-to-date copy of the vita branch (I have been working on it with Cpasjuste).[21:42:21] <rsn8887> And I am pull-rebasing the scummvm/scummvm master on top.[21:42:31] <rsn8887> well I shouldn't say on top.[21:42:47] <rsn8887> I am simply pull-rebasing the scummvm master into the vita branch to fix all merge conflicts.[21:43:09] <rsn8887> I was hoping the only conflicts would be in files that cpasjuste or me had actually created or modified[21:43:45] <rsn8887> But I am getting completely unrelated merge conflicts. It is as if I am getting all the conflicts that have recently happened in other peoples commits that they have already fixed.[21:47:22] <snover> rsn8887: is the branch you are trying to rebase onto scummvm/master online somewhere that i can pull it?[21:48:00] <rsn8887> Yes one second let me verify/push the latest version.[21:51:58] <rsn8887> snover: it is here:[21:51:59] <rsn8887> https://github.com/rsn8887/scummvm/[21:52:04] <rsn8887> master branch of that repo[21:52:33] <rsn8887> I am trying to do git pull --rebase the scummvm master onto my master.[21:52:34] *** kurtwr <kurtwr!~kurtwr@c-50-173-166-91.hsd1.ca.comcast.net> has quit IRC (Ping timeout: 255 seconds)[21:52:44] <rsn8887> But it is not working (way too many conflicts).[21:52:52] <wjp> that sounds like the wrong direction[21:53:24] <wjp> you want to keep scummvm master the same, not put it on top of something else[21:53:41] <rsn8887> Hmm I thought it is pretty much the same. But I will try it the other way round.[21:55:19] <wjp> you know that cpasjuste's master has already merged your master, right?[21:59:20] <rsn8887> Yes. I am trying to get a local branch ready that I can use to do the rebasing that _sev requested.[21:59:37] <rsn8887> I could pull cpasjuste's, but our branches are the same apart from 1 merge commit.[21:59:53] <rsn8887> where he merged my branch into his.[21:59:55] <snover> this 8c832ff commit should not be here[22:00:30] <snover> it’s some manual merge of code without an actual merge commit[22:00:40] <snover> of code from scummvm/master*[22:01:00] <wjp> yes, that's quite bizarre, although the next commit presumably mostly takes care of that[22:01:14] <snover> the conflicts in `PSP2: add psvita support` are legitimate conflicts[22:01:32] <wjp> the very first commit of the branch is also a bit weird, being a merge commit of two commits in master[22:02:16] <snover> git can’t know that 8c832ff is the same as code from master, so can only assume everything is a conflict because it looks like you changed all the code on your branch manually[22:02:24] <snover> looks to git*[22:02:53] <rsn8887> But in https://github.com/scummvm/scummvm/pull/901 there are only 4 conflicts listed![22:03:00] <wjp> a quick graft + filter-branch should take care of it (but that's relatively black magic)[22:03:06] <rsn8887> why is it now showing so many[22:03:25] <wjp> because any conflicts there have already been resolved by later merges[22:03:42] <wjp> but rebasing triggers everything again[22:03:59] <rsn8887> Oh man, is there a way to not trigger everything again?[22:04:22] <rsn8887> The last thing I want to do is re-resolve conflicts that cpasjuste has already resolved[22:05:19] <wjp> fixing up the oddities might be nice, but I'm not sure if rebasing the whole thing is worth it[22:05:22] <rsn8887> So I think I might understand now: A merge does not show all those conflicts, but a rebase does.[22:05:38] <wjp> 'rebase' is basically replaying all commits from your current branch onto another branch[22:05:40] <rsn8887> That makes sense, becaue the PR is a merge, but what I am trying to do is pull --rebase[22:05:49] <rsn8887> instead of just pull (normal merge)[22:06:22] <rsn8887> Is there a "rebase + apply same merge resolutions"? I mean the resolutions have already been made[22:07:33] <wjp> not really, as they have been made after a group of commits, not after individual commits[22:07:34] <rsn8887> So what if:[22:07:34] *** kurtwr <kurtwr!~kurtwr@c-50-173-166-91.hsd1.ca.comcast.net> has joined #scummvm[22:07:56] <rsn8887> I rebase the branch locally (without merging or pulling anything)[22:08:04] <rsn8887> And then merge afterwards?[22:08:42] <rsn8887> Hmm I guess it might show the same problem of many merge conflicts again then.[22:08:44] <snover> git pull --rebase is just git fetch + git rebase[22:09:05] <rsn8887> and git pull is git fetch + git merge. The merge is much simpler (almost zero conflicts).[22:09:11] <rsn8887> The rebase is a pain.[22:09:46] <rsn8887> It also shows a lot of "deleted" file merges and some files with >100 merge conflict lines.[22:11:01] <wjp> that broken merge from earlier and duplicate commits that have already been merged into master in separate PR's will make this interesting[22:11:07] <snover> a merge commit gives you an extra place to fix the conflicts (in the merge commit itself); a rebase requires you to fix whatever conflicts exist for each commit because it replays each commit one by one against the head of the parent branch[22:11:47] <wjp> if we want to rebase this, I'd first fix up that broken merge, then remove those duplicate commits if at all possible, and then try[22:13:47] <rsn8887> snover: the head as it was back at the time of that commit?[22:13:54] <snover> no[22:13:57] <rsn8887> snover: or the *current* head?[22:14:31] <snover> the head of whatever branch you are rebasing onto[22:14:39] <snover> e.g. `git rebase scummvm/master`[22:14:45] <rsn8887> snover: I guess that is why there are so many conflicts.[22:14:59] <snover> that would rebase against the head of your local copy of the scummvm fork’s master branch[22:15:28] <rsn8887> snover: but shouldn't it at least skip commits that are identical in both branches?[22:16:01] <wjp> it will try to[22:16:05] <snover> sure, but these 'merge' conflicts are not identical to any commit in the other branch[22:16:13] <rsn8887> snover: or is it replaying all commits all the way from when cpasjuste first forked?[22:16:25] <wjp> it is doing that, yes[22:16:34] <Strangerke> seennick criezy[22:16:35] <LeChuck> criezy (~criezy at host86-135-136-56 dot range86-135.btcentralplus.com) was last seen quitting from #scummvm 2 days, 23 hours, 11 minutes ago stating (Quit: criezy).[22:16:50] <snover> rebase looks back through the history to find the first common commit and rebases from that point[22:17:28] <wjp> (technically that would be the root of the whole repo, but nitpicking :-) )[22:17:36] <rsn8887> snover: So say Criezy made a commit and resolved a merge conflict manually then. When I rebase, I shouldn't have to re-resolve that conflict again[22:18:01] <wjp> unfair, isn't it? :-)[22:18:13] <wjp> the thing is that it's a completely different thing[22:18:21] <wjp> the merge resolved only the end results[22:18:26] <wjp> a rebase replays individual commits[22:18:28] *** Begas_VBox <Begas_VBox!~Begasus@d54C3C8C2.access.telenet.be> has joined #scummvm[22:18:41] <rsn8887> snover: But I never had any problem doing rebase's of my local copy of Cpasjuste's branch before.[22:18:58] <wjp> those probably only involved a few commits[22:19:25] <rsn8887> wjp: True... I guess the problem appears when going back 60 commits to the beginning of the fork[22:19:40] <wjp> yes[22:19:49] <wjp> with a few complications in there[22:20:02] <rsn8887> wjp: I feel merge is a more natural solutions, although it displays a "less-finegrained" history.[22:20:04] <wjp> the merge-gone-wrong halfway, and the chain of SDL commits in the branch that are almost-but-not-quite in master[22:20:51] <snover> these not-a-merge merge commits really ought to go though, since that’s just duplicate code of other commits that should not exist in the history[22:20:58] <rsn8887> How can a merge go wrong halfway? I would think git should protect against that[22:21:10] <wjp> you keep saying "should" :-)[22:21:20] <wjp> git will happily let you shoot yourself in the foot if you tell it to[22:21:32] <wjp> i.e., always double-check the results[22:21:36] *** ajax16384 <ajax16384!~User@109.60.130.33> has quit IRC (Quit: Leaving)[22:22:06] <rsn8887> what is an SDL commit, and where is the merge gone wrong?[22:22:18] *** Vampire0 <Vampire0!~Vampire@jEdit/Vampire> has joined #scummvm[22:22:22] <wjp> 21:59 <@snover> this 8c832ff commit should not be here[22:22:26] <wjp> that's the merge-gone-wrong[22:22:35] <wjp> the SDL commits are the kbdmouse stuff[22:23:49] *** Vampire0_ <Vampire0_!~Vampire@jEdit/Vampire> has quit IRC (Ping timeout: 268 seconds)[22:24:03] <rsn8887> Oh the SDL stuff, yes but there were changes to PSP2 files in there.[22:24:31] <wjp> that fact doesn't really reduce the conflicts[22:25:51] <wjp> 308de528802e7c06f17932e5dc4d85634af57364 is probably also an issue[22:26:06] <wjp> cleaning this up will be fun[22:26:56] <snover> FWIW, this is the knowledge cliff of git that everyone runs into eventually. once you get to the other side you will have much fewer problems :)[22:27:41] <snover> it’s a painful but rewarding process.[22:28:26] <wjp> I think part of this will have to be postponed until the pending PRs are merged[22:29:26] <rsn8887> Is it possible to squash all the vita commits into one big commit. Diff the result with current master branch, resolve the conflicts and be done with it.[22:29:33] <wjp> 911 and 912 in particular[22:29:45] <wjp> depends on if the history is at all valuable[22:29:58] <rsn8887> E.g. a merge commit with all commits squashed as just a single commit "add vita support" I don't think the history is important.[22:30:21] <wjp> that would not be a merge commit[22:30:38] <wjp> but doing that would certainly be an option[22:30:40] <rsn8887> What I don't like about a merge commit currently is that somehow it "opens up" as many separate commits on subsequent "rebase" I would like it to be just one commit that shows as one on a rebase[22:31:16] <rsn8887> If you look at the history and the commit messages there's really not much in there but a standard "initial Vita port"[22:31:38] *** Begas_VBox <Begas_VBox!~Begasus@d54C3C8C2.access.telenet.be> has quit IRC (Quit: Vision[0.9.8]: i've been blurred!)[22:32:26] <rsn8887> The problem is currently I cannot even squash all psp2 commits into one, because rebase gives me a ton of manual merges. I wonder if a giant "patch" would be a solution[22:33:46] <wjp> that's pretty easy. Do a merge with master, then a soft reset to master, then a commit[22:33:49] <rsn8887> E.g. a patch that takes current master and brings it to resemble the vita branch after merge with master.[22:33:51] <rsn8887> and that patch is applied as a single commit.[22:34:10] <rsn8887> hmm I did the merge with master. How do I do the soft reset.[22:34:29] <wjp> git reset --soft scummvm/master[22:34:46] <wjp> and then just 'git commit'[22:34:51] <rsn8887> ah ok I will try that. Maybe you and sev can decide if that would be the best way to commence with this.[22:35:03] <wjp> but I'd still suggest waiting until after #911 and #912 are in[22:35:51] <rsn8887> I feel that might be good. We loose all history of vita branch, but I don't think anybody cares about the history of those 30 commits or so.[22:36:03] <wjp> if necessary I can also take a few hours later this week to go through the history and fix everything up[22:36:14] <rsn8887> Especially since the messages are not very telling anyways and many are just "update readme"[22:36:41] <rsn8887> I think If you diff that soft reset commit with current master, you will see the actual changes are not that large.[22:37:15] <rsn8887> I guess that is shown by the current vita PR. It would not be an overwhelmingly huge commit. ANd it would fix the SDL problem that I created[22:37:26] <wjp> ok[22:37:44] *** girafe <girafe!~girafe@LFbn-1-11729-221.w2-7.abo.wanadoo.fr> has joined #scummvm[22:39:04] <rsn8887> I agree that our current PR's regarding the control menu should probably be merged first, since that will reduce the changes introduced by the single vita soft reset + commit action.[22:39:17] *** kurtwr2 <kurtwr2!~kurtwr@c-50-173-166-91.hsd1.ca.comcast.net> has joined #scummvm[22:39:56] *** kurtwr <kurtwr!~kurtwr@c-50-173-166-91.hsd1.ca.comcast.net> has quit IRC (Ping timeout: 260 seconds)[22:45:19] * wjp removes that kRandom test script from SQ6 again before he wonders next month why SQ6 is suddenly broken :-)[22:48:04] <rsn8887> I tried the single commit. It shows 109 changed files and 6648 additions. But it looks very nice to go through, quite logical additions.[22:48:21] <rsn8887> 64 deletions. I think it would be the best option.[22:49:42] *** ny00123 <ny00123!~ny00123@89-139-182-239.bb.netvision.net.il> has quit IRC (Quit: Leaving)[22:50:37] <rsn8887> With the other SDL PR merged into mainline ScummVM, the additions will be even less.[22:51:01] <wjp> Ok, so that sounds like a realistic option[22:51:36] <rsn8887> I am a bit concerned that PR 901 shows 125 files changed and my single pull request shows 109 files changed ?!?! Those should be the same ?!?!?[23:15:08] *** vinayakvivek <vinayakvivek!uid121616@gateway/web/irccloud.com/x-hiardwjuljxxjwot> has quit IRC (Quit: Connection closed for inactivity)[23:17:28] *** Deledrius__ <Deledrius__!~Deledrius@68.118.139.214> has joined #scummvm[23:19:25] *** Deledrius_ <Deledrius_!~Deledrius@2602:100:4476:8bd6:659a:84e5:bdcf:324e> has quit IRC (Ping timeout: 255 seconds)[23:21:14] *** marcos-sb <marcos-sb!~marcos-sb@ip5456f217.speed.planet.nl> has joined #scummvm[23:25:45] *** waltervn <waltervn!~waltervn@541B2DBA.cm-5-4a.dynamic.ziggo.nl> has quit IRC (Quit: Leaving)[23:30:12] *** marcos-sb <marcos-sb!~marcos-sb@ip5456f217.speed.planet.nl> has quit IRC (Quit: marcos-sb)[23:42:03] *** m_kiewitz <m_kiewitz!~m_kiewitz@scummvm/undead/m-kiewitz> has quit IRC (Quit: technology isn't intrinsically good or evil. It's how it's used. Like the Death Ray.)