summaryrefslogtreecommitdiffstats
path: root/src/serialize
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-04-13 12:32:22 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-05-08 14:02:50 +0200
commit708896008ad8ea391d542ce37b9871318a84fb97 (patch)
tree30c862cb18d354f879ffb0b426d5ff133d2bde3b /src/serialize
parente2b6a4efe72333ab0e0761f4e9e8ce9eb29a5335 (diff)
downloadmanaserv-708896008ad8ea391d542ce37b9871318a84fb97.tar.gz
manaserv-708896008ad8ea391d542ce37b9871318a84fb97.tar.xz
manaserv-708896008ad8ea391d542ce37b9871318a84fb97.zip
[Abilities] Renamed specials to abilities
Diffstat (limited to 'src/serialize')
-rw-r--r--src/serialize/characterdata.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/serialize/characterdata.h b/src/serialize/characterdata.h
index c25fb09..ada7e25 100644
--- a/src/serialize/characterdata.h
+++ b/src/serialize/characterdata.h
@@ -86,13 +86,14 @@ void serializeCharacterData(const T &data, MessageOut &msg)
msg.writeInt32(kills_it->second);
}
- // character specials
- SpecialMap::const_iterator special_it;
- msg.writeInt16(data.getSpecialSize());
- for (special_it = data.getSpecialBegin(); special_it != data.getSpecialEnd() ; special_it++)
+ // character abilities
+ AbilityMap::const_iterator abilitiy_it;
+ msg.writeInt16(data.getAbilitySize());
+ for (abilitiy_it = data.getAbilityBegin();
+ abilitiy_it != data.getAbilityEnd(); abilitiy_it++)
{
- msg.writeInt32(special_it->first);
- msg.writeInt32(special_it->second.currentMana);
+ msg.writeInt32(abilitiy_it->first);
+ msg.writeInt32(abilitiy_it->second.currentPoints);
}
// inventory - must be last because size isn't transmitted
@@ -177,14 +178,14 @@ void deserializeCharacterData(T &data, MessageIn &msg)
data.setKillCount(monsterId, kills);
}
- // character specials
- int specialSize = msg.readInt16();
- data.clearSpecials();
- for (int i = 0; i < specialSize; i++)
+ // character abilities
+ int abilitiesSize = msg.readInt16();
+ data.clearAbilities();
+ for (int i = 0; i < abilitiesSize; i++)
{
const int id = msg.readInt32();
const int mana = msg.readInt32();
- data.giveSpecial(id, mana);
+ data.giveAbility(id, mana);
}