summaryrefslogtreecommitdiffstats
path: root/crawl-ref
Commit message (Collapse)AuthorAgeFilesLines
* Remove "The" from Nemelex's religios titles, as they're redundant nowDavid Lawrence Ramsey2009-09-231-2/+2
| | | | that they're displayed after "the" on the main screen.
* Merge branch 'master' of git://github.com/tycho/crawlDarshan Shaligram2009-09-2414-518/+830
|\
| * README: give credit to libpngSteven Noonan2009-09-232-0/+112
| | | | | | | | | | | | | | libpng is used by SDL_image, and we make heavy use of the PNG loader in particular. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * initfile.cc: improve accuracy of crawl_base variableSteven Noonan2009-09-231-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | Windows, Mac OS X and Linux all provide handy ways to retrieve the absolute path of the running executable. This is especially useful since argv[0] can be a relative path. This fixes a bug on the Mac OS X build where the app cannot locate the graphics resources when when they're needed, so the application bombs out instead. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * tilesdl.cc: search for PNG icon by using datafile_path()Steven Noonan2009-09-231-1/+1
| | | | | | | | Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * .gitignore: ignore Xcode cruftSteven Noonan2009-09-231-0/+5
| | | | | | | | Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * SDLMain.{h,m}: added for Xcode buildsSteven Noonan2009-09-232-0/+395
| | | | | | | | | | | | | | Mac OS X gets really cranky if you don't use this. Crashes, memory leaks, etc. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * libunix.cc: remove textattr() from USE_TILE buildsSteven Noonan2009-09-231-0/+2
| | | | | | | | | | | | | | | | USE_TILE builds instead pay attention to the textattr macro. Leaving this function here causes a duplicate function declaration in such builds. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * libunix.cc: add forward declarations where neededSteven Noonan2009-09-231-0/+6
| | | | | | | | | | | | | | unixcurses_{startup,shutdown}() and sighup_save_and_exit() were used before they were declared/defined. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * libgui: fix declaration consistencySteven Noonan2009-09-232-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of little things here. The forward declarations for some of these functions simply did not match the function definitions. - clrscr() was declared twice - cprintf(), putch(), putwch(), window(), clrscr() all returned 'void' instead of 'int'. - getch() and strlwr() were defined extern "C", but not declared as such. Also made libgui.cc functions behave like their ncurses equivalents, except that our functions always return the ncurses 'OK' (0) response. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * directn.cc: fix GCC 4.0 warning "'me' may be used uninitialized in this ↵Steven Noonan2009-09-231-1/+1
| | | | | | | | | | | | | | | | | | function" It's an inane warning, as it doesn't consider the loop immediately after the declaration sets the value on the first iteration. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * Xcode: Mac OS X build fixedSteven Noonan2009-09-232-501/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was originally going to split this up into multiple patches, but the Xcode project file format is a bit difficult to cleanly split for patching. So anyway, I've made a few changes: - Fixed Xcode 3.2 compatibility (complaints about using GCC 4.2 with the Mac OS X 10.4 SDK, among other things). - Removed the tilegen target (this is now done via a script) - Fixed the Crawl-tiles-cmd target + Now links to AppKit.framework and OpenGL.framework + Set the search path for the SDL, SDL_image and libpng frameworks to be /Library/Frameworks, which is standard. - Fixed the Crawl target + Now copies the necessary non-standard frameworks to the Frameworks directory (this eliminates the dependency on Fink). + Eliminated a couple redundant or worthless steps which did things we really didn't need. - Added precompiled header support to the Crawl-cmd and Crawl-tiles-cmd targets. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * rltiles: add makefile.mac for Mac OS X buildsSteven Noonan2009-09-231-0/+40
| | | | | | | | | | | | | | It deviates enough from the UNIX makefile that it really should be separate. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* | * Also allow Maurice to steal the occasional spellbook or piece ofj-p-e-g2009-09-2412-183/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | jewellery. * As per FR 1937144, leave a purple cloud if the player or a monster blinks or teleports away. For some reason this doesn't yet work correctly with scrolls of blinking, even though wizard blink (which uses the same function) does work. -- (from svn) Signed-off-by: Darshan Shaligram <dshaligram@users.sourceforge.net>
* | Explicitly link sqlite3 bundled with Crawl. (Jukka Kuusisto)Darshan Shaligram2009-09-241-1/+1
|/ | | | | | Avoid linker errors on systems with older libsqlite3 that don't have the functions Crawl uses (Mac OS 10.4 for instance) by explicitly linking the static lib we build in util/sqlite.
* Comment fix.dolorous2009-09-231-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10780 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak (very) ugly things' proximity mutation rate again.dolorous2009-09-231-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10779 c06c8d41-db1a-0410-9941-cceddc491573
* Add more minor cosmetic fixes.dolorous2009-09-231-2/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10778 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fixes.dolorous2009-09-232-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10777 c06c8d41-db1a-0410-9941-cceddc491573
* Implement another new unique, this time of my own coding: Maurice the thief.j-p-e-g2009-09-2214-21/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Equipment: a cloak, a dagger or short sword, and some gold. Spells : Blink, Invisibility, Teleport Self Most importantly, in melee combat Maurice will try to steal items from the player. Due to technical limitations he can only steal item types monsters can carry and only if said item slot is still free. All applicable items get weighted by item value, and if nothing is applicable he will steal some gold instead. If even that isn't possible, he'll complain a bit and teleport away. Maurice is placed in the same depth as Gastronok. He's not actually hard (except for the occasional weapon brand or wand), but rather annoying. :p Stealing from monsters hasn't been implemented, and I don't think it's as interesting. Maurice is currently prevented from stealing items the player has equipped, though I'm considering allowing him to steal a wielded weapon, at least. The limitations of monsters' inventories means that Maurice will never attempt to steal armour (slot already filled) or jewellery (missing slot). Maybe we could try to force valuable items into inappropriate but rarely used slots, e.g. MSLOT_MISC. Other than in the FR (see 2838375) Maurice does not disappear from the level, so you can still hunt him down. He also doesn't get a crossbow or blowgun yet, though that's an interesting idea. However, handing out a secondary weapon would mean that he couldn't steal weapons either. Doesn't have a tile yet, and I have no image of him in my head either. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10776 c06c8d41-db1a-0410-9941-cceddc491573
* Let player ghosts and random Pandemonium demons cast Airstrike.dolorous2009-09-221-2/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10775 c06c8d41-db1a-0410-9941-cceddc491573
* Add new unique Gastronok (slug wizard), via a patch by bookofjude and some j-p-e-g2009-09-2215-42/+302
| | | | | | | | tweaks to make his speech and casting work correctly. Turns up around the same time as Erolcha and Grum. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10774 c06c8d41-db1a-0410-9941-cceddc491573
* Add descriptions for trove and bailey.dploog2009-09-221-0/+16
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10773 c06c8d41-db1a-0410-9941-cceddc491573
* Add a proper message for when the player isn't carrying any fruit.dolorous2009-09-221-0/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10772 c06c8d41-db1a-0410-9941-cceddc491573
* New portal vault: Trove by Jude.dploog2009-09-222-4/+588
| | | | | | | | There is one issue: gold should never be part of the loot but I don't know how to get rid of it. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10770 c06c8d41-db1a-0410-9941-cceddc491573
* * Actually use the rock worm's corpse tile.j-p-e-g2009-09-216-24/+36
| | | | | | | | * Tweak a few skill titles. * Update the change log (not for these, though). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10769 c06c8d41-db1a-0410-9941-cceddc491573
* Apply a patch by an anonymous contributor to fix the bug with Lee'sj-p-e-g2009-09-211-2/+6
| | | | | | | Rapid Deconstruction having no effect at low power. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10767 c06c8d41-db1a-0410-9941-cceddc491573
* * Fix 2862312: examination of items in shops not working after buyingj-p-e-g2009-09-2113-22/+74
| | | | | | | | | | | | | | | something * FR 2836364 : Make controlled blink contaminate the player. * Fix 2841232: display "very slow" in the % screen. * FR 2858960 : Re-add mouseover descriptions for previously seen (but not detected) features out of sight, and for plain floor the stash description like when using 'x'. * Disallow placement of corpses within walls, and allow rock worms to leave corpses elsewhere. * Minor tweaks to the documentation. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10766 c06c8d41-db1a-0410-9941-cceddc491573
* Allow vaults to request use of the acquirement code with "acquire ↵dshaligram2009-09-219-102/+168
| | | | | | <item_class>" or "acquire:<god> <item_class>" in item specs (due). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10765 c06c8d41-db1a-0410-9941-cceddc491573
* Two Pan vaults by Adam, one of them very funky.dploog2009-09-211-0/+56
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10764 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak (very) ugly things' flavor text again.dolorous2009-09-201-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10763 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fix.dolorous2009-09-201-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10762 c06c8d41-db1a-0410-9941-cceddc491573
* Add some comments.j-p-e-g2009-09-201-1/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10761 c06c8d41-db1a-0410-9941-cceddc491573
* Small fix.j-p-e-g2009-09-201-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10760 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak autoexplore and travel to try to avoid moving adjacent to unseenj-p-e-g2009-09-201-4/+53
| | | | | | | | | | | | | | grids where monsters might be lurking waiting to instakill you, as suggested by Kenneth Boyd. Tested in wizard mode (though not in a test game) and it works really well. The code currently uses a #define flag, in case anyone wants to try both versions and compare, but I think it should either be replaced with a proper option or removed entirely. Either way, the new behaviour should be the default. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10759 c06c8d41-db1a-0410-9941-cceddc491573
* Comment fix.dolorous2009-09-201-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10758 c06c8d41-db1a-0410-9941-cceddc491573
* Fix compilation (oops).dolorous2009-09-201-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10757 c06c8d41-db1a-0410-9941-cceddc491573
* Apply jokeserver's patch in [2862815] to properly handle polymorphed dolorous2009-09-201-0/+10
| | | | | | | submerged monsters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10756 c06c8d41-db1a-0410-9941-cceddc491573
* And get rid of a debugging statement...j-p-e-g2009-09-201-4/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10754 c06c8d41-db1a-0410-9941-cceddc491573
* Fix exhaustion not slowing the player, unless hasted. Whoops!j-p-e-g2009-09-201-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10753 c06c8d41-db1a-0410-9941-cceddc491573
* * Fix wizmode autoexplore (used for debugging) not nuking traps, as itj-p-e-g2009-09-208-32/+54
| | | | | | | | | claimed to do. * Fix post-berserk exhaustion not cancelling haste if not wearing the "RS. * Update change log. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10752 c06c8d41-db1a-0410-9941-cceddc491573
* Added new portal vault, the bailey. (Together with Zaba.)dploog2009-09-202-4/+863
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10751 c06c8d41-db1a-0410-9941-cceddc491573
* Comment fix.dolorous2009-09-201-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10750 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak ugly thing band generation a bit.dolorous2009-09-201-0/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10749 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fixes.dolorous2009-09-202-3/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10748 c06c8d41-db1a-0410-9941-cceddc491573
* Added three altars dedicated to Feawn. They have very high chances. This isdploog2009-09-201-0/+42
| | | | | | | | temporary until the Temple system has been updated to cater for more than the 12 apostles. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10747 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fix.dolorous2009-09-201-7/+7
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10746 c06c8d41-db1a-0410-9941-cceddc491573
* Make (very) ugly things appreciate polymorph beams.dolorous2009-09-201-3/+16
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10745 c06c8d41-db1a-0410-9941-cceddc491573
* Add spacing fix.dolorous2009-09-201-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10744 c06c8d41-db1a-0410-9941-cceddc491573
* Since there seems to be a connection between miasma and rotting, make dolorous2009-09-201-1/+1
| | | | | | | death drakes immune to rotting. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10743 c06c8d41-db1a-0410-9941-cceddc491573