summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tiledoll.cc
Commit message (Collapse)AuthorAgeFilesLines
* Drop double newlines where they seem to serve no purpose.Adam Borowski2013-12-211-1/+0
| | | | | Sometimes, they're there to emphasize a break between two sections of code, which is good. In a majority of cases, though, they're just inconsistent.
* More formatting fixes for return (...);Neil Moore2013-11-151-2/+2
|
* Drop unnecessary parentheses from return statements.Adam Borowski2013-11-151-1/+1
|
* Fix some assignment operators.Neil Moore2013-10-161-1/+2
| | | | These three did not properly handle self-assignment.
* ASSERT_RANGEs other than >= <.Adam Borowski2013-06-081-4/+2
| | | | | | Committing separately as I'm not sure whether checking, for example, ASSERT_RANGE(level, 1, 28) is that nice. Perhaps 27 + 1 could be better? Perhaps some other syntax?
* Refactor ASSERT(a && b) -> ASSERT(a); ASSERT(b);Brendan Hickey2013-04-281-2/+4
| | | | | | | Convert conjunctive assertions into separate assertions. This ought to be correctness preserving. I ran the stress tests and didn't notice anything unusual. While I have confidence in it, if you are the slightest bit suspicious of this, please roll it back. Found instances with `ASSERT(\([^(|]*\) && \([^)|]*\))` Manually inspected each instance.
* Don't show cloaks in lich form (Medar).Florian Diebold2013-03-251-0/+1
| | | | It doesn't really fit on the tile.
* Handle lich and statue form tiles the same way as tree form.Florian Diebold2013-03-191-3/+42
| | | | | | This removes the _transform_add_weapon hack, and shows all unmelded equipment on statues and shields on liches; armour doesn't fit right on the current lich tile so it is disabled.
* Who's been feeding energy drinks, Red Bull in particular, to trees again?Adam Borowski2013-03-191-0/+1
| | | | Cut down their wings, or Durkon will be too afraid.
* Shave off tree beards (poor Fangorn...).Adam Borowski2013-03-191-0/+1
|
* Properly heed meldedness of armour (all slots) in tiles.Adam Borowski2013-03-191-6/+6
|
* Link monster tiles for bad forms, add a too-ugly-to-live tree form one.Adam Borowski2013-01-051-0/+12
| | | | | | | The code for equipment-using form tiles is not fit for the task, so I used a hack using regular player doll code instead. It draws the weapon behind the tile instead of the front (and can't be easily fixed), and fails to draw shields at all.
* Drop a lot of unnecessary braces.Adam Borowski2012-10-241-2/+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).
* Use std namespace.Raphael Langella2012-08-261-2/+2
| | | | | | | | | | | | | 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.
* Some more return deparenthesization.Adam Borowski2012-07-051-1/+1
|
* Drop parentheses around scalar values in "return".Adam Borowski2012-07-051-5/+5
|
* Horny cat tiles (ontoclasm).Adam Borowski2012-06-091-12/+20
| | | | | | | Checks for inappropriate combinations (possible due to the doll editor) are really ugly, and in the editor you get series of tile parts that won't show up. That's nothing new (nagas, etc), but points out how the doll editor is unmaintained.
* Make tileidx_t 64 bits long.Florian Diebold2012-05-241-3/+3
|
* Drop pointless braces after else/else if as well.Adam Borowski2012-04-201-4/+0
|
* Drop pointless braces after if/for/while everywhere.Adam Borowski2012-04-201-8/+0
|
* Remove tentacles as a mutation, and make them intrinsic to octopodes.David Lawrence Ramsey2012-04-191-10/+0
| | | | For now, Beastly Appendage will grant claws instead of tentacles.
* Wrap some egregiously long lines in the source.Adam Borowski2012-03-281-2/+4
| | | | | While adhering religiously to the 80 column limit tends to be often pointless, 173 column long lines are way, way over the edge from the other side.
* Drop the display of nets on player dolls.Adam Borowski2011-12-271-3/+0
| | | | | It was strange that this short-lived effect was singled out while nothing else is.
* Fix monster weapons not showing when the player's weapon is melded (#5038).Florian Diebold2011-12-141-1/+1
| | | | | | | tilep_equ_weapon checked if the player's weapon is melded even though it was also used for monster weapons. I also removed redundant checks for the player's respective equipment slots from the other tilep_equ_* functions.
* Tentacle hands for dolls from Pingas (#4687).Eino Keskitalo2011-11-121-0/+22
| | | | They're displayed if the player has the mutation, is not an octopode, and is not wielding/wearing something in the hand. For non-octopodes, only Beastly Appendage gives tentacles, but once there's constriction, they should be considered as a normal and/or DS mutation.
* Two new artefact bardings. (Hate hate hate hate tile barding code)Adam Borowski2011-09-111-2/+4
| | | | | | Too angry to check if webtiles work, sorry. The properties are the initial draft too -- need to decide who shouted loudest during the debate and change it accordingly.
* Immediately display changes to the player doll.Florian Diebold2011-06-261-0/+9
|
* First prototype of webtiles.Florian Diebold2011-06-261-1/+5
| | | | | | Conflicts: crawl-ref/source/startup.cc
* Fix a small invalid read.Florian Diebold2011-05-241-1/+1
| | | | | This probably never caused problems, but valgrind found it, so I fixed it.
* Merge branch 'unicode'.Adam Borowski2011-04-011-2/+3
|\ | | | | | | | | There are some issues left, like incorrect wrapping in some cases, but we can fix them later.
| * Merge branch 'master' into unicodeAdam Borowski2011-03-131-6/+1
| |\
| * \ Merge branch 'master' into unicodeAdam Borowski2010-12-121-2/+2
| |\ \
| * \ \ Merge branch 'master' into unicodeAdam Borowski2010-10-151-2/+2
| |\ \ \
| * | | | Handle filenames with non-ascii characters.Adam Borowski2010-09-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Only iostreams functions are left; on Windows they don't support Unicode so a workaround will be needed.
* | | | | Make file headers doxygen-friendly, drop useless fields.Adam Borowski2011-03-281-6/+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.
* | | | Schedule DNGN_STATUE_RESERVED for removal on next major version change.Johanna Ploog2011-02-251-6/+1
| |_|/ |/| | | | | | | | Only serves to make wizmode creating statues more tedious.
* | | Get rid of you.attribute[ATTR_TRANSFORMATION].Adam Borowski2010-12-041-2/+2
| |/ |/| | | | | | | | | | | | | Galehar's your_name hack was a step in the right direction, but it was still not fully clean. There's no reason to use you.attribute[] -- it has a benefit of not requiring a minor tag (something that was even impossible in the past!), but has its flaws like verbosity, being hard to read and not allowing using proper types the compiler can use to give warnings.
* | Massive spacing fixes: "( spaces after parentheses )".Adam Borowski2010-10-151-2/+2
|/ | | | | | I did review it manually to find places where they made sense (like some tables), but for a massive sed job like this there might be places that I missed.
* Write (but not read yet!) doll files as chunks.Adam Borowski2010-09-041-6/+4
|
* Binary gender is no longer required.Enne Walker2010-06-161-19/+6
| | | | | | | New species tile art is no longer required to conform to binary genders. All references to player gender have been removed. All the art is still there, but the default gender presentations have been swapped around arbitrarily.
* Assign tile dolls random trousers for SHOW_EQUIP.Enne Walker2010-06-091-0/+19
| | | | This way they don't have to be hardcoded in dolls.txt.
* Fix tile dolls so trousers are drawn under boots.Enne Walker2010-06-091-2/+2
|
* Split player tile logic out from tilepick.cc.Enne Walker2010-05-301-1/+1
| | | | All player tile look-ups are now in tilepick-p.cc.
* Split up tiles.h.Enne Walker2010-05-301-0/+1
| | | | | | Most of it has gone into tilepick.h, but also into enum.h and initfile.cc. Unlike tiles.h which was included everywhere, tilepick.h is now only a dependency of about half the files.
* Use tileidx_t for tile indices. Also, cleanup.Enne Walker2010-05-301-17/+20
| | | | | | | | This new type defines to unsigned int, but it cleans up a lot of the int/unsigned int/short confusion all over the codebase for tile indices. This commit also cleans up tiles code to use coord_def more and to change function signatures to pass const refs and non-const pointers.
* Fix compile for Windows TilesJanne Lahdenpera2010-04-281-0/+2
| | | | | | Added missing header <sys/stat.h> Signed-off-by: Janne Lahdenpera <felirx@gmail.com>
* Split tilereg.h/cc into multiple files.Enne Walker2010-04-251-0/+487
No functional changes, just rearranging and exposing functions where needed.