summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/kills.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2010-06-20 00:28:11 +0200
committerAdam Borowski <kilobyte@angband.pl>2010-06-20 20:27:49 +0200
commita201159a83c15d2e9d3d027423162acab391cba0 (patch)
tree0634bce04097fcd45e82566d1e507c05340c278f /crawl-ref/source/kills.cc
parent239738eefd7df21b8298966c3f2194510dfe899a (diff)
downloadcrawl-ref-a201159a83c15d2e9d3d027423162acab391cba0.tar.gz
crawl-ref-a201159a83c15d2e9d3d027423162acab391cba0.zip
s/marshallLong/marshallInt/, since this confusion tends to cause bugs.
Actually, it should be named marshallInt32_t as that's what it does, but that's hard to read, no architecture with smaller ints can conceivably run Crawl and the only architecture with bigger ints is long dead. And in even in such a case, everything will be fine except for name confusion...
Diffstat (limited to 'crawl-ref/source/kills.cc')
-rw-r--r--crawl-ref/source/kills.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/kills.cc b/crawl-ref/source/kills.cc
index fec644d675..1ab45a9522 100644
--- a/crawl-ref/source/kills.cc
+++ b/crawl-ref/source/kills.cc
@@ -325,7 +325,7 @@ long Kills::get_kills(std::vector<kill_exp> &all_kills) const
void Kills::save(writer& outf) const
{
// How many kill records do we have?
- marshallLong(outf, kills.size());
+ marshallInt(outf, kills.size());
for ( kill_map::const_iterator iter = kills.begin();
iter != kills.end(); ++iter)
@@ -346,7 +346,7 @@ void Kills::save(writer& outf) const
void Kills::load(reader& inf)
{
// How many kill records?
- long kill_count = unmarshallLong(inf);
+ int kill_count = unmarshallInt(inf);
kills.clear();
for (long i = 0; i < kill_count; ++i)
{