summaryrefslogtreecommitdiffstats
path: root/src/serialize
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2012-04-03 13:29:05 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2012-04-04 16:22:11 +0200
commitf8e816d9185c09d1c17d921b775e483d132982e5 (patch)
tree3ab299ab6057db3bfd8feb24130a6fcb7e64a60d /src/serialize
parente4baa92aae537921dd17873328a95ab17afcfdfc (diff)
downloadmanaserv-f8e816d9185c09d1c17d921b775e483d132982e5.tar.gz
manaserv-f8e816d9185c09d1c17d921b775e483d132982e5.tar.xz
manaserv-f8e816d9185c09d1c17d921b775e483d132982e5.zip
Enhanced special support
- Made the current charge being saved. - Added script binds: - chr_set_special_recharge_speed - chr_get_special_recharge_speed - chr_set_special_mana - chr_get_special_mana - get_special_info - Added special info lua class. Functions: - name - needed_mana - rechargeable - on_use - on_recharged - category Further the engine no longer sets charge to 0 after using of specials this allows more flexbilillity (like failing specials). Changes on the xml database: - recharge renamed to rechargeable (needed by client and server) - needed - the needed mana to trigger a special (server only) - rechargespeed - the defailt recharge speed in mana per tick (server only) - target - the type of target (either being or point) (server and client) I also made the lua engine pushing nil instead of a 0 light userdata when the pointer was 0. Database update needed. Change is tested. Mana-Mantis: #167, #156 Reviewed-by: bjorn.
Diffstat (limited to 'src/serialize')
-rw-r--r--src/serialize/characterdata.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/serialize/characterdata.h b/src/serialize/characterdata.h
index 14a7097..cab5119 100644
--- a/src/serialize/characterdata.h
+++ b/src/serialize/characterdata.h
@@ -89,11 +89,12 @@ void serializeCharacterData(const T &data, MessageOut &msg)
}
// character specials
- std::map<int, Special*>::const_iterator special_it;
+ SpecialMap::const_iterator special_it;
msg.writeInt16(data.getSpecialSize());
for (special_it = data.getSpecialBegin(); special_it != data.getSpecialEnd() ; special_it++)
{
msg.writeInt32(special_it->first);
+ msg.writeInt32(special_it->second.currentMana);
}
// inventory - must be last because size isn't transmitted
@@ -183,7 +184,9 @@ void deserializeCharacterData(T &data, MessageIn &msg)
data.clearSpecials();
for (int i = 0; i < specialSize; i++)
{
- data.giveSpecial(msg.readInt32());
+ const int id = msg.readInt32();
+ const int mana = msg.readInt32();
+ data.giveSpecial(id, mana);
}