[00:00] pollEvent will either overwrite it or return false [00:00] oh no that would indeed be terrible. Where is that overwrite? [00:00] that's the whole functionality of pollEvent [00:00] snover: you have checked qfg2? [00:01] wjp: I don't see any overwrite? [00:02] pollEvent is doing stuff with the SDL event ev, but nothing with the common event, event? [00:03] rsn8887: the function of pollEvent is to see if there is an event available. If it is, it returns true and fills the event argument. If there isn't, it returns false [00:03] the input event is uninitialized and unused [00:03] so if you fill event at the very beginning, pollEvent will ignore it [00:04] wjp: Ah so I should return true! [00:04] This might explain the problem. [00:04] so if handleKbdMouse creates an event, then pollEvent should return true. [00:05] wjp: thanks I think that is the problem. Now it is just a matter of returning true. [00:06] at the right time [00:10] handleKbdMouse(event); [00:10] if event.type=COMMON::MOUSEEVENT { [00:10] return true; [00:10] } [00:10] should do the trick. [00:10] only if you also initialize it to something else otherwise, and replace the = by ==, but it might be cleaner to make handleKbdMouse also return true if it produces an event [00:12] ok will do I think this will finally fix this. [00:13] I didn't realize the important "return false" at the very end of pollEvent. Thanks for the help! [00:13] you're welcome [00:17] wjp: now the delay in handleKbdMouse also becomes really important to allow pollEvent to poll the other stuff even if the user is holding the stick. [00:18] also all the other handle* members are bool (for a reason) [00:19] snover: I suppose that SRelative might now actually be outdated with your lofsa changes? [00:22] wjp: im not sure i understand. which usage would be outdated? [00:23] I'm not entirely sure; but from a distance it looks like your lofsa/lofss output changes look like they might also work for LofsType SCI0_EARLY [00:23] (in the Script_Offset case) [00:24] so I was wondering if the opcode format could just be changed to Script_Offset for all versions (dropping it from script_adjust_opcode_formats) [00:24] wjp: Ok I fixed handleKbdMouse to return true when it generates an event, and then pollEvent also returns true if that is the case. will test it tonight and then make PR later [00:24] rsn8887: great [00:25] wjp: oh. well, potentially, i suppose. the difference between the two appears to be that Script_SRelative params are signed and Script_Offset are unsigned [00:25] other than that, they do seem to be identical [00:27] the signedness is a good point [00:28] readPMachineInstruction of course already handled that in the vm [00:28] Vampire0_ (~Vampire@jEdit/Vampire) joined #scummvm. [00:30] Vampire0 (~Vampire@jEdit/Vampire) left irc: Ping timeout: 260 seconds [00:31] (and do ignore my suggestion about script_adjust_opcode_formats; I'd forgotten that wasn't debugger-only :-) ) [00:33] :) brains can only retain so many facts, and youve got a lot of them in there [00:34] but is the SRelative case then giving wrong output? [00:35] or maybe I should just go to bed and let you fix this in peace :-) [00:36] :) it appears to be including the offset from retval so is correct [00:37] it might be worthwhile to change it to use findOffset too [00:37] the improved output would be nice [00:38] wjp: does it seem sensible to you to return false from handleJoyAxisMotion just before the call to processMouseEvent() if axis is equal to 0 (and thus the event type not set)? [00:38] criezy: at first glance, yes, but I haven't thought about it too much [00:40] It's probably not a good idea to make a change after midnight anyway (at least in my case). [00:40] So I am keeping that for this weekend when I will have a bit more time to look at it. [00:41] And when my brain might actually be in working order. [00:44] In particular I was wondering if it should not return false in all cases since that function actually never moves the mouse (as far as I can see) and it is only moved in handleKbdMouse. [00:46] mhm, if we change handleKbdMouse to return a mouse motion event, it might indeed be pointless [00:52] dreammaster (~dreammast@c-73-149-116-247.hsd1.ma.comcast.net) joined #scummvm. [00:52] #scummvm: mode change '+o dreammaster' by ChanServ!ChanServ@services. [00:56] bgK (~bgk@rbx1-fr.quadhost.net) left irc: Ping timeout: 256 seconds [01:03] m_kiewitz (~m_kiewitz@scummvm/undead/m-kiewitz) left irc: Quit: technology isn't intrinsically good or evil. It's how it's used. Like the Death Ray. [01:03] Vampire0 (~Vampire@jEdit/Vampire) joined #scummvm. [01:04] GitHub117 (~GitHub117@192.30.252.42) joined #scummvm. [01:04] [scummvm] rsn8887 opened pull request #906: SDL: More fixes to jerky analog joystick pointer (master...upstream) https://git.io/vD94E [01:04] GitHub117 (GitHub117@192.30.252.42) left #scummvm. [01:04] Vampire0_ (~Vampire@jEdit/Vampire) left irc: Ping timeout: 240 seconds [01:07] bgK (~bgk@rbx1-fr.quadhost.net) joined #scummvm. [01:07] #scummvm: mode change '+o bgK' by ChanServ!ChanServ@services. [01:12] rsn8887_ (~rsn8887@ip-129-15-64-254.wireless-pat.ou.edu) joined #scummvm. [01:12] rsn8887 (~rsn8887@ip-129-15-64-254.wireless-pat.ou.edu) left irc: Read error: Connection reset by peer [01:16] rsn8887_ (~rsn8887@ip-129-15-64-254.wireless-pat.ou.edu) left irc: Ping timeout: 260 seconds [01:19] exmensa (~exmensa@66.43.202.238) joined #scummvm. [01:19] SylvainTV (~SylvainTV@LFbn-1-8392-241.w81-254.abo.wanadoo.fr) left irc: Read error: Connection reset by peer [01:21] Strangerke_ (~Strangerk@cable-85.28.84.13.coditel.net) joined #scummvm. [01:22] Henke37 (~Henrik@81-227-16-59-no133.bredband.skanova.com) left irc: Quit: ERR_SHUTDOWN [01:22] exmensa_ (exmensa@66.43.202.238) left irc: Ping timeout: 268 seconds [01:23] Strangerke (~Strangerk@cable-85.28.84.13.coditel.net) left irc: Ping timeout: 245 seconds [01:23] Nick change: Strangerke_ -> Strangerke [01:35] |Cable| (~cable@33.138.117.91.dynamic.reverse-mundo-r.com) left irc: Ping timeout: 264 seconds [01:39] GitHub117 (~GitHub117@192.30.252.40) joined #scummvm. [01:39] [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vD9EY [01:39] scummvm/master 899585d Paul Gilbert: TITANIC: Remove old debug code [01:39] GitHub117 (GitHub117@192.30.252.40) left #scummvm. [01:47] |Cable| (~cable@33.138.117.91.dynamic.reverse-mundo-r.com) joined #scummvm. [02:09] GitHub0 (~GitHub0@192.30.252.42) joined #scummvm. [02:09] [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vD9zI [02:09] scummvm/master 216e57a Paul Gilbert: TITANIC: Renamings for CGameObject & CGameState methods [02:09] GitHub0 (GitHub0@192.30.252.42) left #scummvm. [02:35] GitHub120 (~GitHub120@192.30.252.45) joined #scummvm. [02:35] [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vD9gu [02:35] scummvm/master d56e4e4 Paul Gilbert: TITANIC: Further renamings for CGameObject [02:35] GitHub120 (GitHub120@192.30.252.45) left #scummvm. [02:36] Dominus (~dominus@unaffiliated/dominus) left irc: Ping timeout: 240 seconds [02:42] GitHub17 (~GitHub17@192.30.252.41) joined #scummvm. [02:42] [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vD92J [02:42] scummvm/master 314c795 Paul Gilbert: TITANIC: Cleanup of movie flags [02:42] GitHub17 (GitHub17@192.30.252.41) left #scummvm. [02:54] Vampire0_ (~Vampire@jEdit/Vampire) joined #scummvm. [02:56] Vampire0 (~Vampire@jEdit/Vampire) left irc: Ping timeout: 240 seconds [03:02] GitHub161 (~GitHub161@192.30.252.41) joined #scummvm. [03:02] [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vD9am [03:02] scummvm/master cb9ebfc Paul Gilbert: TITANIC: Fix compiler warning [03:02] GitHub161 (GitHub161@192.30.252.41) left #scummvm. [03:19] travis-ci (~travis-ci@ec2-54-226-228-231.compute-1.amazonaws.com) joined #scummvm. [03:19] scummvm/scummvm#2705 (master - 899585d : Paul Gilbert): The build has errored. [03:19] Change view : https://github.com/scummvm/scummvm/compare/c0d155db9723...899585d478ef [03:19] Build details : https://travis-ci.org/scummvm/scummvm/builds/202472911 [03:19] travis-ci (travis-ci@ec2-54-226-228-231.compute-1.amazonaws.com) left #scummvm. [03:27] Littleboy (~littleboy@c-73-186-252-231.hsd1.ma.comcast.net) left irc: Quit: tre dans le vent, une ambition de feuille morte. [03:44] deepbook5broo (~gk.1wm.su@2a03:4a80:2:2d4:2d4:e830:6db2:a7d4) joined #scummvm. [03:44] deepbook5broo (gk.1wm.su@2a03:4a80:2:2d4:2d4:e830:6db2:a7d4) left #scummvm. [04:00] uch. travis. [04:02] Unseen2 (snowcat@snowcat.de) left irc: Read error: Connection reset by peer [04:03] Unseen2 (snowcat@snowcat.de) joined #scummvm. [04:04] Vampire0 (~Vampire@jEdit/Vampire) joined #scummvm. [04:05] Vampire0_ (~Vampire@jEdit/Vampire) left irc: Ping timeout: 255 seconds [04:13] uch. sci engine. [04:13] this bitmap error is weird. the VM appears to send a View object that should be displaying an actual view, not a bitmap [04:14] and, it calls kAddScreenItem for the view right before this call to kSetNowSeen. [04:22] well, looks like my clever code deduplication when updating screen items isnt quite right, since who would reuse an ID for something that used to be a bitmap and now is a view?! :) [04:31] i am completely baffled that this is the first time this bug happened [04:37] GitHub35 (~GitHub35@192.30.252.34) joined #scummvm. [04:37] [scummvm] dreammaster pushed 1 new commit to master: https://git.io/vD9Mm [04:37] scummvm/master 46076c0 Paul Gilbert: TITANIC: Fix operation of Phonograph play button [04:37] GitHub35 (GitHub35@192.30.252.34) left #scummvm. [04:52] dreammaster (~dreammast@c-73-149-116-247.hsd1.ma.comcast.net) left irc: [04:59] LittleToonCat (~littlecat@sydnns0115w-047054148237.dhcp-dynamic.FibreOP.ns.bellaliant.net) left irc: Remote host closed the connection [05:10] ST1 (~ScottT@203-227-181-180.cpe.skymesh.net.au) joined #scummvm. [05:10] ST (~ScottT@203-227-181-180.cpe.skymesh.net.au) left irc: Disconnected by services [05:23] travis-ci (~travis-ci@ec2-54-226-228-231.compute-1.amazonaws.com) joined #scummvm. [05:23] scummvm/scummvm#2709 (master - cb9ebfc : Paul Gilbert): The build has errored. [05:23] Change view : https://github.com/scummvm/scummvm/compare/314c795d21ce...cb9ebfcb1c1e [05:23] Build details : https://travis-ci.org/scummvm/scummvm/builds/202487236 [05:23] travis-ci (travis-ci@ec2-54-226-228-231.compute-1.amazonaws.com) left #scummvm. [05:48] rsn8887 (~rsn8887@ip68-97-13-84.ok.ok.cox.net) joined #scummvm. [05:50] rsn8887 (~rsn8887@ip68-97-13-84.ok.ok.cox.net) left irc: Remote host closed the connection [05:53] rsn8887 (~rsn8887@ip68-97-13-84.ok.ok.cox.net) joined #scummvm. [05:54] well, phant2 is completable. [05:55] gotta fix some bugs with the computer interface but otherwise i didnt notice any more problems [06:04] oh wait, thats a lie. i also had to force all property setters to set the view update flag. the _mustSetViewVisible stuff for sci3 isnt quite working correctly yet. [06:08] waltervn (~waltervn@541B2DBA.cm-5-4a.dynamic.ziggo.nl) joined #scummvm. [06:08] #scummvm: mode change '+o waltervn' by ChanServ!ChanServ@services. [06:13] rsn8887 (~rsn8887@ip68-97-13-84.ok.ok.cox.net) left irc: Remote host closed the connection [06:19] Vampire0_ (~Vampire@jEdit/Vampire) joined #scummvm. [06:20] Vampire0 (~Vampire@jEdit/Vampire) left irc: Ping timeout: 260 seconds [07:32] m_kiewitz (~m_kiewitz@x4d03d1f2.dyn.telefonica.de) joined #scummvm. [07:32] m_kiewitz (~m_kiewitz@x4d03d1f2.dyn.telefonica.de) left irc: Changing host [07:32] m_kiewitz (~m_kiewitz@scummvm/undead/m-kiewitz) joined #scummvm. [07:32] #scummvm: mode change '+o m_kiewitz' by ChanServ!ChanServ@services. [08:05] Lightkey (~Darklock@p200300764C2EBF9422CF30FFFE083718.dip0.t-ipconnect.de) left irc: Ping timeout: 258 seconds [08:19] Lightkey (~Darklock@p200300764C2EBF0222CF30FFFE083718.dip0.t-ipconnect.de) joined #scummvm. [08:22] Axy (~Mia@unaffiliated/mia) left irc: Read error: Connection reset by peer [08:27] Mia (~Mia@85.110.63.74) joined #scummvm. [08:27] Mia (~Mia@85.110.63.74) left irc: Changing host [08:27] Mia (~Mia@unaffiliated/mia) joined #scummvm. [09:02] Polynomial-C (~Poly-C@gentoo/developer/Polynomial-C) left irc: Remote host closed the connection [09:03] _sev|work (~sev@scummvm/undead/sev) joined #scummvm. [09:03] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services. [09:21] Vampire0_ (~Vampire@jEdit/Vampire) left irc: Ping timeout: 240 seconds [09:22] Vampire0 (~Vampire@jEdit/Vampire) joined #scummvm. [09:24] t0by (~t0by@unaffiliated/t0by) joined #scummvm. [09:24] #scummvm: mode change '+v t0by' by ChanServ!ChanServ@services. [09:48] TMM (~hp@fsf/member/pdpc.professional.tmm) left irc: Quit: Ex-Chat [10:19] Vampire0_ (~Vampire@jEdit/Vampire) joined #scummvm. [10:20] Vampire0 (~Vampire@jEdit/Vampire) left irc: Ping timeout: 240 seconds [10:33] TMM (~hp@fsf/member/pdpc.professional.tmm) joined #scummvm. [10:33] #scummvm: mode change '+o TMM' by ChanServ!ChanServ@services. [10:34] bgK (~bgk@rbx1-fr.quadhost.net) left irc: Ping timeout: 255 seconds [10:35] bgK (~bgk@2001:41d0:2:599c::2a60:8434) joined #scummvm. [10:35] #scummvm: mode change '+o bgK' by ChanServ!ChanServ@services. [10:46] kurtwr (~kurtwr@c-50-173-166-91.hsd1.ca.comcast.net) joined #scummvm. [10:48] ny00123 (~ny00123@bzq-79-182-43-200.red.bezeqint.net) left irc: Quit: Leaving [10:48] ny00123 (~ny00123@bzq-79-182-43-200.red.bezeqint.net) joined #scummvm. [11:20] D0SFreak (~D0SFreak@172.56.5.239) joined #scummvm. [11:27] NuSuey (uid3556@gateway/web/irccloud.com/x-wuhbafglvhnjnyhs) joined #scummvm. [12:01] omer_mor (~Omer@46-117-132-33.bb.netvision.net.il) joined #scummvm. [12:04] omer_mor_ (~Omer@46-117-132-33.bb.netvision.net.il) left irc: Ping timeout: 240 seconds [12:11] ajax16384 (~User@109.60.138.138) joined #scummvm. [12:11] #scummvm: mode change '+o ajax16384' by ChanServ!ChanServ@services. [12:24] kurtwr (~kurtwr@c-50-173-166-91.hsd1.ca.comcast.net) left irc: Ping timeout: 255 seconds [12:33] jamm (~jam@unaffiliated/jamm) joined #scummvm. [12:49] ny00123 (~ny00123@bzq-79-182-43-200.red.bezeqint.net) left irc: Quit: Leaving [13:20] LittleToonCat (~littlecat@sydnns0115w-047054148237.dhcp-dynamic.FibreOP.ns.bellaliant.net) joined #scummvm. [13:26] lubomyr (~kvirc@93.178.246.84) joined #scummvm. [13:39] lubomyr (~kvirc@93.178.246.84) left irc: Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/ [13:42] lubomyr (~kvirc@93.178.246.84) joined #scummvm. [13:46] lubomyr (kvirc@93.178.246.84) left #scummvm. [13:53] lubomyr (~kvirc@93.178.246.84) joined #scummvm. [13:54] user9 (~Thunderbi@leoseb.ujf-grenoble.fr) left irc: Quit: user9 [13:54] user9 (~Thunderbi@leoseb.ujf-grenoble.fr) joined #scummvm. [13:56] lubomyr (~kvirc@93.178.246.84) left irc: Client Quit [14:00] Dominus (~dominus@194-166-17-105.adsl.highway.telekom.at) joined #scummvm. [14:00] Dominus (~dominus@194-166-17-105.adsl.highway.telekom.at) left irc: Changing host [14:00] Dominus (~dominus@unaffiliated/dominus) joined #scummvm. [14:18] exmensa_ (exmensa@66.43.202.238) joined #scummvm. [14:20] exmensa (~exmensa@66.43.202.238) left irc: Ping timeout: 255 seconds [14:29] lubomyr (~kvirc@93.178.246.84) joined #scummvm. [14:52] girafe (~girafe@LFbn-1-11729-221.w2-7.abo.wanadoo.fr) joined #scummvm. [14:54] heroux (sandroco@gateway/shell/insomnia247/x-tesfbgsfoagcgoka) left irc: Ping timeout: 268 seconds [14:54] heroux (sandroco@gateway/shell/insomnia247/x-lhijijfpusdkbchs) joined #scummvm. [14:58] heroux (sandroco@gateway/shell/insomnia247/x-lhijijfpusdkbchs) left irc: Ping timeout: 260 seconds [15:07] girafe (~girafe@LFbn-1-11729-221.w2-7.abo.wanadoo.fr) left irc: Read error: Connection reset by peer [15:14] heroux (sandroco@gateway/shell/insomnia247/x-rnjjqldbfxwtdeju) joined #scummvm. [15:17] rsn8887 (~rsn8887@ip-129-15-64-253.wireless-pat.ou.edu) joined #scummvm. [15:32] rsn8887 (~rsn8887@ip-129-15-64-253.wireless-pat.ou.edu) left irc: Quit: Leaving... [15:53] lubomyr (~kvirc@93.178.246.84) left irc: Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/ [15:58] ajax16384 (~User@109.60.138.138) left irc: Quit: Leaving [16:09] Littleboy (~littleboy@c-73-186-252-231.hsd1.ma.comcast.net) joined #scummvm. [16:09] #scummvm: mode change '+o Littleboy' by ChanServ!ChanServ@services. [16:18] kurtwr (~kurtwr@c-50-173-166-91.hsd1.ca.comcast.net) joined #scummvm. [16:21] Vampire0 (~Vampire@jEdit/Vampire) joined #scummvm. [16:22] Vampire0_ (~Vampire@jEdit/Vampire) left irc: Ping timeout: 260 seconds [16:32] rsn8887 (Elite19032@gateway/shell/elitebnc/x-lsystfjuhdbvwvig) joined #scummvm. [16:39] WooShell (~Markus@ipbcc071f7.dynamic.kabel-deutschland.de) joined #scummvm. [16:39] meow =^.^= [16:42] ajax16384 (~User@109.60.130.33) joined #scummvm. [16:42] #scummvm: mode change '+o ajax16384' by ChanServ!ChanServ@services. [16:45] dtcrshr (~datacrush@2801:88:f7a:100:cd0e:4045:cabe:7462) joined #scummvm. [16:45] dtcrshr (~datacrush@2801:88:f7a:100:cd0e:4045:cabe:7462) left irc: Changing host [16:45] dtcrshr (~datacrush@unaffiliated/datacrusher) joined #scummvm. [16:48] t0by (~t0by@unaffiliated/t0by) left irc: Quit: Bye! [16:54] Nick change: ced117 -> ced117s [16:54] Nick change: ced117s -> ced117 [16:55] rsn8887_ (~rsn8887@ip-129-15-64-253.wireless-pat.ou.edu) joined #scummvm. [16:57] rsn8887_ (~rsn8887@ip-129-15-64-253.wireless-pat.ou.edu) left irc: Client Quit [17:05] _sev|work (~sev@scummvm/undead/sev) left irc: Quit: This computer has gone to sleep [17:07] delme_ (~delme@ip-129-15-64-253.wireless-pat.ou.edu) joined #scummvm. [17:08] Hello [17:09] delme_ (~delme@ip-129-15-64-253.wireless-pat.ou.edu) left irc: Client Quit [17:17] delme_ (~delme@ip-129-15-64-253.wireless-pat.ou.edu) joined #scummvm. [17:17] Hello [17:19] Hello? [17:24] yes, your messages are received [17:25] delme_ (~delme@ip-129-15-64-253.wireless-pat.ou.edu) left irc: Quit: Leaving... [17:30] _sev|work (~sev@scummvm/undead/sev) joined #scummvm. [17:30] #scummvm: mode change '+o _sev|work' by ChanServ!ChanServ@services. [17:49] NuSuey (uid3556@gateway/web/irccloud.com/x-wuhbafglvhnjnyhs) left irc: Quit: Connection closed for inactivity [17:50] hey snover [17:50] hi omer_mor [17:50] your working branch seems very advanced compared to trunk [17:50] it is [17:51] any plans on how to start bringing your stuff in? [17:51] _sev|work (~sev@scummvm/undead/sev) left irc: Quit: This computer has gone to sleep [17:51] im unable to land mostly anything until PR 882 lands. [17:51] GitHub100 (~GitHub100@192.30.252.45) joined #scummvm. [17:51] [scummvm] sev- pushed 3 new commits to master: https://git.io/vDQJ1 [17:51] scummvm/master e48dd54 Eugene Sandulenko: DIRECTOR: Added Events debug channel, more debug output in Lingo [17:51] scummvm/master c5295a1 Eugene Sandulenko: DIRECTOR: Fix script references for D3 (now for real) [17:51] scummvm/master fb79925 Eugene Sandulenko: DIRECTOR: Beutify debug output [17:51] GitHub100 (GitHub100@192.30.252.45) left #scummvm. [17:53] so i am at the mercy of the requested reviewers to either say its OK to land now without a review or it actually gets reviewed [17:53] the bounds-checking PR [17:53] yes [17:53] it's been in review for quite some time now [17:53] yes [17:53] :/ [17:54] after that PR do you think you'll be ready to start testing SCI32? [17:55] publicly, that is [17:55] i rebase everything against master on a pretty regular basis so its not like there will be some huge future effort to bring things back up to date [17:55] most of the SCI32 games will be ADGF_TESTING for the next release [17:56] someone that likes QFG4 needs to play QFG4, I tried to run through it but having to wait for the day/night cycle and not having a clear path through the game makes it annoying to test [18:01] Farmboy0 (~quassel@p5DD10B67.dip0.t-ipconnect.de) joined #scummvm. [18:01] Farmboy0 (~quassel@p5DD10B67.dip0.t-ipconnect.de) left irc: Changing host [18:01] Farmboy0 (~quassel@xoreos/farmboy0) joined #scummvm. [18:04] bgK (~bgk@2001:41d0:2:599c::2a60:8434) left irc: Ping timeout: 255 seconds [18:06] Action: _sev is so sick of great multitudes of fake Russian bot accounts "liking" ScummVM page on Facebook [18:07] <_sev> all is scam and potentially spam or could be used for some sort of wicked propaganda... sigh [18:07] bgK (~bgk@rbx1-fr.quadhost.net) joined #scummvm. [18:07] #scummvm: mode change '+o bgK' by ChanServ!ChanServ@services. [18:10] <_sev> oh, looks that I can rmove them [18:20] snover: in Object::locateVarSelector, for getSciVersion > 1_LATE and <= 2_1_LATE, it reads obj->getVariable(1) entries from _baseVars. Does that necessarily match the size the subspan gets in Object::init ? [18:26] wjp: looking& [18:27] it looks like it. the _variables size is taken from offset 2, and variable 1 would be initialised from offset 2 [18:28] according to object.cpp:98 on my working branch [18:28] and object.cpp:78 [18:29] so that original line in locateVarSelector seems&questionable [18:30] wjp: did you notice this working on some related problem, or just stumbled upon it? [18:33] oh, your comments above reminded me to read through your bounds PR [18:33] ah. :) [18:34] im looking through the history to see why someone thought this needed to be done, but unfortunately several times i have done this i just run into the freesci commit [18:34] hopefully that wont happen this time& [18:34] there's always https://github.com/wjp/freesci-archive too :-) [18:39] TMM (~hp@fsf/member/pdpc.professional.tmm) left irc: Quit: Ex-Chat [18:42] yeah. ran into the freesci commit again. [18:42] i also need to figure out a faster way to use git blame. [18:43] gitk has a nice "show origin of this line" in its context menu [18:44] and if that doesn't show a relevant patch, you can easily repeat it on the previous version of that line [18:47] reading the manpage has me onto something referred to as the pickaxe, git log -S 'string to look for' [18:48] combine with the -p flag, see the diffs only from commits that contain that string [18:50] or, git blame -C to make it not show commits that were just copying or moving a line to another line [18:51] lubomyr (~kvirc@93.178.246.84) joined #scummvm. [18:53] but, i guess i should also install gitk and test that out for a while too sometime :) [18:54] anyway, it came from lskovlun with a commit message SCI1.1 support [18:59] i guess the other thing thats different here for sci1.1-2.1 is that the count is always getting retrieved from a class object instead of potentially from an instance object, though i am not sure if that matters [18:59] for a SciSpan, did getUint16*At(2) read at byte 2 or byte 4? [19:00] 4 [19:01] fwiw, since that PR ive changed this code to use more containers and fewer pointers [19:01] because things like that were confusing, and sci3 cant do shared memory [19:03] ok, so you can probably ignore a few of my pending comments then [19:03] you know, this PR is pretty big :-) [19:04] Action: wjp is at 20% or so [19:04] yeah :| [19:07] this findBlockSCI0 blockSize is confusing me [19:07] every block type seems to get its size in a different way in Script::load [19:10] Strangerke_ (~Strangerk@cable-85.28.84.13.coditel.net) joined #scummvm. [19:10] wjp: you mean the exportTable, synonymTable, localsTable stuff? [19:11] yeah [19:12] Strangerke (~Strangerk@cable-85.28.84.13.coditel.net) left irc: Ping timeout: 240 seconds [19:12] Nick change: Strangerke_ -> Strangerke [19:12] _numExports _seems_ to be read from the same place as where findBlockSCI0 is reading its blockSize [19:12] but the former is in uint16's, and the latter in bytes? [19:13] yeah, i think there was a confusion originally since the exports block is right after the script header [19:15] though, actually, what i am thinking of applies to sci1.1+, not sci0 [19:19] wjp: i had hoped the comment there would unconfuse things, but i seem to have trouble writing unconfused prose lately [19:19] the block header is { uint16 type, uint16 size }, and then the export block is { uint16 numExports, uint16 export, & } [19:20] and the value returned by findBlockSCI0 points to the start of the block, not the start of the block data [19:21] yeah, the comment does explain it [19:21] so exportTable[0] is the block type, exportTable[1] the block size in bytes, exportTable[2] the number of exports. ok, good. [19:22] i dont love that the exports table is so unique, but it was that way when i got here, i swear ;-) [19:22] Strangerke (~Strangerk@cable-85.28.84.13.coditel.net) left irc: Ping timeout: 240 seconds [19:23] except it was apparently broken before? [19:25] i vaguely remember that now, yeah. [19:25] youd never notice that the number of exports was accidentally too large so long as no script tried to call an out of bounds export [19:28] its worth rechecking that to make sure that *i* didnt screw it up though [19:29] pretty sure its correct [19:29] yeah, it is correct now. [19:44] diehumblex (uid209517@gateway/web/irccloud.com/x-hjvdrumvfkpjhcqy) joined #scummvm. [19:45] D0SFreak (~D0SFreak@172.56.5.239) left irc: Ping timeout: 255 seconds [19:47] clazzzzz [19:47] heh heh. [19:50] I seem to have those first two words as 'unknown' in the scis SCI1.1 code (https://github.com/waltervn/scis/blob/master/sci11.c#L97). I'll have to look at that some time. Not that anyone is using scis anyway. :) [19:55] (halfway!) [19:59] (phew!) [20:00] girafe (~girafe@LFbn-1-11729-221.w2-7.abo.wanadoo.fr) joined #scummvm. [20:10] TMM (~hp@fsf/member/pdpc.professional.tmm) joined #scummvm. [20:10] #scummvm: mode change '+o TMM' by ChanServ!ChanServ@services. [20:16] salty-horse (~salty-hor@unaffiliated/salty-horse) joined #scummvm. [20:16] #scummvm: mode change '+o salty-horse' by ChanServ!ChanServ@services. [20:17] GitHub189 (~GitHub189@192.30.252.42) joined #scummvm. [20:17] [scummvm] waltervn pushed 1 new commit to master: https://git.io/vDQzZ [20:17] scummvm/master d405e9e Walter van Niftrik: ADL: Implement hires6 action opcode 0x0b [20:17] GitHub189 (GitHub189@192.30.252.42) left #scummvm. [20:21] omer_mor (~Omer@46-117-132-33.bb.netvision.net.il) left irc: Ping timeout: 255 seconds [20:25] jamm (~jam@unaffiliated/jamm) left irc: Ping timeout: 240 seconds [20:26] GitHub86 (~GitHub86@192.30.252.45) joined #scummvm. [20:26] [scummvm] waltervn pushed 1 new commit to master: https://git.io/vDQ2U [20:26] scummvm/master fee0b81 Walter van Niftrik: ADL: Fix hires6 action opcode 0x0c [20:26] GitHub86 (GitHub86@192.30.252.45) left #scummvm. [20:28] ok, enough for now [20:31] minor stuff only so far, and a couple of unrelated things which happened to show up in or near the diff [20:34] I could probably be convinced to play through QfG4 this weekend [20:38] excellent. my evil plan is working. [20:39] :-) [20:55] clazzzzz. [20:59] lubomyr (~kvirc@93.178.246.84) left irc: Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/ [21:11] ajax16384 (~User@109.60.130.33) left irc: Read error: Connection reset by peer [21:11] The Colonel's Bequest stream on twitch.tv/gogcom nao [21:12] D0SFreak (~D0SFreak@172.98.67.126) joined #scummvm. [21:15] using ScummVM even :-) [21:16] RLP__ (~D0SFreak@c-73-7-33-53.hsd1.ga.comcast.net) joined #scummvm. [21:18] D0SFreak (~D0SFreak@172.98.67.126) left irc: Ping timeout: 255 seconds [21:22] "uh.. I seem to have broken the game" [21:23] RIP :| [21:25] "Didn't Alfred teach you anything?!" :-D [21:35] dhewg (~dhewg@adiza.nexticom.net) left irc: Ping timeout: 240 seconds [21:37] https://zetafleet.com/i/58a76e8d2417a.jpg [21:37] (not the demo!) [21:37] RLP__ (~D0SFreak@c-73-7-33-53.hsd1.ga.comcast.net) left irc: Read error: Connection reset by peer [21:38] D0SFreak (~D0SFreak@c-73-7-33-53.hsd1.ga.comcast.net) joined #scummvm. [21:42] delme_ (~delme@ip-129-15-64-254.wireless-pat.ou.edu) joined #scummvm. [21:42] delme_ (~delme@ip-129-15-64-254.wireless-pat.ou.edu) left irc: Client Quit [21:43] dhewg (~dhewg@212.63.210.87) joined #scummvm. [21:43] #scummvm: mode change '+o dhewg' by ChanServ!ChanServ@services. [21:43] https://zetafleet.com/i/58a770176a5d9.jpg [21:43] 👍 [21:44] did not expect this to come together nearly as easily as this [21:48] salty-horse (~salty-hor@unaffiliated/salty-horse) left irc: Quit: Leaving [21:54] nice :-) [21:57] dhewg (~dhewg@212.63.210.87) left irc: Ping timeout: 260 seconds [22:04] dhewg (~dhewg@212.63.210.87) joined #scummvm. [22:04] #scummvm: mode change '+o dhewg' by ChanServ!ChanServ@services. [22:16] dhewg (~dhewg@212.63.210.87) left irc: Ping timeout: 240 seconds [22:18] dhewg (~dhewg@adiza.nexticom.net) joined #scummvm. [22:18] #scummvm: mode change '+o dhewg' by ChanServ!ChanServ@services. [22:33] Henke37 (~Henrik@81-227-16-59-no133.bredband.skanova.com) joined #scummvm. [22:36] I made a new PR to fix the remaining problems with analog joystick mouse control. Is there anything else I should do? Or should I just wait for any comments to appear on it? [22:36] https://github.com/scummvm/scummvm/pull/906 [22:44] I think criezy mentioned he would have a look this weekend [22:45] omer_mor (~Omer@46-117-132-33.bb.netvision.net.il) joined #scummvm. [22:53] fourth time he had to reload the game already [22:55] <_sev> rsn8887: qould it be possible to follow our code formatting conventions? [22:56] _sev: But I only made changes to the existing code, do you want me to reformat the whole thing, or only my changes? [22:57] <_sev> rsn8887: 99% of our changes are not following it, while the rest of the current code does [22:57] <_sev> rsn8887: for instance: _km.x/_km.multiplier -> _km.x / _km.multiplier [22:58] <_sev> _km.y_vel+=_km.multiplier; -> _km.y_vel += _km.multiplier; [22:58] <_sev> float analogY=(float) (_km.y_vel * vel_to_axis); -> float analogY = (float)(_km.y_vel * vel_to_axis); [22:59] <_sev> if (magnitude >= deadZone) [22:59] <_sev> { [22:59] _sev: Ah I see, let me fix that really quick. [22:59] <_sev> -> if (magnitude >= deadZone) { [22:59] <_sev> etc [23:00] <_sev> our changes = your changes [23:00] is there a formatter? [23:00] Or shall I do it by hand? [23:00] freanux (~freanux@unaffiliated/freanux) joined #scummvm. [23:07] Lightkey: if you are watching, can you keep track of where it is breaking? [23:07] its probably impossible to figure out what exactly is going on, but its better than nothing, that sounds really crappy [23:07] it's already over [23:07] mostly just getting stuck [23:07] getting stuck like the ego wont move? [23:07] yes [23:08] bummer [23:09] the pathfinder has some issues with qfg4 too, if you go to enter your room in the inn, which is up a flight of stairs, the ego just walks in a straight line to the door, ignoring that it shouldnt be able to levitate up and clip through a balcony [23:09] i mean, maybe if you are magician class. maybe. [23:09] oh, they were playing LB1 using ScummVM and it broke? [23:09] and once the room where the flower pot crashed to the floor was fine after revisiting it [23:11] while I don't remember that specific case, it's not too uncommon for things to magically reset themselves in LB1 I think [23:11] but maybe that's intentional, he just assumed it was a bug :-) [23:11] body on the floor, leave room, come back, body gone [23:12] bless those zombie bones [23:16] <_sev> rsn8887: there are settings for astyle on our Wiki [23:17] _sev: Do you want me to push a second commit or squash? [23:18] <_sev> squash please [23:18] _sev: no problem, thanks for looking at this. [23:22] Vampire0_ (~Vampire@jEdit/Vampire) joined #scummvm. [23:23] Vampire0 (~Vampire@jEdit/Vampire) left irc: Ping timeout: 255 seconds [23:29] RLP__ (~D0SFreak@c-73-7-33-53.hsd1.ga.comcast.net) joined #scummvm. [23:32] D0SFreak (~D0SFreak@c-73-7-33-53.hsd1.ga.comcast.net) left irc: Ping timeout: 255 seconds [23:32] Lightkey: when did it happen? watching the video right now [23:34] snover: there is no pathfinder in LB1 though [23:35] well then i guess it isnt that [23:37] they may have also discovered an original bug [23:37] qfg1 ega also had some issue when you were sneaking and then went into the castle [23:37] in some cases ego froze [23:37] had nothing to do with us [23:38] _sev: ok done. [23:38] _sev: Please tell me if you need anything more. [23:39] oh right and there actually were such bugs in LB1 already [23:39] when you positioned yourself a certain way down the stairs and checked the knight armor, then ego may get stuck in certain places [23:40] i fixed that with a script patch some time ago [23:40] also happend when using original interpreter [23:40] *happened [23:42] ah one of the secret passages [23:42] https://www.twitch.tv/videos/122787128 [23:42] at around 25:00 [23:42] and yes looks like a script bug on first sight [23:43] engine still reacts (menu accessible), ego is stuck [23:44] i hope there weren't more issues... [23:46] waltervn (~waltervn@541B2DBA.cm-5-4a.dynamic.ziggo.nl) left irc: Quit: Leaving [23:52] ha, i reproduced it [23:52] now let's try in dosbox [23:52] it's really some special placement, i had to try various times to make it happen [23:54] hah :P [23:56] dreammaster (~dreammast@c-73-149-116-247.hsd1.ma.comcast.net) joined #scummvm. [23:56] #scummvm: mode change '+o dreammaster' by ChanServ!ChanServ@services. [23:56] http://i.imgur.com/21d3OsY.png [23:59] _sev: Ok NOW it should be done. Ok tell me if there's any other problem with it. I squashed all formatting changes etc. [00:00] --- Sat Feb 18 2017