summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/notes.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-04-25 22:38:21 +0200
committerAdam Borowski <kilobyte@angband.pl>2012-04-25 22:38:21 +0200
commitca96156951bf69e87e50d81448e0bce7a0f71a5e (patch)
tree70b4d478d6c4f68e16500d71fa8a247ac4796c90 /crawl-ref/source/notes.cc
parente8da5e6c01950dd649f90030a2c77654480e4369 (diff)
downloadcrawl-ref-ca96156951bf69e87e50d81448e0bce7a0f71a5e.tar.gz
crawl-ref-ca96156951bf69e87e50d81448e0bce7a0f71a5e.zip
Drop TAG_MAJOR_VERSION == 32 ifdefs.
Diffstat (limited to 'crawl-ref/source/notes.cc')
-rw-r--r--crawl-ref/source/notes.cc15
1 files changed, 0 insertions, 15 deletions
diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc
index 0a39345486..9dfde91680 100644
--- a/crawl-ref/source/notes.cc
+++ b/crawl-ref/source/notes.cc
@@ -253,12 +253,6 @@ std::string Note::describe(bool when, bool where, bool what) const
if (where)
{
-#if TAG_MAJOR_VERSION == 32
- if (!place_abbrev.empty())
- result << "| " << chop_string(place_abbrev, MAX_NOTE_PLACE_LEN)
- << " | ";
- else
-#endif
result << "| " << chop_string(short_place_name(packed_place),
MAX_NOTE_PLACE_LEN) << " | ";
}
@@ -433,9 +427,6 @@ Note::Note()
Note::Note(NOTE_TYPES t, int f, int s, const char* n, const char* d) :
type(t), first(f), second(s)
-#if TAG_MAJOR_VERSION == 32
- , place_abbrev("")
-#endif
{
if (n)
name = std::string(n);
@@ -493,9 +484,6 @@ void Note::save(writer& outf) const
marshallInt(outf, first);
marshallInt(outf, second);
marshallString4(outf, name);
-#if TAG_MAJOR_VERSION == 32
- marshallString4(outf, place_abbrev);
-#endif
marshallString4(outf, desc);
}
@@ -507,9 +495,6 @@ void Note::load(reader& inf)
first = unmarshallInt(inf);
second = unmarshallInt(inf);
unmarshallString4(inf, name);
-#if TAG_MAJOR_VERSION == 32
- unmarshallString4(inf, place_abbrev);
-#endif
unmarshallString4(inf, desc);
}