summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dgn-shoals.cc
Commit message (Collapse)AuthorAgeFilesLines
* Remove stuffNicholas Feinberg2014-07-291-0/+1
| | | | | | | .cc, moving its contents into the new stepdown.cc and strings.cc. (The latter also got many donations from libutil.h.) Down with stuff! Up the new flesh!
* Rename 'mesclr()' to 'clear_messages()'reaverb2014-06-221-1/+1
|
* Make Doxygen @returns "@return" for consistancy.reaverb2014-06-051-2/+2
|
* Correct some doxygen blocks.Neil Moore2014-05-291-3/+3
| | | | | Some of them were missing the /** (or /*!) that makes doxygen consider the comment in the first place.
* Make corpses and skeletons stationary items (minmay)gammafunk2014-05-261-9/+27
| | | | | | | | | Moving corpses and skeletons to other levels or to other locations within a level is tedious but may be optimal for corpse rot and god abilities like Kiku's corpse prayer. This commit prevents the player from picking up or apporting carrion. It generalizes the code used for nets being stationary, and cleans up and documents various bits of related item pickup code.
* Formatting fixes (add braces).Neil Moore2014-05-121-0/+2
| | | | This fixes all the instances caught by unbrace.
* Don't let Shoals level building overwrite vaults (#8529).Steve Melenchuk2014-05-091-1/+2
|
* Reduce strange interactions between Shoals tides and temp waterDracoOmega2014-01-281-1/+2
| | | | | | | | | | | | | When a tidal change happened, sometimes large chunks of temp water would be outright removed (even when they were far from the shoreline), and without actually removing the terrain change marker (which caused bits of land that were curiously immune to being flooded again). I have to admit that I don't entirely understand all the tidal code so it's possible this fix doesn't do exactly what I think it does, but it does seem to address the visible issue - temp water is preserved regardless of tidal movement, which continues to operate normally around it.
* Tide pushes player if their flight (or form) is expiring.Raphael Langella2013-12-261-1/+6
| | | | Another insta-drown safety.
* Revert "Replace `mprf(ch, s)` with `mpr(s, ch)`"Adam Borowski2013-11-291-2/+2
| | | | | | | | It trades readability and consistency for an utterly negligible bit of speed. With the amount of further processing mpr() does, a single sprintf is nothing. This reverts commit d9dfa8fc9755fb0a4e8954c7eb94f32fe97b82e0.
* Replace `mprf(ch, s)` with `mpr(s, ch)`Chris Oelmueller2013-11-281-2/+2
| | | | Scripted, then manually reviewed.
* Let shoals tides lap past all closed doors sometimes.blackcustard2013-11-221-1/+1
| | | | For consistency. This code predates runed and sealed doors.
* Drop a pointless variable.Adam Borowski2013-11-161-2/+1
|
* Axe a buttload of useless #includes.Adam Borowski2013-11-031-1/+0
| | | | | Can't test Android, MSVC or Mac, but a very brief glance at the diff suggests it's unlikely they're affected.
* Use cell_is_solid where appropriate.Neil Moore2013-11-011-1/+1
|
* Rewrite monster_iterator.Adam Borowski2013-10-311-1/+1
| | | | | It degenerated to a simple loop over menv, hardly worth any syntactic sugar. I kept it for now, though.
* Drop a lot of superfluous parentheses.Adam Borowski2013-10-241-11/+11
| | | | | These can be really confusing, especially if there are operators of different priorities, or multiple levels of parentheses, nearby.
* Put the Generating_Level global into crawl_state.Adam Borowski2013-10-031-1/+2
| | | | Also, drop the caps.
* Cancel an american speling.Adam Borowski2013-08-241-1/+1
| | | | | | Looks like, unlike "target[t]ing" where a single t is used by many brits and even some aussies, "cancel[l]ing" has double l even for a good deal of americans.
* More padding fixes for ternary operatorChris Oelmueller2013-08-031-2/+2
|
* Pad some ternary operators with spaces on the leftChris Oelmueller2013-07-281-3/+3
| | | | | | While this is not explicitly mentioned as a rule in coding_conventions, all examples listed there apply it as well. The dungeon.cc chunk did overflow max. columns before already, but could still be looked at.
* Fix Shoals map connections.Darshan Shaligram2013-02-031-5/+135
| | | | | | Shoals maps used join-the-dots which produces unnatural corridors. Fixed to postprocess the join-the-dots path and update the heightmap around the path to make it look less artificial.
* HangedMan's new Shoals ending.Darshan Shaligram2013-02-031-35/+0
| | | | | | | | Remove Shoals:$ vault placement code that tries to place vaults on islands: the regular minivault placement routine works just as well (probably a little better for lopsided islands). Use spotty connection builder for Shoals vaults.
* Replace levitation with flight and remove controlled flight (elliott)Chris Campbell2012-11-071-1/+0
|
* Use std namespace.Raphael Langella2012-08-261-33/+32
| | | | | | | | | | | | | I had to rename distance() (in coord.h) to distance2() because it conflicts with the STL function to compare 2 iterators. Not a bad change given how it returns the square of the distance anyway. I also had to rename the message global variable (in message.cc) to buffer. I tried to fix and improve the coding style has much as I could, but I probably missed a few given how huge and tedious it is. I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool and util/levcomp.*, because I have no clue about those.
* Massive style fix (braces, indentation, etc.)Neil Moore2012-08-011-2/+3
|
* Revert shoals colours and exploration limit.Raphael Langella2012-07-191-0/+9
| | | | | | | | | | This reverts commit 7f8c7b4f641a56ac897124dc63a1b6d2b3b5f935. This reverts commit 29c3559ac217a7c57c3e34814c8cdf7e5ed197dc. This reverts commit 5f7d03867298546a272c3db760c57ef0c6541415. This reverts commit a4184751df456850d7d5c312c54b62a427d06f3d. This reverts commit 410924b6f8f920b2b3f2f0b06a79b14e70e2f874. This reverts commit 12d28aa9d876c186e3ad7dceb6d11d20cd57d417. This reverts commit 35eb27d2ba502f201b5f67753fb646c338d0b344.
* Show the autoexplore limit in Shoals.Raphael Langella2012-07-171-9/+0
| | | | | | | | | | | | | | The autoexplore is now limited to cells with a height > -18, which is about the sand limit at low tide. We say that beyond this point, the bottom changes from sand to rock and autoexplore won't try to go there, even if they are traverseable. This greatly reduce autoexplore time, and even amphibious species will respect it. It doesn't prevent a merfolk from crossing deep water to explore an island spotted over the water, but they won't randomly explore the sea. To illustrate the limit, shallow water is light cyan or cyan, deep water is light blue or blue.
* Drop parentheses around scalar values in "return".Adam Borowski2012-07-051-4/+4
|
* Change 'clobber' to 'check_collision' in _build_secondary_vault and things ↵Vsevolod Kozlov2012-05-241-2/+2
| | | | | | that call it. To make it consistent with the functions called by it.
* Merge branch 'master' into portal_branchesAdam Borowski2012-04-251-2/+0
|\
| * Drop pointless braces after if/for/while everywhere.Adam Borowski2012-04-201-2/+0
| |
* | Merge branch 'master' into portal_branchesAdam Borowski2012-03-261-2/+2
|\| | | | | | | | | This includes fixes for 64834896234968 places in master that add new uses of LEVEL_FOO and so on.
| * Replace "atype() == ACT_MONSTER" with "is_monster()" -- half the length.Adam Borowski2012-03-221-2/+2
| | | | | | | | Could probably just make it !is_player() instead, too.
* | Merge branch 'master' into portal_branchesAdam Borowski2012-02-201-1/+0
|\|
| * Eliminate an almost empty file.Adam Borowski2012-01-031-1/+0
| |
* | Use branch depth rather than absolute depth as the authoritative one.Adam Borowski2012-01-031-3/+3
| |
* | Merge branch 'master' into portal_branchesAdam Borowski2011-12-281-14/+14
|\|
| * Make most of initialized data static.Adam Borowski2011-12-271-14/+14
| | | | | | | | | | All or almost all of .data segment that is not referenced externally should be done.
* | Merge branch 'master' into portal_branchesAdam Borowski2011-11-231-2/+2
|\|
| * Merge branch 'master' into unified_combat_controlRobert Burnham2011-11-161-9/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: crawl-ref/source/fight.cc crawl-ref/source/food.cc crawl-ref/source/libutil.cc crawl-ref/source/melee_attack.h crawl-ref/source/mon-stuff.cc crawl-ref/source/spl-damage.cc
| * \ Merge branch 'master' into unified_combat_controlRobert Burnham2011-10-251-2/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: crawl-ref/source/Makefile.obj crawl-ref/source/dbg-scan.cc crawl-ref/source/decks.cc crawl-ref/source/describe.cc crawl-ref/source/directn.cc crawl-ref/source/evoke.cc crawl-ref/source/fight.cc crawl-ref/source/fight.h crawl-ref/source/ghost.cc crawl-ref/source/ghost.h crawl-ref/source/item_use.cc crawl-ref/source/items.cc crawl-ref/source/map_knowledge.cc crawl-ref/source/melee_attack.h crawl-ref/source/mon-abil.cc crawl-ref/source/mon-act.cc crawl-ref/source/mon-stuff.cc crawl-ref/source/monster.cc crawl-ref/source/monster.h crawl-ref/source/player.cc crawl-ref/source/player.h crawl-ref/source/shopping.cc crawl-ref/source/spl-damage.cc crawl-ref/source/spl-summoning.cc crawl-ref/source/spl-transloc.cc crawl-ref/source/stairs.cc crawl-ref/source/stuff.cc crawl-ref/source/tags.cc crawl-ref/source/traps.cc crawl-ref/source/xom.cc
| * \ \ Merge branch 'master' into unified_combat_controlRobert Burnham2011-04-261-1/+40
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: crawl-ref/source/actor.cc crawl-ref/source/delay.cc crawl-ref/source/directn.cc crawl-ref/source/directn.h crawl-ref/source/fight.cc crawl-ref/source/files.cc crawl-ref/source/mon-act.cc crawl-ref/source/monster.cc crawl-ref/source/mpr.h crawl-ref/source/player.cc crawl-ref/source/shopping.cc
| * | | | Replace DESC_NOCAP_YOUR and DESC_CAP_YOUR with DESC_YOURRobert Burnham2011-03-251-1/+1
| | | | |
* | | | | Merge branch 'master' into portal_branchesAdam Borowski2011-11-191-9/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Replace a bunch of floating-point sqrt()s by integer ones.Adam Borowski2011-11-131-9/+3
| | |_|/ | |/| |
* / | | Get rid of level_type, unify BRANCH_*, LEVEL_* and portal vaults.Adam Borowski2011-11-041-2/+1
|/ / /
* | / Make cppcheck a bit happier.Adam Borowski2011-07-051-2/+0
| |/ |/|
* | Fix #781: handle throwing nets correctly in the Shoals tides.Johanna Ploog2011-04-141-1/+40
|/ | | | | | | | | | First, there a 10% chance of a net simply being washed away (as in, the item is moved by the tide even if the trapped critter isn't). If this happens, clean up the net properly. Second, whenever a monster (or the player) that happens to be caught in a net is shifted by the tides, move the net with it and *don't* clear the trapping status.
* Apply the new ground_level method.Raphael Langella2011-02-121-3/+2
| | | | | | | Also fix the following bugs: Rain message when clinging. Clinging monsters affected by Leda's. In water tiles when clinging over it (both player and monster).
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-15 21:01:22 +0000