diff options
| author | Brendan Hickey <brendan@bhickey.net> | 2013-05-29 21:30:21 -0700 |
|---|---|---|
| committer | Brendan Hickey <brendan@bhickey.net> | 2013-05-29 21:30:21 -0700 |
| commit | f01b7cc7abd9929b8dba5f1b6b18f6eb0ed389ab (patch) | |
| tree | c2182dbecbfe47431b12d261581a81d97f941d5a /crawl-ref/source/tag-version.h | |
| parent | ad82a94a19619e35097695485c2d3f4012abd5ec (diff) | |
| parent | 70f8c6ce77d308480ba598c31f6929ae42a93ef4 (diff) | |
| download | crawl-ref-f01b7cc7abd9929b8dba5f1b6b18f6eb0ed389ab.tar.gz crawl-ref-f01b7cc7abd9929b8dba5f1b6b18f6eb0ed389ab.zip | |
Merge branch 'master' into gargoyle_merge
Conflicts resolved:
crawl-ref/source/enum.h
crawl-ref/source/ng-restr.cc
crawl-ref/source/player.cc
crawl-ref/source/species.cc
crawl-ref/source/tag-version.h
Diffstat (limited to 'crawl-ref/source/tag-version.h')
| -rw-r--r-- | crawl-ref/source/tag-version.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/tag-version.h b/crawl-ref/source/tag-version.h index 4289fae2fa..1cc9a39757 100644 --- a/crawl-ref/source/tag-version.h +++ b/crawl-ref/source/tag-version.h @@ -3,6 +3,9 @@ // Character info has its own top-level tag, mismatching majors don't break // compatibility there. +// DO NOT BUMP THIS UNLESS YOU KNOW WHAT YOU'RE DOING. This would break +// the save browser across versions, possibly leading to overwritten games. +// It's only there in case there's no way out. #define TAG_CHR_FORMAT 0 // Let CDO updaters know if the syntax changes. @@ -37,6 +40,9 @@ enum tag_minor_version TAG_MINOR_NOME_NO_MORE, // Remove unused gnome variable. TAG_MINOR_NO_SPLINT, // Remove splint mail TAG_MINOR_ORIG_MONNUM, // orig_monnum is type rather than type+1. + TAG_MINOR_SPRINT_SCORES, // Separate score lists for each sprint map + TAG_MINOR_FOOD_AUTOPICKUP, // Separate meat, fruit, others in \ menu. + TAG_MINOR_LORC_TEMPERATURE, // Save lava orc temperature TAG_MINOR_GROTESK_DR, // Grotesk damage reduction NUM_TAG_MINORS, TAG_MINOR_VERSION = NUM_TAG_MINORS - 1 |