*** tpb has joined #tp | 00:00 | |
*** ChanServ sets mode: +o tpb | 00:00 | |
*** jotham has quit IRC | 00:22 | |
*** jotham has joined #tp | 00:28 | |
JLP | ahoy all | 01:50 |
---|---|---|
nash | heyo JLP | 01:51 |
* JLP goes readin a new blog post about galciv and 4x - http://selfdeprecatingjournalism.blogspot.com/2007/05/galactic-civilisation-2-war-report-and.html | 01:52 | |
tpb | <http://ln-s.net/Z2M> (at selfdeprecatingjournalism.blogspot.com) | 01:52 |
nash | Looks cool - but a long read | 02:04 |
CIA-3 | mithro metaserver-lite * r6c7bbec81813 /index.php: Changed to tp+ format. | 02:06 |
mithro | nash: arg! I can't get the thing to coredump anymore | 02:07 |
mithro | opps, there is goes | 02:08 |
nash | mithro: I bet most will go away when either a) I stop it looking beyond the end of messages or b) you send the extra data with objects | 02:10 |
*** Demitar has quit IRC | 02:12 | |
mithro | nash: well, we should both be doing them :) | 02:12 |
mithro | nash: you have email | 02:12 |
nash | mithro: Yes | 02:13 |
mithro | nash: I think I know what is causing your problem however | 02:13 |
nash | mithro: which address? | 02:13 |
nash | hmm? | 02:13 |
mithro | it's related to the problems that was occuring with orders | 02:14 |
mithro | Brett Nash <[email protected]> | 02:14 |
mithro | opps that probably wasn't a good thing to put on the channel :/ | 02:14 |
mithro | JLP: ping? | 02:15 |
JLP | mithro: pong | 02:15 |
mithro | JLP: you going to comment on the blog? | 02:15 |
nash | mithro: I'll live | 02:15 |
JLP | mithro: probably | 02:16 |
mithro | JLP: I like their ideas | 02:16 |
mithro | probably something nash's client could do :) | 02:16 |
JLP | mithro: yeah me too | 02:16 |
nash | mithro: That's the idea ;-) | 02:16 |
JLP | mithro: i was also reading some other guys blog a few days ago and his idea was to put some modifier objects into space between planets, which woul effect some ships properties while ship is in the area | 02:17 |
* mithro has to head to a tutorial | 02:18 | |
mithro | nash: any luck getting my mail? | 02:18 |
nash | mithro: Yes | 02:21 |
mithro | see ya! | 02:21 |
nash | bye | 02:21 |
nash | And evas CVS now has a direct draw engine... | 02:22 |
nash | My client will soon be win32 happy... Any win32 people who care to take a look in a week or two? | 02:22 |
*** Demitar has joined #tp | 02:36 | |
mithro | so nash, when will add a theme which doesn't look so horrible! | 02:41 |
nash | mithro: Feel free ;-) | 02:41 |
nash | It's mostly in the edje files, so it can be replaced easily. | 02:41 |
nash | If anyone wants to sit down and do it, I'm happy to help with any technical problems | 02:42 |
nash | Personally I'm more worried about the core features first. | 02:42 |
nash | The system can switch themes at start up (I can fix it to do it run time too) | 02:42 |
mithro | nash: what about Mac? | 02:45 |
nash | They can use GL ;-) | 02:46 |
nash | Or X11 | 02:47 |
JLP | ths is the comment i'm about to post at that blog | 02:50 |
JLP | Hi, I'm one of the developers at Thousand Parsec (a free and open source framework for creating 4X games) and I like your idea about fixing the queue issue and also like the videos you have attached at the end about GalCivII. If you don't mind I will add a link to this blog post to our Wiki where we started collecting different ideas so other developers can refer to them. | 02:50 |
JLP | BTW if you are interested you can also join us on our IRC channel (#tp on freenode.net) or maybe join our mailing lists. Maybe you have some other ideas that would help make 4X better, or maybe you can even help us programming, testing or in some other way. Of course you can just join us and chat with other people who love 4X. | 02:50 |
mithro | nash: to bad galaxie crashs so much ) | 02:50 |
mithro | s/)/;) | 02:50 |
nash | mithro: Works fine for tpserver-cpp | 02:50 |
nash | Too bad the server I'm talking to does not comply to the published standards. | 02:50 |
mithro | crashing on nocompliance is pretty bad :P | 02:51 |
* nash wonders if he should get the author of tpserver-py to talk to the authors of TP03 protocol some time... | 02:51 | |
nash | mithro: it will get there... I implemented it for features a lot faster then I would like, whihc means some of the infrastructure wasn't as robust as it shoudl be | 02:52 |
nash | Actually I suspect you are mostly seeing the same issue again and again, rather then multiple issues - mainly searching beyond the end of frames | 02:53 |
* nash will note that tpserver-cpp had the same problem until recently ;-) | 02:53 | |
mithro | nash: tpserver-cpp has lots of problems ;) | 02:55 |
nash | mithro: Anyway, I want to fix up the bulk of order types | 02:55 |
nash | Mostly done now. I'm ignoring the reference paramaters for now. | 02:55 |
nash | Once that is done, I shall nail the problem with going of hte end of buffers. | 02:56 |
nash | And then it should be a bit more challenging for you to crash it | 02:56 |
nash | Ironically I only need to fix two functions... unfortunately they are probably the most frequently called functions... | 02:59 |
mithro | nash: couldn't you just assert the frame length equals what you guess? | 03:02 |
nash | Unfortunatly the callback doesn't knwo the length of the frame in teh callbakc which is the big big issue | 03:03 |
*** llnz has joined #tp | 03:05 | |
mithro | hey llnz | 03:06 |
*** llnz changes topic to "www.thousandparsec.net | 90,016 lines of code (minus 12k for libltdl) | GSoC started!" | 03:06 | |
llnz | hi mithro | 03:06 |
mithro | llnz: had a dearth of activity today | 03:06 |
llnz | i noticed | 03:09 |
llnz | i guess the metaserver needs updating though | 03:09 |
nash | So anyway mithro... you doing the new artwork? | 03:12 |
xdotx | ooo gsoc did just start! | 03:19 |
nash | xdotx: GET TO WORK YOU LAZY BUM! | 03:20 |
nash | ;-) | 03:20 |
xdotx | eep! | 03:20 |
* xdotx bangs on keyboard | 03:20 | |
*** dmpayton has quit IRC | 03:20 | |
xdotx | llnz: i got some questions for ya | 03:20 |
llnz | sure, ask away | 03:21 |
nash | that was quick ;-) | 03:21 |
*** xdotx has quit IRC | 03:23 | |
*** xdotx has joined #tp | 03:23 | |
xdotx | ack | 03:24 |
mithro | off how mone | 03:24 |
xdotx | llnz: inlining - i didn't notice it used/requested anywhere. are we just going to let gcc do how it wants? | 03:25 |
llnz | xdotx: yes | 03:25 |
xdotx | llnz: k. and what about namespaces? are we not using them? | 03:26 |
*** tuna-fish has quit IRC | 03:26 | |
llnz | the server doesn't exactly need speed optomisations at this time | 03:26 |
llnz | namespaces..... welll..... | 03:26 |
llnz | If you want, you can put your ruleset code in a namespace | 03:26 |
llnz | tpserver-cpp does not currently use one for it's code though | 03:26 |
* nash notes inlineng is often a sign that you need to rethink your algorithms and data structures... | 03:27 | |
xdotx | nash: how do you figure? just because it's a small improvement where usually your algorithms and types are likely a better source of optimization? | 03:28 |
nash | xdotx: Exactly that. | 03:31 |
*** xdotx has quit IRC | 03:31 | |
*** xdotx has joined #tp | 03:31 | |
nash | xdotx: Also any decent compiler generally does a better job of inlining then humans... | 03:31 |
xdotx | nash: yeah, that was my understanding | 03:32 |
llnz | easier to maintain too | 03:32 |
nash | Indeed - and less code bloat | 03:32 |
xdotx | fair enough. but there's not really any reason for not using namespaces? | 03:33 |
nash | I'd agree with that... But I'm also a C programmer, so moist of my namespaces involve <libname>_ ;-) | 03:34 |
llnz | xdotx: the lack of a namespace is something i had thought about changing | 03:34 |
xdotx | llnz: i'd be happy to help change it :) | 03:35 |
*** nash has left #tp | 03:35 | |
* llnz might not be around consistently for a bit, S/O here | 03:36 | |
*** pschulz01 has quit IRC | 03:38 | |
*** jotham has quit IRC | 03:41 | |
llnz | but i am here | 03:43 |
xdotx | llnz: got another minor coding question :) | 03:43 |
llnz | ok | 03:44 |
*** mithro has quit IRC | 03:44 | |
xdotx | llnz: sometimes i see virtual restated in a derived class, sometimes i don't. is there a preference? | 03:45 |
llnz | umm.... | 03:45 |
llnz | generally like restated | 03:47 |
xdotx | easy enough :) | 03:48 |
llnz | cool | 03:55 |
*** Demitar has quit IRC | 03:58 | |
xdotx | llnz: ah, last question! how does the conf file for the server load the ruleset? | 04:02 |
xdotx | llnz: i noticed the ruleset param in the conf file and was played around getting it to load either minisec or mtsec, but obviously i'd like to load my own ;) | 04:03 |
xdotx | was played... i know english, i swear. | 04:03 |
llnz | hehe | 04:04 |
llnz | the ruleset param gives the name of the ruleset, or slightly more precisely, the bit between "lib" and ".la" in the rulesetlib_LTLIBRARIES line of Makefile.am | 04:05 |
xdotx | ah, that's what i suspected! | 04:06 |
llnz | or... | 04:06 |
llnz | the path, including the lib<name> to the module | 04:07 |
llnz | for example: ../modules/games/rfts/.libs/librfts | 04:07 |
xdotx | i tried throwing in "rfts" there but it didn't load the ruleset. can i assume it's because my ruleset is effectly empty? | 04:08 |
llnz | yes | 04:08 |
xdotx | i can't remember if i tried it with a full path | 04:08 |
xdotx | what all needs to be implemented just to get it loading? | 04:08 |
*** jotham has joined #tp | 04:11 | |
jotham | Debian Etch was a really plesant install | 04:12 |
xdotx | oo good! i was considering installing it on my little PPC | 04:13 |
llnz | xdotx: you will need something like the extern 'C' block | 04:14 |
*** Demitar has joined #tp | 04:14 | |
llnz | as in minisec.cpp and mtsec.cpp | 04:14 |
xdotx | llnz: ah. i see | 04:15 |
xdotx | tricky | 04:15 |
llnz | about that is probably the next bit i add to the ruleset dev book | 04:16 |
xdotx | sounds good | 04:16 |
*** mithro has joined #tp | 04:17 | |
xdotx | alright. i'll probably have to do that in the morning. i should get to bed. | 04:20 |
xdotx | thanks llnz | 04:20 |
llnz | no prob | 04:22 |
* llnz is afk | 04:22 | |
*** xdotx has quit IRC | 04:23 | |
llnz | back | 04:44 |
mithro | hey llnz | 05:31 |
mithro | how goes everything? | 05:31 |
llnz | not too ba | 05:47 |
llnz | d] | 05:47 |
mithro | ~seen nash | 06:01 |
tpb | mithro: nash was last seen in #tp 2 hours, 27 minutes, and 9 seconds ago: <nash> I'd agree with that... But I'm also a C programmer, so moist of my namespaces involve <libname>_ ;-) | 06:01 |
*** brx has joined #tp | 06:43 | |
mithro | wb brx | 06:45 |
brx | happy SoC | 06:46 |
llnz | hi brx | 06:47 |
mithro | brx: thanks, how goes your project? | 06:52 |
brx | I just got up! | 06:53 |
mithro | excuses excuses :P | 06:57 |
jotham | sleep is the worst excuse | 07:06 |
*** nash has joined #tp | 07:11 | |
* nash waves | 07:13 | |
llnz | wb nash | 07:13 |
*** pschulz01 has joined #tp | 07:13 | |
nash | how is life? | 07:14 |
mithro | hey nash | 07:14 |
nash | heyo mithro | 07:14 |
mithro | my theory didn't seem to pan out | 07:14 |
nash | Which one was that? | 07:15 |
mithro | that I wasn't sending the extra data | 07:16 |
nash | You are sending it? | 07:16 |
mithro | as far as I can see I'm actually sending it | 07:16 |
nash | Hmm... strange | 07:16 |
nash | I'll look into it a bit more shortly | 07:17 |
mithro | <class 'tp.netlib.objects.ObjectExtra.Fleet.Fleet'> (0, [(1, 3)], 0) | 07:17 |
mithro | Sending: <Fleet @ 0x85f294c (seq: 10 length: 152)> | 07:17 |
mithro | Sending: 0x54(T) 0x50(P) 0x30(0) 0x33(3) 0x0 0x0 0x0 0xa 0x0 0x0 0x0 0x7 0x0 0x0 0x0 0x98 0x0 0x0 0x0 0x3 0x0 0x0 0x0 0x4 0x0 0x0 0x0 0x10 0x6e(n) 0x61(a) 0x73(s) 0x68(h) 0x20( ) 0x46(F) 0x69(i) 0x72(r) 0x73(s) 0x74(t) 0x20( ) 0x46(F) 0x6c(l) 0x65(e) 0x65(e) 0x74(t) 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x3 0x0 0x0 0x0 0x0 0x85 0xef 0x4 0x90 0x0 0x0 0x0 0x0 0x1c 0xab 0x4f(O) 0x48(H) 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x | 07:17 |
mithro | 0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x5 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x1 0x0 0x0 0x0 0x3 0x0 0x0 0x0 0x4 0x0 0x0 0x0 0x5 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x46(F) 0x5a(Z) 0x2e 0xa 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x1 0x0 0x0 0x0 0x1 0x0 0x0 0x0 0x3 0x0 0x0 0x0 0x0 | 07:17 |
nash | Not fleets, seems to be occuring on planets and the galaxy object | 07:18 |
nash | s/galxy/universe/ | 07:18 |
CIA-3 | llnz ruleset-book * rf43d1ff69b02 /.gitignore: Added *.backup files to .gitignore | 07:19 |
mithro | nash: it seems okay on Planets too | 07:20 |
nash | hmm.. okay | 07:20 |
nash | As I said - give me a little while | 07:20 |
mithro | okay | 07:21 |
nash | Sorry - in the middle of other things | 07:22 |
nash | But I do want to fix the bug... | 07:22 |
mithro | nash: but I do think i've found a bug | 07:25 |
nash | cool | 07:25 |
nash | Anything major? | 07:26 |
* nash needs a faster web connection... | 07:34 | |
mithro | nash: not sending enough data in a planet | 07:40 |
mithro | 4*4=16 != 12 | 07:41 |
nash | Ahh.... | 07:43 |
nash | So that coudl be it | 07:43 |
nash | llnz: If only all RCS systems used the smae ignore system... | 07:51 |
llnz | hehe, ruleset-book has been in git from about the fourth commit | 07:52 |
CIA-3 | mithro libtpproto-py * r8fb1b7291fe4 /tp/netlib/objects/ObjectExtra/Planet.py: | 07:55 |
CIA-3 | Fixed the length of the packet. | 07:55 |
CIA-3 | Also added a simple error check. | 07:55 |
CIA-3 | mithro libtpproto-py * rb778516881cc /tp/netlib/objects/ (Description.py ObjectDesc.py Order.py OrderDesc.py): Make orders and objects closer. | 07:55 |
CIA-3 | mithro tpserver-py * r8ae565638e55 /tp/server/bases/Resource.py: Fixed up Resource to use the names in the table. | 07:55 |
CIA-3 | mithro tpserver-py * r894130c5912e /tp/server/rules/minisec/__init__.py: Add a bunch of resources for testing. | 07:55 |
CIA-3 | mithro tpserver-py * r380c95b831f0 /tp/server/rules/base/objects/Planet.py: Random "crazy" resources on a planet. | 07:55 |
CIA-3 | mithro tpclient-pywx * r22898ae2e633 /windows/winInfo.py: Make the resource output a little bit nicer. | 07:55 |
*** nash has quit IRC | 07:55 | |
*** TBBle has quit IRC | 07:55 | |
*** nash has joined #tp | 07:59 | |
nash | Damn useless piece of crap machine | 07:59 |
nash | locks up from temp half the damn time | 07:59 |
nash | Did I miss anything? | 08:00 |
llnz | nash: did you see my reply? | 08:00 |
nash | nope | 08:00 |
mithro | nash: still getting segfault | 08:01 |
nash | mithro: d'oh | 08:01 |
llnz | [23:56] <llnz> hehe, ruleset-book has been in git from about the fourth commit | 08:01 |
llnz | then a whole lot of commits from mithro | 08:01 |
nash | okay | 08:01 |
nash | did my push go through? | 08:02 |
mithro | no | 08:03 |
CIA-3 | nash galaxie * rb47da0ae4b7d /tpe_orders.c: Orders: Most of order types are now supported. | 08:03 |
nash | second time roung... | 08:03 |
mithro | nash: you should have two emails | 08:06 |
nash | mithro: Okay | 08:06 |
mithro | more valgrind traces | 08:07 |
nash | mithro: I have one | 08:07 |
mithro | ==32673== LEAK SUMMARY: | 08:07 |
mithro | ==32673== definitely lost: 1,053 bytes in 44 blocks. | 08:07 |
nash | ouch | 08:07 |
nash | Actually - I bet a reasoanable % is in fontcache | 08:07 |
mithro | lots is fontconfig | 08:08 |
nash | Good | 08:08 |
nash | I suppress them normally | 08:08 |
nash | Some is shared, some is X. | 08:08 |
mithro | List Arg (6) has 3 options | 08:08 |
mithro | Option 0: Scout (-1) | 08:08 |
mithro | Option 1: Frigate (-1) | 08:08 |
mithro | Option 2: Battleship (-1) | 08:08 |
mithro | :/ | 08:08 |
nash | Looks good there | 08:09 |
mithro | oh! | 08:09 |
mithro | -1 == maximum | 08:09 |
mithro | Node text is BuildFleet | 08:10 |
mithro | Node is (null) | 08:10 |
mithro | Pos is 7 | 08:10 |
mithro | ? | 08:10 |
nash | Yep | 08:11 |
nash | I saw the -1 go in the other day | 08:11 |
mithro | ==32083== 527 bytes in 32 blocks are definitely lost in loss record 167 of 235 | 08:11 |
mithro | ==32083== at 0x4021620: malloc (vg_replace_malloc.c:149) | 08:11 |
mithro | ==32083== by 0x8050675: tpe_util_string_extract (tpe_util.c:30) | 08:11 |
nash | I don't recall that being in the standard before | 08:11 |
llnz | me neither | 08:12 |
mithro | nash: it appears not to be | 08:12 |
nash | mithro: Hence why I don;t support it | 08:12 |
mithro | although -1 == the largest possible number too :P | 08:12 |
nash | Personally I thought a limit of 0 would be a better no limit | 08:12 |
mithro | * a SInt32, the id of the player who owns this fleet or -1 if not owned or unknown | 08:12 |
mithro | * a list of, | 08:12 |
mithro | o a UInt32, the type of the ship | 08:12 |
mithro | o a Uint32, the number of the ships in the fleet | 08:12 |
mithro | * a UInt32, the amount of damage the fleet currently has | 08:12 |
nash | That's fleets however | 08:13 |
mithro | oh? | 08:13 |
nash | What you pasted. | 08:14 |
nash | Not build orders | 08:14 |
pschulz01 | What exactly is the libtprl library used for? | 08:15 |
* mithro thinks I may need to go to bed :P | 08:15 | |
llnz | pschulz01: it's a readline interface for C++ | 08:15 |
llnz | tpserver-cpp uses it | 08:15 |
pschulz01 | llnz: Ta.. that's what I'll put in the description then :-) | 08:16 |
llnz | (tpclient-cpptext might one day too) | 08:16 |
nash | mithro: I'll bbs | 08:17 |
mithro | nash: okay | 08:17 |
nash | if you go to bed - make sure you push your latewst stuff | 08:17 |
mithro | nash: okay | 08:24 |
mithro | nash: so any ideas on the latest segfaults? | 08:25 |
jotham | i need a sollution for accessing smb shares from my debian box, i have been using mount -t smbfs but if the remote pc goes down it causes all sorts of ungoodness on my local machine, is there a more elegant sollution? i'd even be happy if there was a script or something that kept track of smb mounts and if the remote end fell off, called a umount on the path, as it stands after a few months i can end up with a number of hung mount points | 08:25 |
llnz | jotham: you could use smbclient (interface like console ftp), or either kde or gnome's network share browser | 08:26 |
mithro | jotham: you can use mount with a soft timeout | 08:27 |
jotham | problem is i'm accessing these shares (once they are mounted) with scp | 08:27 |
jotham | mithro: oh? i'll go look in the man page | 08:27 |
jotham | oh man | 08:27 |
jotham | rtfm wins again | 08:27 |
jotham | cheers mithro | 08:27 |
jotham | wonder if it's relevent to smb though | 08:28 |
mithro | cifs is more tollerante | 08:28 |
nash | mithro: No idea yet... looking in a moment | 08:29 |
jotham | hum i'll look at cifs tomorrow, looks interesting | 08:29 |
nash | is tpserver-py and libtpproto up to date | 08:29 |
mithro | nash: I push a bunch of changes when you discoed | 08:29 |
nash | cool | 08:29 |
mithro | http://www.die.net/doc/linux/man/man8/mount.cifs.8.html | 08:30 |
tpb | <http://ln-s.net/Z2v> (at www.die.net) | 08:30 |
mithro | nash: check logs ;) | 08:30 |
mithro | jotham: cifs is pretty much a drop in replacement for smbfs | 08:31 |
mithro | nash: the segfault only seems to occur every couple of runs | 08:33 |
nash | mithro: Okay - so started okay - what do you do next? | 08:34 |
nash | Restart galaxie? generate a turn? | 08:36 |
mithro | no, every couple of start ups it just segfaults on connecting | 08:36 |
nash | mithro: boom - just got it then ;-) | 08:38 |
mithro | http://www.thousandparsec.net/~tim/Screenshot-2.png | 08:38 |
tpb | <http://ln-s.net/Z2x> (at www.thousandparsec.net) | 08:38 |
nash | They are some weird arse fruit trees | 08:38 |
llnz | hehehehe | 08:39 |
nash | That crash is so amazingly weird | 08:41 |
jotham | haha | 08:44 |
CIA-3 | nash galaxie * ra1b35925f427 / (galaxie.c tpe_comm.c tpe_gui.c): Fix some leaks and add an assert. | 08:44 |
CIA-3 | nash galaxie * rd471d80b41fb / (galaxie.c tpe_comm.c tpe_gui.c): Merge with git+ssh://baboon/home/nash/work/tranquillity/galaxie | 08:44 |
pschulz01 | llnz: Hazzah! Just ran lintian on the libtprl deb's and all the errors have gone away :-) | 08:46 |
llnz | pschulz01: cool | 08:46 |
mithro | pschulz01: cool | 08:46 |
pschulz01 | Uploading to REVU.. (Ubuntu package review website) | 08:47 |
pschulz01 | See what people have to say about my packaging :-) | 08:47 |
llnz | cool | 08:48 |
nash | mithro: Seems to be fixed. | 08:49 |
nash | NFI how however | 08:49 |
nash | I can't get it anymore | 08:50 |
mithro | oh? | 08:50 |
nash | Try that last update | 08:50 |
nash | I jsut tried 20 odd times in a row | 08:50 |
mithro | you try rebuilding the tpserver-py database? | 08:50 |
nash | Not yet | 08:50 |
mithro | i'll send you a little script | 08:50 |
nash | But I could get the crash reliably. I merged those chagnes, and no more | 08:50 |
mithro | galaxie: tpe_gui.c:483: star_update: Assertion `object->gui' failed. | 08:53 |
mithro | ==3863== | 08:53 |
mithro | I'm regularly getting | 08:54 |
mithro | galaxie: tpe_gui.c:483: star_update: Assertion `object->gui' failed. | 08:54 |
nash | That's the assert... | 08:54 |
mithro | Aborted (core dumped) | 08:54 |
nash | strange | 08:54 |
nash | I can't get the damn thing | 08:54 |
* nash puts in easy fix then | 08:54 | |
nash | Wait... I know | 08:55 |
nash | It's the screwy object order you have. | 08:55 |
mithro | ? | 08:55 |
mithro | what screwy object order? | 08:56 |
nash | You get it when you start up? | 08:56 |
mithro | yeah | 08:56 |
mithro | can I get something from the core file? | 08:58 |
nash | If you can deref *object it would be fantastic | 08:58 |
nash | I never can | 08:58 |
mithro | whats the command? | 09:00 |
nash | print *object | 09:00 |
mithro | No symbol "object" in current context. | 09:00 |
nash | Try going up a frame, and print *obj | 09:01 |
nash | mithro: f 1 | 09:03 |
mithro | how? | 09:03 |
nash | print *obj | 09:03 |
* nash needs to go to bed shortly | 09:03 | |
mithro | (gdb) f 4 | 09:03 |
mithro | #4 0x08052844 in star_update (tpe=0x8060cd8, object=0x80a1698) at tpe_gui.c:483 | 09:03 |
mithro | 483 assert(object->gui); | 09:03 |
mithro | (gdb) print *object | 09:03 |
mithro | $1 = {magic = 0x80575fc "ObjectMagic", tpe = 0x8060cd8, oid = 31, type = OBJTYPE_SYSTEM, name = 0x80a1738 "System 9", | 09:03 |
mithro | owner = 0, size = 1677787, pos = {x = 2602947000, y = 6901552000, z = 0}, vel = {x = 0, y = 0, z = 0}, parent = 0, | 09:03 |
mithro | nchildren = 2, children = 0x80a1748, nordertypes = 0, ordertypes = 0x80a1758, norders = 0, orders = 0x0, | 09:04 |
mithro | updated = 1180322924, fleet = 0x0, planet = 0x0, gui = 0x0, ai = 0x0, ref = 0} | 09:04 |
mithro | (gdb) | 09:04 |
nash | Right - very strange... gui == 0x0... | 09:04 |
mithro | any ideas? | 09:05 |
nash | Anyway - I have a proper check for it, and another check for something else weird that happened before... | 09:05 |
nash | I must have an ordering requirement. | 09:05 |
mithro | galaxy is always aborting now | 09:05 |
nash | Yeah. | 09:05 |
CIA-3 | nash galaxie * r55e7a1aa61a0 /gui_window.c: Sparse warning supress. | 09:06 |
CIA-3 | nash galaxie * r49701e432e0a /tpe_gui.c: Check for weird universe in star_update, don't call as often either. | 09:06 |
nash | mithro: Shouldn't crash now... | 09:06 |
nash | Actually there is a case it can still assert | 09:07 |
mithro | nash: well we are about to find out if that is my case | 09:07 |
mithro | runs | 09:07 |
mithro | what are the 3*null ? | 09:08 |
CIA-3 | nash galaxie * rd347a22c6388 /tpe_gui.c: Fix other path to check for gui. | 09:08 |
nash | mithro: Where? | 09:08 |
mithro | on my homeplanet | 09:08 |
nash | probably haven't got the resource types yet | 09:09 |
nash | Basically racec condition. | 09:09 |
CIA-3 | llnz ruleset-book * r01216aa3aad7 /ruleset-dev.tex: Wrote the Writing the Ruleset chapter. | 09:09 |
CIA-3 | llnz ruleset-book * r39a891dc8a15 /ruleset-dev.tex: Added chapter heading for Licensing chapter, yet to be written. | 09:09 |
nash | Debug prints it, normally doesn't matter | 09:09 |
mithro | http://www.thousandparsec.net/~tim/Screenshot.png | 09:10 |
tpb | <http://ln-s.net/Z2z> (at www.thousandparsec.net) | 09:10 |
mithro | arg, the pop-up went away | 09:10 |
nash | Ahh - over a planet? | 09:11 |
nash | s/planet/star/ | 09:11 |
CIA-3 | nash galaxie * rccc29a63ab40 /galaxie.c: Fix leak... small one. | 09:11 |
mithro | yes | 09:12 |
nash | mithro: Seen it before, not sure... I've seen it before, and I will nail it at some point :-/ | 09:12 |
* llnz wanders off | 09:12 | |
llnz | later all | 09:12 |
nash | Basically hasn't got planet names | 09:12 |
mithro | see ya llnz | 09:12 |
nash | llnz: night | 09:12 |
nash | And fleet names | 09:12 |
*** llnz has quit IRC | 09:12 | |
nash | Not sure why | 09:12 |
mithro | tpe_gui.c: In function ‘star_update’: | 09:13 |
mithro | tpe_gui.c:485: error: ‘reutrn’ undeclared (first use in this function) | 09:13 |
Epyon | wow, nice interface :) | 09:13 |
mithro | nash: you should ship with at least 1 planet graphic | 09:13 |
nash | mithro: I thought I did actually | 09:13 |
nash | hmm.. | 09:13 |
mithro | reutrn? | 09:14 |
CIA-3 | nash galaxie * r8c6d0989035f /edje/images/planet.png: Add planet image. | 09:16 |
CIA-3 | nash galaxie * r30cf4f991dd1 /tpe_gui.c: set planet to correct location, and fix reutrn. | 09:16 |
nash | mithro: The 3x(null) means for some reason I don't have the design type. | 09:17 |
mithro | ahh, that would be okay | 09:17 |
nash | Is that because tpserver-py isn';t sending it? | 09:18 |
mithro | because Minisec doesn't have any designs | 09:18 |
nash | It has 3 | 09:18 |
nash | scout, frigate, battleship... | 09:18 |
mithro | no, tpserver-cpp extended Minisec to have 3 :P | 09:18 |
nash | hmm... | 09:19 |
nash | so how do you know what a fleet contains then? | 09:19 |
mithro | hard coded :P | 09:19 |
mithro | Minisec was designed long before design support existed | 09:20 |
mithro | I will add support in the future | 09:20 |
nash | hmm... | 09:20 |
nash | okay... | 09:20 |
nash | until then... (null) it is... | 09:20 |
mithro | (infact tpserver-py had design support before tpserver-cpp :) | 09:20 |
nash | which means don't expect the AI to work too well... | 09:20 |
nash | Anyway, with the crash out of the way... I'm off to bed. | 09:21 |
nash | Talk to you tomorrow | 09:21 |
mithro | okay | 09:22 |
mithro | see ya! | 09:22 |
* mithro heads to bed too | 09:22 | |
nash | night | 09:22 |
mithro | gnight everyone | 09:22 |
*** nash has quit IRC | 09:23 | |
pschulz01 | nash: goodnight. | 09:23 |
*** mithro has left #tp | 09:23 | |
* pschulz01 look to the door as well. | 09:23 | |
*** mithro has joined #tp | 09:23 | |
* pschulz01 looks to the door as well. | 09:23 | |
pschulz01 | mithro: !! The package is up there.... http://revu.tauware.de/index.py.. search for libtprl | 09:24 |
jotham | mithro: i'm not sure how to commit now i've edited battleviewer | 09:27 |
jotham | bandcamp:27379$ cg-fetch | 09:27 |
jotham | Fetching pack (head and objects)... | 09:27 |
jotham | Fetching tags... | 09:27 |
jotham | Up to date. | 09:27 |
jotham | bandcamp:11024$ cg-push | 09:27 |
jotham | error: remote 'refs/heads/master' is not a strict subset of local ref 'refs/heads/master'. maybe you are not up-to-date and need to pull first? | 09:27 |
jotham | i made a cg-commit before | 09:28 |
jotham | ahh here we go, needed a cg-update apparently | 09:29 |
*** Demitar has quit IRC | 09:29 | |
jotham | how do i resolve conflicts | 09:29 |
*** Demitar has joined #tp | 09:29 | |
jotham | oh damn i didn't see mithro go to bed, oh well, night guys | 09:31 |
*** JLP has quit IRC | 10:00 | |
*** JLP has joined #tp | 10:01 | |
*** TBBle has joined #tp | 10:02 | |
*** dmpayton has joined #tp | 12:37 | |
dmpayton | And thus, it begins. | 12:38 |
*** dmpayton has quit IRC | 14:20 | |
*** tuna-fish has joined #tp | 14:36 | |
*** xdotx has joined #tp | 15:23 | |
*** pschulz01 has quit IRC | 16:18 | |
*** jotham has quit IRC | 16:18 | |
*** jotham_ has joined #tp | 17:13 | |
*** nash has joined #tp | 19:13 | |
mithro | morning nash | 19:32 |
nash | heyo mithro | 19:33 |
*** mithro has quit IRC | 19:42 | |
*** mithro has joined #tp | 20:00 | |
mithro | morning people | 20:06 |
*** xdotx has quit IRC | 20:07 | |
* brx rubs his eyes | 20:13 | |
mithro | hey brx | 20:15 |
mithro | if I didn't have this stupid assignment I think I would do a bit of scheme coding today | 20:15 |
*** xdotx has joined #tp | 20:18 | |
mithro | wb xdotx | 20:19 |
xdotx | mithro: danka | 20:24 |
xdotx | mihro: er, danke* | 20:26 |
mithro | xdotx: how goes your project? | 20:26 |
xdotx | mithro: well! i was just about to play some more rfts ;) | 20:29 |
xdotx | mithro: i mean "research" | 20:29 |
mithro | don't get to addictited :) | 20:30 |
xdotx | heh. i've still got a lot to learn about it | 20:31 |
* xdotx has the manual printed out sitting below the monitor | 20:33 | |
brx | I named my decompiler after the girl that has broken my heart and continues to destroy my life. | 20:34 |
brx | yay! :) | 20:34 |
xdotx | meaningful | 20:35 |
brx | I prepended a "de" | 20:35 |
brx | mentor insisted. | 20:35 |
mithro | nash: ping? | 21:46 |
nash | pong | 21:59 |
*** mithro has quit IRC | 22:15 | |
*** mithro has joined #tp | 22:15 | |
*** xdotx has quit IRC | 22:33 | |
nash | lunch shortly | 22:49 |
*** mithro has quit IRC | 22:55 | |
*** mithro has joined #tp | 23:04 | |
mithro | bblr | 23:04 |
*** dmpayton has joined #tp | 23:12 | |
* dmpayton cracks his knuckles and opens komodo | 23:14 | |
*** mithro has quit IRC | 23:26 | |
*** mithro has joined #tp | 23:26 | |
mithro | dmpayton: ping? | 23:27 |
dmpayton | mithro: pong | 23:28 |
dmpayton | Google bought me a new suit for my wedding. | 23:28 |
mithro | dmpayton: yay! | 23:31 |
mithro | dmpayton: so payment stuff went fine? | 23:31 |
mithro | arg! I don't want to work on this assignment :/ | 23:32 |
jotham_ | hey mithro, i got a question/problem | 23:32 |
mithro | jotham_: shoot! | 23:32 |
jotham_ | i tried to commit my changes last night, haven't tried since we changed to git | 23:33 |
jotham_ | and it all went wrong | 23:33 |
jotham_ | let me load up the box | 23:33 |
jotham_ | ok | 23:34 |
mithro | jotham_: okay | 23:34 |
mithro | I saw it in the logs this morning | 23:34 |
mithro | dmpayton: so where are we at? | 23:34 |
dmpayton | mithro: Yes, payment stuff went fine. | 23:34 |
jotham_ | ok, so how do i resolve the problem | 23:35 |
dmpayton | mithro: I'm going to commit what I have, then go afk for a little while, then come back and code some more. | 23:35 |
mithro | dmpayton: okay that would be great! | 23:36 |
CIA-3 | jotham battleviewer * reb1585e0fb98 / (4 files in 2 dirs): | 23:37 |
CIA-3 | jotham battleviewer * r7c196fae76ee / (8 files in 2 dirs): Merge with git+ssh://[email protected]/git/battleviewer.git | 23:37 |
mithro | jotham_: I don't think you posted the actual error? | 23:37 |
jotham_ | wierd | 23:37 |
jotham_ | it said there were unmet conflicts | 23:37 |
jotham_ | but now it works | 23:37 |
jotham_ | bandcamp:03660$ cg-push | 23:37 |
jotham_ | updating 'refs/heads/master' from 86a9d299aacf37ded4a5679dde231d51a5e0104b to 7c196fae76eeb1eb1b333d0ec4bc330ecc761001 | 23:37 |
mithro | oh? | 23:37 |
jotham_ | Packing 10 objects | 23:37 |
jotham_ | Unpacking 10 objects | 23:37 |
jotham_ | hooks/update: line 11: /tmp/git-update-hook: Permission denied | 23:37 |
jotham_ | hooks/update: line 22: /tmp/git-update-hook: Permission denied | 23:37 |
jotham_ | hooks/update: line 22: /tmp/git-update-hook: Permission denied | 23:37 |
jotham_ | refs/heads/master: 86a9d299aacf37ded4a5679dde231d51a5e0104b -> 7c196fae76eeb1eb1b333d0ec4bc330ecc761001 | 23:37 |
mithro | doh! | 23:37 |
jotham_ | does that look healthy? | 23:37 |
mithro | apart from the permission denied | 23:38 |
jotham_ | what's that all about | 23:38 |
mithro | hrm... I wonder how that push even worked... | 23:38 |
jotham_ | did it work? | 23:38 |
jotham_ | i guess it did | 23:38 |
mithro | jotham_: you wearn't in the codemonkey group | 23:39 |
*** jotham_ is now known as jotham | 23:39 | |
*** drdevice has joined #tp | 23:39 | |
jotham | ok mithro i want to do a brand-fresh checkout | 23:40 |
mithro | jotham: I've added you to the group, so next push it should all be okay | 23:40 |
jotham | what do i do | 23:40 |
mithro | jotham: what does cg-status show? | 23:40 |
jotham | i am writing myself some cg notes | 23:40 |
mithro | cg-clone git+ssh://[email protected]...... | 23:41 |
jotham | bandcamp:21117$ cg-status | 23:41 |
jotham | Heads: >master 7c196fae76eeb1eb1b333d0ec4bc330ecc761001 | 23:41 |
jotham | R origin 86a9d299aacf37ded4a5679dde231d51a5e0104b | 23:41 |
jotham | ? actions.pyc | 23:41 |
jotham | ? battlecontroller.pyc | 23:41 |
jotham | ? battleparser-new.py | 23:41 |
jotham | ? battleparser.pyc | 23:41 |
jotham | ? battleview.pyc | 23:41 |
jotham | ? constants.pyc | 23:41 |
jotham | ? element_test.py | 23:41 |
jotham | ? entities/__init__.pyc | 23:41 |
jotham | ? entities/basicentity.pyc | 23:41 |
jotham | ? entities/damageanimation.pyc | 23:41 |
jotham | ? entities/laserblast.pyc | 23:41 |
jotham | ? entities/message.pyc | 23:41 |
jotham | ? out.xml | 23:41 |
jotham | ? states.pyc | 23:41 |
jotham | ? utility.pyc | 23:42 |
jotham | ? weapons.pyc | 23:42 |
jotham | ? xml_validator.pyc | 23:42 |
mithro | okay you need to create a .gitignore file and tell it to ignore *.pyc :) | 23:44 |
jotham | ok | 23:44 |
jotham | bandcamp:23495$ cg-status | 23:44 |
jotham | Heads: | 23:44 |
jotham | >master 7c196fae76eeb1eb1b333d0ec4bc330ecc761001 | 23:44 |
jotham | R origin 7c196fae76eeb1eb1b333d0ec4bc330ecc761001 | 23:44 |
jotham | ? .gitignore | 23:44 |
jotham | that's better eh | 23:44 |
jotham | uh | 23:45 |
jotham | this is odd | 23:46 |
mithro | need to add the .gitignore and push it | 23:46 |
jotham | http://git.thousandparsec.net/gitweb/gitweb.cgi?p=battleviewer.git;a=commitdiff;h=7c196fae76eeb1eb1b333d0ec4bc330ecc761001 | 23:46 |
tpb | <http://ln-s.net/Z7w> (at git.thousandparsec.net) | 23:47 |
jotham | check out: | 23:47 |
jotham | +<<<<<<< master | 23:47 |
jotham | and | 23:47 |
jotham | +>>>>>>> origin | 23:47 |
jotham | what's that all about? | 23:47 |
jotham | did i just push over your push somehow | 23:48 |
jotham | and mess it all up | 23:48 |
jotham | yeah that's no good | 23:49 |
jotham | i don't get why it didn't prompt me about the xml files? | 23:50 |
mithro | jotham: hrm.... | 23:50 |
jotham | that's really messy | 23:51 |
jotham | it's merged the files togeather | 23:51 |
jotham | i can't even sanely diff them | 23:51 |
jotham | without manually splitting them out | 23:51 |
mithro | okay | 23:51 |
mithro | hold on | 23:51 |
mithro | jotham: okay do a "cg-admin-uncommit" | 23:51 |
mithro | then a cg-reset | 23:51 |
jotham | what did that do | 23:52 |
mithro | now what does cg-status show? | 23:53 |
mithro | cg-admin-uncommit uncommits the last change | 23:53 |
mithro | cg-reset restores the repository to the currently committed state | 23:53 |
jotham | bandcamp:27652$ cg-status | 23:53 |
jotham | Heads: | 23:53 |
jotham | >master eb1585e0fb9895c99ef3e3ad7b84ca7634aa362d | 23:53 |
jotham | R origin 7c196fae76eeb1eb1b333d0ec4bc330ecc761001 | 23:53 |
jotham | heres the problem | 23:54 |
jotham | i've changed battleparser | 23:54 |
jotham | and so have you | 23:54 |
jotham | shall i just edit your current commit? | 23:54 |
jotham | and readd the code | 23:54 |
jotham | i thought git was better than darcs/svn, is there not some conflict resolution tool? | 23:55 |
jotham | or did i just screw everything up | 23:55 |
dmpayton | mithro: how do I add commit notes? | 23:57 |
dmpayton | cg-commit -m notes go here, yes? | 23:58 |
Generated by irclog2html.py 2.5 by Marius Gedminas - find it at mg.pov.lt!