summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/behold.cc
Commit message (Collapse)AuthorAgeFilesLines
* Avoid another beholder crash (#8844)Neil Moore2014-08-131-0/+3
| | | | | 0.14-a0-1237-g6f3e6ea fixed update_beholders and update_fearmongers but not update_beholder and update_fearmonger.
* A couple mesmerisation tweaksDracoOmega2014-03-111-2/+4
| | | | | | Reduce mermaid/siren mesmerisation power, increase base duration, make breaking mesmerisation grant brief immunity to being remesmerised.
* Avoid a beholder/fearmonger crash (#6547)Neil Moore2013-12-011-4/+12
| | | | | | | | | | When removing the last beholder or fearmonger, we could print a message before setting DUR_MESMERISED|AFRAID to zero. If that triggered a redraw of the status area, the inconsistent state would trigger an assertion. Now quietly remove the status before messaging about losing the beholder.
* Replace `mpr(s, ch)` with `mprf(ch, s)`Adam Borowski2013-11-291-3/+3
| | | | | | | | | Also simplify quite a few cases. It turns out in >90% cases of non-literals the argument had .c_str(), which meant it was pointlessly malloc()ed and converted from and to std::string. I believe a sprintf is faster, so even the argument of miniscule speed-up doesn't apply.
* Replace `mprf(s)` with `mpr(s)`Chris Oelmueller2013-11-281-1/+1
| | | | Scripted, then manually reviewed.
* More formatting fixes for return (...);Neil Moore2013-11-151-13/+13
|
* Drop unnecessary parentheses from return statements.Adam Borowski2013-11-151-2/+2
|
* Remove moths of suppressionChris Campbell2013-11-111-1/+1
| | | | | | | | | | | Suppression is a hugely complicated and inconsistent mechanic. Its original purpose was to be a way of overriding rPois in Spider but there are now plenty of monsters that do this effectively (and much more simply). [1KB: I moved this to trunk, as it made an already extremely hard to review branch massively more so. There's nothing but a single enum to preserve, so compat break doesn't make this removal any easier or harder.]
* Don't equate frenzy with berserk; let non-natural monsters frenzy.Steve Melenchuk2013-07-151-1/+2
| | | | | | | This removes the implicit haste, might, and HP boost associated with frenzy. Frenzying a natural monster also hastes and mights them; frenzying a non-natural monster will simply make them attack nearby monsters indiscriminately without any combat enhancements.
* Remove use of 'you' inside player member functionspubby2013-06-301-6/+6
| | | | | | 'you' seemed to be pointless in such context anyways, and lead to some const correctness bugs since '*this' could have a different const-ness from 'you'.
* Include debug.h earlier.Adam Borowski2013-04-261-1/+0
| | | | | Via externs.h -> bitary.h, it was effectively included by everything anyway, and this way simplifies include chains.
* Indentation fixes.Adam Borowski2012-12-051-2/+2
|
* Drop a lot of unnecessary braces.Adam Borowski2012-10-241-4/+0
| | | | | The perl one-liner I use for this had a bug where it didn't match "else" at the end of a line (ie, most of the time).
* Remove unnecessary includes from header files.Jay3.14152012-10-231-1/+1
| | | | | | | | | | For most header files, this only saves on having to recompile a small number of source files, but there are also a few headers where small changes would now take significantly less time. This is most obvious for the Tiles build for which the dependencies have been greatly reduced, so that the only additional includes when compared to console are strictly library or tile related.
* Drop a bunch of parentheses from return statements.Adam Borowski2012-08-081-1/+1
| | | | | This is incomplete, partially because of me getting bored, partially because of doubts about the point of leaving simple addition/etc in parentheses.
* Drop parentheses around scalar values in "return".Adam Borowski2012-07-051-6/+6
|
* Remove spaces between function identifiers and arguments lists.Adam Borowski2012-06-211-5/+1
|
* Suppression: new function: player_equip_unrand_effectBen Striegel2012-05-181-1/+1
|
* Drop pointless braces after if/for/while everywhere.Adam Borowski2012-04-201-4/+0
|
* Merge branch 'master' into unified_combat_controlRobert Burnham2011-11-161-7/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: crawl-ref/source/fight.cc crawl-ref/source/mon-stuff.cc crawl-ref/source/player-stats.cc One of the more significant changes resulting from this merge is that the new minotaur_retaliation which is supposed to have a max occurrence of once per monster attack round simply has a chance per monster attack (regardless of whether we're in the same effective attack round) which increases based on effective_attack_num which lends to the possibility of multiple retaliations.
| * Fix an useless use of mon_info by the obsidian axe.Adam Borowski2011-11-071-7/+7
| |
* | Merge branch 'master' into unified_combat_controlRobert Burnham2011-10-251-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * cppcheck: fix inefficient checking for emptiness.Adam Borowski2011-07-051-1/+1
| | | | | | | | | | On some STL structures size() is slow. I did not bother limitting sed, so innocent bystanders got pulled into the machine, but there's no loss.
| * Gut and parcel out most of stuff.ccAdam Borowski2011-06-041-1/+0
| |
* | Merge branch 'master' into unified_combat_controlRobert Burnham2011-04-261-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Make file headers doxygen-friendly, drop useless fields.Adam Borowski2011-03-281-4/+4
| | | | | | | | | | | | | | "File:" is shown in your editor's status bar. "Written by:" was used only for the first person who changed a file. We got git for that now, and pre-DCSS history is so woefully inaccurate it doesn't really matter.
* | Replace DESC_NOCAP_THE with DESC_THERobert Burnham2011-03-251-2/+2
| |
* | Replace DESC_CAP_THE with DESC_THERobert Burnham2011-03-251-6/+6
|/ | | | | Also makes some replacements for DESC_CAP_YOUR, DESC_NOCAP_YOUR, DESC_CAP_A, DESC_NOCAP_A as was convenient...so don't expect this to compile...at all.
* De-mermaid-ify mesmerisation for non-mermaid beholders.Jude Brown2011-03-061-14/+62
| | | | | | It's a little bit odd to be beheld by an ogre, say, and then have them described as "mermaids" or their actions as "singing". A bit jarring and odd, but fixed now!
* Fix Mesmerisation spell (kilobyte).Jude Brown2011-03-061-1/+2
| | | | | Forgot to update possible_beholder to accept any monster with the Mesmerisation spell.
* Make it less likely the demon axe will trap the player.Shayne Halvorson2011-02-131-1/+1
| | | | | | | | | | | | * Mesmerisation no longer works through translucent walls. * The demon axe will only cause the player to be mesmerised by one monster at a time, so the player can't be unable to move due to monsters on two sides. * Preventing noise from stopping the demon axe's effect actually works. This still leaves monsters that can't or won't reach the player in the middle of a deep water or lava pool as a general mesmerisation issue (that sewer vault with the siren at the end, for instance).
* Demon axe unrandartShayne Halvorson2011-02-131-13/+22
|
* Reroll of Zin recite patch.Eronarn Palazzo2011-01-231-0/+1
|
* Rename class "monsters" to "monster".Robert Vollmert2010-09-051-10/+10
|
* Reorder beholder checks so non-mermaids don't cause costly LOS runs.Adam Borowski2010-07-031-2/+2
|
* make 'game type' an enum rather than a bool, and serialize itJesse Luehrs2010-03-021-1/+1
|
* Trim unnecessary #includes.Adam Borowski2010-01-131-2/+0
|
* Beholding + berserk/fleeing/sanctuaryMatthew Cline2009-12-061-2/+33
| | | | | | If a mermaid goes berserk or starts fleeing it stops singing, and if the player is in Sanctuary then the mermaid's song sounds muted and has no effect on the player.
* Sometimes give msg when mermaid stops beholdingMatthew Cline2009-12-051-0/+25
|
* Bug #125: Pacifying mermaid -> still mesmerizedMatthew Cline2009-12-051-1/+2
| | | | | If a mermaid is pacified (or otherwise changes attitude so that it won't attack the player) then it will stop mesmerizing the player.
* Fix mesmerisation being broken too soonMatthew Cline2009-12-021-1/+1
|
* Move silenced(pos) to areas.cc.Robert Vollmert2009-11-211-0/+1
|
* Beholder check now uses proper LOS.Robert Vollmert2009-11-211-16/+5
| | | | This should fix corners cutting mesmerization short (2901182).
* Update delay for mesmerisation, slowing, and hasteCharles Otto2009-11-151-7/+3
| | | | | Also fix a couple compile issues and change over one last case for paralysis
* Remove a few obsolete includes.Robert Vollmert2009-11-101-1/+0
| | | | Also add a few previously indirect includes.
* Split shouting and stealth code from view.cc.Robert Vollmert2009-11-101-0/+1
|
* behold.cc: Don't use 'you' in methods of player.Vsevolod Kozlov2009-11-081-4/+4
|
* Replace mons_cannot_move with monsters::cannot_move.Vsevolod Kozlov2009-11-081-1/+1
|
* Move mons_is_friendly to monsters::friendly.Vsevolod Kozlov2009-11-061-1/+1
| | | | Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
* Restore genus check in beholder update.Robert Vollmert2009-11-051-1/+2
|
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-06 17:47:50 +0000