#nuvie@irc.freenode.net logs for 24 Jul 2007 (GMT)

Archive Today Yesterday Tomorrow
Nuvie homepage

[09:14:15] --> SB-X has joined #nuvie
[09:42:01] --> Yuv422 has joined #nuvie
[09:42:54] <SB-X> hey yuv
[09:45:32] <Yuv422> Hey SB-X
[09:45:36] <Yuv422> How's it going?
[09:46:48] <SB-X> im trying to figure out why pop3 mail from my isp isn't working
[09:47:10] <SB-X> all the nuvie-cvs messages from the past 2 weeks are on the mail server
[09:47:27] <Yuv422> hmm, that's no good
[09:47:31] <SB-X> i can only read them through their web page
[09:49:29] <SB-X> do you have any idea how the cvs merge will work?
[09:50:44] <Yuv422> we can merge the branches in cvs I believe then just fix any issues
[09:50:58] <Yuv422> checkout the head merged with the scripting branch
[09:51:09] <Yuv422> then recommit into the head
[09:51:43] <SB-X> is there a command for that?
[09:53:26] <Yuv422> cvs checkout -r HEAD -j branch_name nuvie
[09:53:32] <Yuv422> something like that
[09:53:47] <Yuv422> I think you might need to copy new files over manually though
[09:54:34] <SB-X> i was thinking of manually backporting all the changes to head since scripting was created over to scripting, and then after resolving conflicts in scripting, merging the result back to head branch
[09:55:18] <Yuv422> yeah that would work
[09:55:21] <SB-X> but if there's a command to do it easier lets do it that way instead
[09:55:44] <Yuv422> I don't mind doing it
[09:55:52] <SB-X> i guess either way we have some work to do
[09:57:06] <Yuv422> we'll need to write a lot of ChangeLog Entries
[09:57:40] <SB-X> well you can if you really want to, i was going to do it once im able to download all the nuvie-cvs logs
[09:57:56] <SB-X> why not just "Merged in scripting branch." ? ;)
[09:58:04] <Yuv422> hehe
[09:58:18] <Yuv422> I'd like to catalog what went in.
[09:58:39] <SB-X> that can all be in one entry though
[09:58:55] <Yuv422> yeah it doesn't need to be multiple entries
[09:58:56] <SB-X> you havn't kept a changelog for scripting branch
[09:59:10] <Yuv422> I really should have
[09:59:38] <SB-X> eh it's ok, we have cvs commit messages
[10:00:00] * SB-X goes to his isp's support site to look up the pop3 server address.
[10:01:33] <Yuv422> bbl
[10:02:33] <-- Yuv422 has left IRC ()
[10:28:48] --> Yuv422 has joined #nuvie
[10:37:56] <SB-X> Yuv422 wb
[10:41:21] * SB-X was able to get his mail now. The pop3 port setting was wrong in sylpheed.
[10:44:13] <SB-X> (they sent a message saying to change it to something else, but they must have changed their minds and went back to the default port without any notification)
[11:16:34] <Yuv422> hehe
[11:39:36] <Yuv422> I was looking through game.exe today in IDA and I found a switch statement with 100 cases!!
[11:40:32] <Yuv422> I was talking to one of the developers of MD a couple of years agao and he was saying that the original u6 game.exe was a big mess of switch statements
[11:53:34] <Yuv422> C Event.cpp
[11:53:34] <Yuv422> C Event.h
[11:53:35] <Yuv422> C Magic.cpp
[11:53:35] <Yuv422> C Magic.h
[11:53:35] <Yuv422> C MapWindow.cpp
[11:53:35] <Yuv422> C ObjManager.cpp
[11:53:37] <Yuv422> C ObjManager.h
[11:53:39] <Yuv422> C actors/Actor.cpp
[11:53:41] <Yuv422> C actors/U6Actor.cpp
[11:53:43] <Yuv422> C screen/GamePalette.h
[11:53:45] <Yuv422> C usecode/U6UseCode.cpp
[11:53:47] <Yuv422> C usecode/UseCode.cpp
[12:02:48] <wjp> merging?
[12:02:56] <Yuv422> hi wjp
[12:02:58] <Yuv422> yeah
[12:03:00] <wjp> hi
[12:03:07] <Yuv422> just doing a trial run
[12:12:53] <SB-X> the switch in ConverseInterpret.cpp has 38
[12:13:13] <Yuv422> :-)
[12:13:24] <SB-X> that's probably the biggest in nuvie
[12:14:14] <SB-X> oh there's the one in Event too
[12:15:22] <SB-X> 53
[12:16:12] <Yuv422> hehe
[12:16:26] <Yuv422> that's big
[12:16:45] <SB-X> we're about to replace it anyway
[12:16:57] <Yuv422> yeah
[12:17:49] --- SB-X is now known as sbx|away
[12:17:54] --- sbx|away is now known as SB-X
[12:18:01] <-- SB-X has left IRC (Remote closed the connection)
[12:18:20] --> SB-X has joined #nuvie
[12:30:22] <-- SB-X has left IRC ("*casts gate travel*")
[12:32:40] --> SB-X has joined #nuvie
[12:35:14] <Yuv422> ok I've got it running in HEAD
[12:35:23] <Yuv422> but there were some strange merge results
[12:35:37] <Yuv422> so I'd like to compare the code externally
[12:35:40] <SB-X> you've got it *running*? that was fast
[12:35:46] <Yuv422> to double check what's going in
[12:36:00] <SB-X> can I see the results?
[12:36:02] <Yuv422> there weren't many issues
[12:36:17] <Yuv422> want a copy of the merge
[12:36:19] <Yuv422> ?
[12:36:23] <SB-X> sure
[12:36:37] <Yuv422> ok just a sec
[12:36:46] <SB-X> shall i write up a list of changes? im looking at the commit logs now
[12:36:57] <Yuv422> cool
[12:37:15] <SB-X> fine, i'll do that, then send it to you to clean up
[12:37:22] <SB-X> or edit as you wish
[12:37:36] <Yuv422> righto, thanks
[12:38:51] <SB-X> you're welcome
[12:38:53] <Yuv422> I justed merged against HEAD
[12:39:00] <Yuv422> I'm not sure if that is a valid tag
[12:39:05] <SB-X> somebody has to do it
[12:39:08] <SB-X> HEAD?
[12:39:12] <SB-X> you said it works :)
[12:39:38] <Yuv422> hopefully HEAD is actually the head of the main branch
[12:39:42] <SB-X> hehe
[12:39:53] <Yuv422> I have a Tag file in my CVS directories
[12:40:03] <SB-X> or you could go to the main branch and merge against eric_scripting_branch
[12:40:24] <Yuv422> maybe I checked out a new branch called HEAD
[12:40:34] <Yuv422> I uess we could just delete the Tag files
[12:40:43] <Yuv422> or remove the sticky tags
[12:42:32] <SB-X> did you want to name the Obj functions to change engine location "in_inventory", "in_container", "on_map"? in main i'd renamed them to "set_in_inventory", "set_in_container", and "set_on_map" because I thought it was consistent with other names and more obvious that way
[12:43:30] <Yuv422> yeah that makes sense
[12:43:38] <Yuv422> that was one of the merge conflicts
[12:43:39] <Yuv422> ;-)
[12:44:39] <SB-X> ah k ;)
[12:45:51] <SB-X> i see you sorted it out already then, i knew there would be other similar conflicts but you can figure out which version is better or more up-to-date
[12:55:58] <Yuv422> I'm off to bed now
[12:56:13] <SB-X> ok
[12:56:15] <Yuv422> cya
[12:56:19] <SB-X> do you want compile fixes logged?
[12:56:26] <SB-X> saved
[12:56:41] <Yuv422> hmm I guess just use your judgement
[12:56:47] <SB-X> !
[12:56:49] <Yuv422> if it is trivial then maybe not
[12:56:55] <Yuv422> :-)
[12:57:06] <SB-X> hehe i dunno i might delete a lot then...
[12:57:09] <SB-X> bye
[12:57:21] <Yuv422> I guess we haven't logged that low level stuff much in the past
[12:57:28] <SB-X> nope
[12:57:49] <Yuv422> got to see the trees through the forest. ;-)
[12:57:51] <Yuv422> righto
[12:57:52] <Yuv422> cya
[12:58:15] <SB-X> cya
[12:58:16] <-- Yuv422 has left IRC ()
[13:49:17] <-- Kirben has left IRC (Read error: 110 (Connection timed out))
[15:31:59] <-- SB-X has left IRC ("*casts gate travel*")
[22:19:51] <-- luteijn has left IRC (Read error: 104 (Connection reset by peer))