diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2010-10-15 02:17:01 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2010-10-15 02:17:01 +0200 |
| commit | f7717330f1e10f18464a68edc1b595dd6a6b9527 (patch) | |
| tree | daff37556fe8b661c5d268b1429f73ae6669153d /crawl-ref/source/tiledoll.cc | |
| parent | e7572d74b30900124d9a896843f42b1c957d20c2 (diff) | |
| parent | 448542e984ad690be6be5869e0f47072981ed2ce (diff) | |
| download | crawl-ref-f7717330f1e10f18464a68edc1b595dd6a6b9527.tar.gz crawl-ref-f7717330f1e10f18464a68edc1b595dd6a6b9527.zip | |
Merge branch 'master' into unicode
Diffstat (limited to 'crawl-ref/source/tiledoll.cc')
| -rw-r--r-- | crawl-ref/source/tiledoll.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/tiledoll.cc b/crawl-ref/source/tiledoll.cc index 421aafcb39..57d5bc4c3a 100644 --- a/crawl-ref/source/tiledoll.cc +++ b/crawl-ref/source/tiledoll.cc @@ -107,7 +107,7 @@ bool load_doll_data(const char *fn, dolls_data *dolls, int max, : dollsTxtString.c_str(); - if ( (fp = fopen_u(dollsTxt, "r")) == NULL ) + if ((fp = fopen_u(dollsTxt, "r")) == NULL) { // File doesn't exist. By default, use equipment settings. *mode = TILEP_MODE_EQUIP; @@ -165,7 +165,7 @@ bool load_doll_data(const char *fn, dolls_data *dolls, int max, } else // Load up to max dolls from file. { - for (int count = 0; count < max && fscanf(fp, "%1023s", fbuf) != EOF; ) + for (int count = 0; count < max && fscanf(fp, "%1023s", fbuf) != EOF;) { if (fbuf[0] == '#') // Skip comment lines. continue; |