diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-09 21:43:14 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-09 21:43:14 +0000 |
| commit | a4649f7bcd32304352b4d52a9c24a8455b41e8bc (patch) | |
| tree | 2653ff094f7279d0f17c76d14528f0c1cbf1c52d /crawl-ref/source/decks.cc | |
| parent | 94e75528f21fb8aa910c06893dfc46ca2785f20f (diff) | |
| download | crawl-ref-a4649f7bcd32304352b4d52a9c24a8455b41e8bc.tar.gz crawl-ref-a4649f7bcd32304352b4d52a9c24a8455b41e8bc.zip | |
Apply recent commits to 0.4, including Matthew's evil zoo fix.
Now how do I change the properties to native again?
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6465 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
| -rw-r--r-- | crawl-ref/source/decks.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 6298404b97..1328c4e0d3 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -841,7 +841,7 @@ bool deck_peek() // Mark a deck: look at the next four cards, mark them, and shuffle // them back into the deck. The player won't know what order they're -// in, and the if the top card is non-marked then the player won't +// in, and if the top card is non-marked then the player won't // know what the next card is. Return false if the operation was // failed/aborted along the way. bool deck_mark() |