[00:24:07] --> Kirben has joined #nuvie
[01:34:23] <servus> I need more to do! Lighting is entirely done now.
[03:16:15] --> Yuv422 has joined #nuvie
[03:16:19] <Yuv422> hi
[03:20:43] <servus> Hiya. want to implement tiled lighting?
[03:21:11] <Yuv422> sure
[03:21:51] <servus> OK, the only files needing changes are screen.cpp and screen.h, I'll post changes.
[03:22:04] <Yuv422> cool
[03:27:07] <servus> http://sourcepost.sytes.net/sourceview.aspx?source_id=9909
[03:27:27] <servus> I hope you don't think my implementation is silly :-)
[03:30:37] <Yuv422> where do you set UseOriginalLighting?
[03:30:43] <servus> Screen::Screen
[03:30:48] <servus> It's just set to true there for now.
[03:30:55] <Yuv422> ah k
[03:31:01] <servus> It can be changed at runtime and the effects will be immediate...
[03:31:16] <Yuv422> cool
[03:31:20] <servus> I just used the top portion of the standard lightmap buffer for the tile information
[03:31:46] <Yuv422> 11x11 bytes?
[03:31:56] <servus> That's right.
[03:32:34] <servus> The game has 3 globe styles, but I made 6 because during dusk and dawn the avatar's 'globe' dilates or contracts
[03:32:52] <Yuv422> right
[03:32:54] <servus> The first globe is just a single tile of 2, so I hardcoded that.
[03:35:41] <Yuv422> this code would need to be changed if we went for a full screen map mode.
[03:36:04] <servus> Just replace all occurences of 11 with a variable
[03:36:15] <Yuv422> I really think the darkness logic should be moved out of screen
[03:36:20] <servus> My code gets ugly when I try to copy someone else's style, sorry :-)
[03:36:23] <servus> Into what, then?
[03:36:23] <Yuv422> well all except the blitting code
[03:36:35] <servus> Mapwindow?
[03:36:38] <Yuv422> probably into MapWindow
[03:36:39] <Yuv422> yeah
[03:36:54] <Yuv422> what do you think?
[03:37:17] <Yuv422> we don't have to do it now
[03:37:22] <Yuv422> just a thought for later.
[03:37:37] <servus> Sure
[03:38:06] <Yuv422> did you make your changes on a developer CVS sandbox?
[03:38:49] <Yuv422> using your SourceForge account?
[03:39:02] <servus> I haven't touched CVS
[03:39:15] <servus> SBX will be happy to know that during night the code pulls 150MHz now
[03:39:28] <Yuv422> cool
[03:39:43] <Yuv422> I guess what I mean is can you check those changes into CVS yourself?
[03:40:04] <servus> Uh oh, you're trying to make me learn
[03:40:43] <Yuv422> well if you want to contribute regularly I can't import all your changes. ;)
[03:40:56] <Yuv422> CVS is your friend.
[03:40:59] <servus> What about me overwriting other changes? I didn't build on the newest Screen files I think
[03:41:23] <Yuv422> hehe
[03:41:35] * servus feels he is missing something.
[03:41:39] <Yuv422> ok maybe you should send me the changes for now
[03:41:47] <Yuv422> till you get used to using cvs
[03:42:02] <servus> Will CVS do a diff and just update the stuff I changed?
[03:42:32] <Yuv422> cvs will first merge others changes into your source tree
[03:43:05] <Yuv422> then when you've checked that it still compiles it will commit your changes.
[03:43:47] <Yuv422> did you use your sourceforge login when you got the nuvie code from cvs?
[03:44:06] <servus> Nope...
[03:44:21] <servus> How about I checkout now, and merge the code myself, then update.
[03:44:32] <Yuv422> ok
[03:45:13] <Yuv422> when you are ready to commit your changes maybe you could send me the cvs diff output just to double check that you are on track.
[03:45:53] <Yuv422> also remember that the files use unix style line endings
[03:45:58] * servus googles for CVS tutorials... I've never actually had to use this except for simple checkouts
[03:46:25] <Yuv422> so you might need to make sure your editor hasn't converted the line endings to windows format. ;)
[03:46:45] <servus> What's the nix command to do the conversion of line endings?
[03:49:51] <Yuv422> any number of apps will do that for you
[03:51:58] <Yuv422> what editor do you use?
[03:52:13] <Yuv422> it might support unix style line endings
[03:54:07] <servus> There's a command meant just for this available on pretty much every distro... Oh well, I'm still trying to log into CVS :-)
[03:55:35] <servus> $ cvs -d:pserver:firstname.lastname@example.org:/cvsroot/nuvie login
[03:55:45] <servus> But no good! cvs [login aborted]: end of file from server (consult above messages if any) after I enter my password
[04:02:07] <Yuv422> did you setup SSH
[04:02:47] <servus> Yes, but I'm doing this from local, hmm
[04:03:09] <Yuv422> local?
[04:03:30] <servus> I don't SSH to SF before trying this...What would be the point?
[04:03:37] <Yuv422> no
[04:03:44] <servus> Cygwin is so weird sometimes
[04:03:46] <Yuv422> you tunnel cvs over ssh
[04:03:57] <Yuv422> just type this
[04:04:02] <servus> Ooh, I like these
[04:04:06] <Yuv422> export CVS_RSH=ssh
[04:05:28] <Yuv422> oh and no pserver
[04:06:05] <Yuv422> have a look at the developer instructions here.
[04:06:17] <Yuv422> http://sourceforge.net/cvs/?group_id=76419
[04:06:36] <Yuv422> cvs -z3 -d:ext:email@example.com:/cvsroot/nuvie co nuvie
[04:08:33] <servus> Checking out! Thanks for the help, I feel stupid..
[04:13:28] <servus> Eek, doesn't compile no MSVC... Doesn't like round() or #warning
[04:15:08] <Yuv422> we should be using roundf() now
[04:16:42] <servus> What's it do? Round up or down? I can choose to simply not cvs-update files I don't want to, right?
[04:17:12] <Yuv422> how were you comipiling it before?
[04:17:33] <Yuv422> maybe you need to turn on c99 compatibility
[04:19:14] <servus> 'Turn on'? *grin*
[04:20:44] <Yuv422> ...please!
[04:21:16] <servus> No can do. Simple answer for me is to put #define roundf in msvc_kludges.h
[04:21:22] <servus> Good enough? :)
[04:21:46] <Yuv422> so msvc doesn't have roundf()?
[04:21:50] <servus> That's right.
[04:22:04] <Yuv422> do you need to link a maths lib or something?
[04:22:32] <servus> #define roundf(a) ((fmod(a,1)<0.5)?floor(a):ceil(a))
[04:22:36] <servus> It's simply not in my libraries
[04:22:40] <Yuv422> k
[04:23:48] <servus> There, compiles, now to get it to link... *grin* I suppose no one else uses msvc on the team...
[04:24:20] <Yuv422> we have two msvc maintainers
[04:24:46] <Yuv422> they might not have had a chance to compile it lately
[04:25:06] <Yuv422> I must admit I tried to compile it at work the other day on msvc and ran int the same issue
[04:25:14] <Yuv422> but didn't get around to fixing it
[04:26:11] <servus> eggmanager.cpp and .h were not included in the makefile
[04:26:18] <servus> All compiled.
[04:27:09] <Yuv422> cool
[04:27:47] <servus> See, somethings I *can* do! :-)
[04:28:12] <Yuv422> no one's doubting your abilities servus. :)
[04:28:29] <Yuv422> I'm going out for a bit
[04:28:43] <Yuv422> talk to you later
[04:30:27] <servus> Perhaps I am *grin* bye
[04:31:09] <Yuv422> cya
[04:31:10] <-- Yuv422 has left IRC ("[BX] The Power Rangers use BitchX. Shouldn't you?")
[04:47:39] <servus> Oh that's strange, it's showing my game_type as 0 (none)
[05:21:39] <servus> CVS commit is saying I modified files I didn't! Help!
[05:33:12] <servus> How entirely scary! OK, thing I've got everything sorted out now, and it should all be committed... Hope I did this right :-)
[07:07:55] <Kirben> hmm I'm get a lot of compile errors now;
[07:08:02] <Kirben> screen/Screen.cpp:590: no matching function for call to `MapWindow::
[07:08:02] <Kirben> get_tile_manager()'
[07:08:14] <Kirben> screen/Screen.cpp:663: no matching function for call to `MapWindow::
[07:08:14] <Kirben> get_clip_rect()'
[07:08:18] <Kirben> etc..
[07:08:23] <servus> Hmm
[07:08:44] <servus> cvs 'update' just shows differences between you and CVS right?
[07:10:04] <Kirben> No, I always do a -C to override any local changes.
[07:10:45] <servus> I don't even see my changes in the CVS tree at all
[07:12:50] <servus> OK, I guess my problem is that I didn't update mapwindow.h
[07:13:19] <servus> Try now
[07:14:22] <Kirben> Now I get:
[07:14:24] <Kirben> screen/Screen.cpp: In member function `void Screen::drawalphamap8globe(short
[07:14:25] <Kirben> int, short int, short unsigned int)':
[07:14:25] <Kirben> screen/Screen.cpp:621: `min' undeclared (first use this function)
[07:14:26] <Kirben> screen/Screen.cpp:621: (Each undeclared identifier is reported only once for
[07:14:27] <Kirben> each function it appears in.)
[07:14:46] <servus> I thought min() was c99
[07:15:00] <servus> Pleh, change it to MIN()
[07:15:08] <servus> Sorry, compiler differences... :-)
[07:16:28] <Kirben> Compiles fine now.
[07:22:37] <servus> Hope it looks alright!
[08:12:19] --> SB-X has joined #nuvie
[08:44:19] <-- SB-X has left IRC ()
[08:51:22] --> SB-X has joined #nuvie
[08:51:51] <servus> It works, right, Kirben? :-)
[08:52:05] <Kirben> Yes
[08:52:10] <servus> Superb.
[09:01:20] <SB-X> hi all
[09:02:45] <servus> Hlo SB-X, tiled lighting is in CVS
[09:05:42] <SB-X> yeeah
[09:05:48] <SB-X> it's like i am playing the original now
[09:05:53] <SB-X> except the button bar under the mapwindow
[09:05:59] <SB-X> cool
[09:54:27] <servus> Fast enough?
[09:54:51] <servus> The globes I created should be 85% true to the original, but they are *very* easy to change,.
[10:01:41] --> sbx has joined #nuvie
[10:01:41] <-- SB-X has left IRC (Read error: 104 (Connection reset by peer))
[10:02:25] <sbx> it seems as fast with darkness as with no darkness
[10:32:57] <servus> Great:-)
[10:33:05] <servus> Try the smooth lighting? It should be nearly as fast.
[10:45:25] <sbx> not since yesterday
[10:54:15] <servus> Just change the variable in Screen::Screen for UseOriginalLighting to false
[10:54:26] <servus> You can change that at runtime and have instant lighting change, btw.
[11:13:03] --> EsBee-Eks has joined #nuvie
[11:13:04] <-- sbx has left IRC (Read error: 104 (Connection reset by peer))
[11:16:27] <EsBee-Eks> the other kind is working wlel
[11:16:29] <EsBee-Eks> what do you think the config option should be called?
[11:16:44] <EsBee-Eks> well*
[12:02:27] <servus> UseOriginalLighting?
[12:06:35] <EsBee-Eks> so far they use the format "use_original_lighting"
[12:06:41] --- EsBee-Eks is now known as SB-X
[12:21:34] <servus> Well there you go
[12:35:00] --> sbx has joined #nuvie
[12:35:00] <-- SB-X has left IRC (Read error: 104 (Connection reset by peer))
[13:36:22] --> EsBee-Eks has joined #nuvie
[13:36:23] <-- sbx has left IRC (Read error: 104 (Connection reset by peer))
[13:37:18] <-- servus has left IRC ()
[14:22:35] --> SB-X has joined #nuvie
[14:40:25] <-- EsBee-Eks has left IRC (Read error: 110 (Connection timed out))
[14:55:50] --> sbx has joined #nuvie
[14:55:50] <-- SB-X has left IRC (Read error: 104 (Connection reset by peer))
[16:06:41] --> EsBee-Eks has joined #nuvie
[16:06:42] <-- sbx has left IRC (Read error: 104 (Connection reset by peer))
[17:15:32] --> sbx has joined #nuvie
[17:15:33] <-- EsBee-Eks has left IRC (Read error: 104 (Connection reset by peer))
[17:27:42] <sbx> i could add sundials if i knew the tile numbers
[17:28:29] <sbx> besides that everything is there and it is updating the tile each hour (to random things)
[17:29:01] <-- sbx has left IRC ("...")
[18:26:55] <-- Kirben has left IRC (Read error: 104 (Connection reset by peer))
[23:33:03] --> Yuv422 has joined #nuvie
[23:33:08] <Yuv422> hi wjp
[23:33:32] <Yuv422> SB-X: The sundial tiles start at 328
[23:39:56] <wjp> hi
[23:53:24] <Yuv422> Argh! I've got to go to work on a Sunday. :(
[23:53:26] <Yuv422> cya
[23:53:27] <-- Yuv422 has left IRC ("Erection reset by queer")
[23:58:45] --> Kirben has joined #nuvie