On Fri, Nov 26, 2010 at 06:30:28PM +0100, David Ploog wrote: > On Fri, 26 Nov 2010, Mark Mackey wrote: > > About nine months ago I announced the imminent release of an update of > > chapayev's Zot Defense mode for Crawl.
Woh. I tried to port it from 0.4 to 0.5, but it was a massive merge from hell, and I finally gave up. Grats for pulling this up! > > > I don't have commit rights to the main repo, and my git-fu is weak at best, > > so instead I've put it up on > > http://www.chiark.greenend.org.uk/ucgi/~markm/git/crawl-ref.git/ > > You could also upload it to Mantis, but the diff files from your server > will be good enough. Does the patch work against current trunk? Dpeg: no, please! A single monolithic patch is a nightmare, having it split into a number of independent commits is much better. It can be done as a number of "git format-patch"/"git am" files, but having a real git repository we can pull from is so much better. > > If any of the main developers want to take a look it should be pretty > > straightforward to merge it into the master branch. It's fairly > > self-contained (following the Sprint example): most of the changes made > > to the code only have an effect in -zotdef mode. Good. > This looks good to me. I suggest making a branch in mainline trunk for > this. "Trunk" usually means "the main development branch" while anything else tends to be named just a branch. It doesn't really matter where side branches live -- but pushing/pulling to SourceForge and thus having a copy in the official repository is of course a good idea. For starting games, placing saves, etc -- I think it should follow exactly the pattern of Sprint: an entry in the start menu, a command line argument which forces it (mostly for CAO/CDO), and probably the sprint/ save structure that I thoroughly hate -- but consistency is more important that a dislike. The save layout is probably mostly Napkin's/greensnark's domain, too. Great work! -- 1KB // Microsoft corollary to Hanlon's razor: // Never attribute to stupidity what can be // adequately explained by malice. ------------------------------------------------------------------------------ Increase Visibility of Your 3D Game App & Earn a Chance To Win $500! Tap into the largest installed PC base & get more eyes on your game by optimizing for Intel(R) Graphics Technology. Get started today with the Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs. http://p.sf.net/sfu/intelisp-dev2dev _______________________________________________ Crawl-ref-discuss mailing list Crawl-ref-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/crawl-ref-discuss
