The master and develop branches track hengband.
OS X development happens on the macos-1-6-2, macos-2-2-1, and macos-develop branches.
| Revision | 847c7693cd0d481e717866d2977b536d832729da (tree) |
|---|---|
| Time | 2021-01-21 10:03:49 |
| Author | Eric Branlund <ebranlund@fast...> |
| Commiter | Eric Branlund |
Merge branch 'english-quest-info' into develop-cocoa
src/floor/fixed-map-generator.c (diff)| @@ -271,8 +271,13 @@ static int parse_qtw_Q(qtwg_type *qtwg_ptr, char **zz) | ||
| 271 | 271 | if (qtwg_ptr->buf[0] != 'Q') |
| 272 | 272 | return PARSE_CONTINUE; |
| 273 | 273 | |
| 274 | +#ifdef JP | |
| 274 | 275 | if (qtwg_ptr->buf[2] == '$') |
| 275 | 276 | return PARSE_ERROR_NONE; |
| 277 | +#else | |
| 278 | + if (qtwg_ptr->buf[2] != '$') | |
| 279 | + return PARSE_ERROR_NONE; | |
| 280 | +#endif | |
| 276 | 281 | |
| 277 | 282 | int num = tokenize(qtwg_ptr->buf + _(2, 3), 33, zz, 0); |
| 278 | 283 | if (num < 3) |
Fork