summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tags.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-23 09:53:35 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-23 09:53:35 +0000
commitf99e05e0fe9978367c71ed097e18cbac86998c81 (patch)
tree49f6374d513f5344d33ec220c10a80730becc2a2 /crawl-ref/source/tags.cc
parent639bda974405b152b7655657a8a4af441888d74c (diff)
downloadcrawl-ref-f99e05e0fe9978367c71ed097e18cbac86998c81.tar.gz
crawl-ref-f99e05e0fe9978367c71ed097e18cbac86998c81.zip
Some more card implementations (resists in Helm, demon summoning.)
More type-safety. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1624 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tags.cc')
-rw-r--r--crawl-ref/source/tags.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index cfd339d5f6..274fed6dbb 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -1591,7 +1591,7 @@ static void unmarshall_monster(tagHeader &th, monsters &m)
m.speed = unmarshallByte(th);
// Avoid sign extension when loading files (Elethiomel's hang)
m.speed_increment = (unsigned char) unmarshallByte(th);
- m.behaviour = unmarshallByte(th);
+ m.behaviour = static_cast<beh_type>(unmarshallByte(th));
m.x = unmarshallByte(th);
m.y = unmarshallByte(th);
m.target_x = unmarshallByte(th);
@@ -1658,7 +1658,7 @@ void tag_read_level_attitude(struct tagHeader &th)
for (i = 0; i < count; i++)
{
- menv[i].attitude = unmarshallByte(th);
+ menv[i].attitude = static_cast<mon_attitude_type>(unmarshallByte(th));
menv[i].foe = unmarshallShort(th);
}
}
@@ -1709,7 +1709,7 @@ void tag_missing_level_attitude()
}
menv[i].attitude = (isFriendly)?ATT_FRIENDLY : ATT_HOSTILE;
- menv[i].behaviour = new_beh;
+ menv[i].behaviour = static_cast<beh_type>(new_beh);
menv[i].foe_memory = 0;
}
}