summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tags.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-10 18:22:58 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-10 18:24:05 +0530
commit8a78afdcea14016d0471fe74cc66a943c8fd616a (patch)
tree6b620847a4af5cde2ae851dd501bb14c20540a21 /crawl-ref/source/tags.cc
parent1acfe36802a6db5f6d2d6ed47b57c210b4136e72 (diff)
downloadcrawl-ref-8a78afdcea14016d0471fe74cc66a943c8fd616a.tar.gz
crawl-ref-8a78afdcea14016d0471fe74cc66a943c8fd616a.zip
Remove resist slowing, increment tag major version.
Diffstat (limited to 'crawl-ref/source/tags.cc')
-rw-r--r--crawl-ref/source/tags.cc40
1 files changed, 14 insertions, 26 deletions
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 5c5190bccd..3f0ee61f5a 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -1547,18 +1547,9 @@ static void tag_read_you(reader &th, char minorVersion)
you.water_in_sight = -1;
// List of currently beholding monsters (usually empty).
- if (minorVersion >= TAG_MINOR_BEHELD16)
- {
- count_c = unmarshallShort(th);
- for (i = 0; i < count_c; i++)
- you.beholders.push_back(unmarshallShort(th));
- }
- else
- {
- count_c = unmarshallByte(th);
- for (i = 0; i < count_c; i++)
- you.beholders.push_back(unmarshallByte(th));
- }
+ count_c = unmarshallShort(th);
+ for (i = 0; i < count_c; i++)
+ you.beholders.push_back(unmarshallShort(th));
you.piety_hysteresis = unmarshallByte(th);
@@ -1655,20 +1646,17 @@ static void tag_read_you_items(reader &th, char minorVersion)
for (j = 0; j < count_s; ++j)
you.seen_spell[j] = unmarshallByte(th);
- if (minorVersion >= TAG_MINOR_SEEN_WEAPONS_ARMOUR)
- {
- count_s = unmarshallShort(th);
- if (count_s > NUM_WEAPONS)
- count_s = NUM_WEAPONS;
- for (j = 0; j < count_s; ++j)
- you.seen_weapon[j] = unmarshallLong(th);
-
- count_s = unmarshallShort(th);
- if (count_s > NUM_ARMOURS)
- count_s = NUM_ARMOURS;
- for (j = 0; j < count_s; ++j)
- you.seen_armour[j] = unmarshallLong(th);
- }
+ count_s = unmarshallShort(th);
+ if (count_s > NUM_WEAPONS)
+ count_s = NUM_WEAPONS;
+ for (j = 0; j < count_s; ++j)
+ you.seen_weapon[j] = unmarshallLong(th);
+
+ count_s = unmarshallShort(th);
+ if (count_s > NUM_ARMOURS)
+ count_s = NUM_ARMOURS;
+ for (j = 0; j < count_s; ++j)
+ you.seen_armour[j] = unmarshallLong(th);
}
static PlaceInfo unmarshallPlaceInfo(reader &th)