diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2013-05-25 13:49:50 -0700 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-05-25 13:49:50 -0700 |
commit | 1d0e18a186f67844ccd873eabb56ebdaa3f47f11 (patch) | |
tree | 94199c6dbcb6b4a86584c303f6e1e72073873f01 /src/map/clif.hpp | |
parent | 87218e07b2bc89593eae1cb4abe859cd1a7eaa0f (diff) | |
download | tmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.tar.gz tmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.tar.bz2 tmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.tar.xz tmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.zip |
Switch block_list and subclasses to dumb_ptr
Now we're well-defined, since we're actually calling ctors and dtors.
Most of this code will not survive long ...
Diffstat (limited to 'src/map/clif.hpp')
-rw-r--r-- | src/map/clif.hpp | 180 |
1 files changed, 90 insertions, 90 deletions
diff --git a/src/map/clif.hpp b/src/map/clif.hpp index df0a48b..5240fa1 100644 --- a/src/map/clif.hpp +++ b/src/map/clif.hpp @@ -9,7 +9,7 @@ #include "../common/timer.t.hpp" #include "battle.t.hpp" -#include "map.t.hpp" +#include "map.hpp" #include "pc.t.hpp" #include "skill.t.hpp" @@ -21,143 +21,143 @@ int clif_getport(void); int clif_countusers(void); void clif_setwaitclose(int); -int clif_authok(struct map_session_data *); +int clif_authok(dumb_ptr<map_session_data>); int clif_authfail_fd(int, int); int clif_charselectok(int); -int clif_dropflooritem(struct flooritem_data *); -int clif_clearflooritem(struct flooritem_data *, int); -int clif_clearchar(struct block_list *, BeingRemoveWhy); // area or fd -int clif_clearchar_delay(tick_t, struct block_list *, BeingRemoveWhy); +int clif_dropflooritem(dumb_ptr<flooritem_data>); +int clif_clearflooritem(dumb_ptr<flooritem_data>, int); +int clif_clearchar(dumb_ptr<block_list>, BeingRemoveWhy); // area or fd +int clif_clearchar_delay(tick_t, dumb_ptr<block_list>, BeingRemoveWhy); int clif_clearchar_id(int, BeingRemoveWhy, int); -int clif_spawnpc(struct map_session_data *); //area -int clif_spawnnpc(struct npc_data *); // area -int clif_spawn_fake_npc_for_player(struct map_session_data *sd, +int clif_spawnpc(dumb_ptr<map_session_data>); //area +int clif_spawnnpc(dumb_ptr<npc_data>); // area +int clif_spawn_fake_npc_for_player(dumb_ptr<map_session_data> sd, int fake_npc_id); -int clif_spawnmob(struct mob_data *); // area -int clif_walkok(struct map_session_data *); // self -int clif_movechar(struct map_session_data *); // area -int clif_movemob(struct mob_data *); //area -int clif_changemap(struct map_session_data *, const char *, int, int); //self -int clif_changemapserver(struct map_session_data *, const char *, int, int, struct in_addr, int); //self -int clif_fixpos(struct block_list *); // area -int clif_fixmobpos(struct mob_data *md); -int clif_fixpcpos(struct map_session_data *sd); -int clif_npcbuysell(struct map_session_data *, int); //self -int clif_buylist(struct map_session_data *, struct npc_data *); //self -int clif_selllist(struct map_session_data *); //self -int clif_scriptmes(struct map_session_data *, int, const char *); //self -int clif_scriptnext(struct map_session_data *, int); //self -int clif_scriptclose(struct map_session_data *, int); //self -int clif_scriptmenu(struct map_session_data *, int, const char *); //self -int clif_scriptinput(struct map_session_data *, int); //self -int clif_scriptinputstr(struct map_session_data *sd, int npcid); // self -int clif_cutin(struct map_session_data *, const char *, int); //self -int clif_viewpoint(struct map_session_data *, int, int, int, int, int, int); //self -int clif_additem(struct map_session_data *, int, int, PickupFail); //self -int clif_delitem(struct map_session_data *, int, int); //self -int clif_updatestatus(struct map_session_data *, SP); //self -int clif_damage(struct block_list *, struct block_list *, +int clif_spawnmob(dumb_ptr<mob_data>); // area +int clif_walkok(dumb_ptr<map_session_data>); // self +int clif_movechar(dumb_ptr<map_session_data>); // area +int clif_movemob(dumb_ptr<mob_data>); //area +int clif_changemap(dumb_ptr<map_session_data>, const char *, int, int); //self +int clif_changemapserver(dumb_ptr<map_session_data>, const char *, int, int, struct in_addr, int); //self +int clif_fixpos(dumb_ptr<block_list>); // area +int clif_fixmobpos(dumb_ptr<mob_data> md); +int clif_fixpcpos(dumb_ptr<map_session_data> sd); +int clif_npcbuysell(dumb_ptr<map_session_data>, int); //self +int clif_buylist(dumb_ptr<map_session_data>, dumb_ptr<npc_data_shop>); //self +int clif_selllist(dumb_ptr<map_session_data>); //self +int clif_scriptmes(dumb_ptr<map_session_data>, int, const char *); //self +int clif_scriptnext(dumb_ptr<map_session_data>, int); //self +int clif_scriptclose(dumb_ptr<map_session_data>, int); //self +int clif_scriptmenu(dumb_ptr<map_session_data>, int, const char *); //self +int clif_scriptinput(dumb_ptr<map_session_data>, int); //self +int clif_scriptinputstr(dumb_ptr<map_session_data> sd, int npcid); // self +int clif_cutin(dumb_ptr<map_session_data>, const char *, int); //self +int clif_viewpoint(dumb_ptr<map_session_data>, int, int, int, int, int, int); //self +int clif_additem(dumb_ptr<map_session_data>, int, int, PickupFail); //self +int clif_delitem(dumb_ptr<map_session_data>, int, int); //self +int clif_updatestatus(dumb_ptr<map_session_data>, SP); //self +int clif_damage(dumb_ptr<block_list>, dumb_ptr<block_list>, tick_t, interval_t, interval_t, int, int, DamageType, int); // area inline -int clif_takeitem(struct block_list *src, struct block_list *dst) +int clif_takeitem(dumb_ptr<block_list> src, dumb_ptr<block_list> dst) { return clif_damage(src, dst, tick_t(), interval_t::zero(), interval_t::zero(), 0, 0, DamageType::TAKEITEM, 0); } -int clif_changelook(struct block_list *, LOOK, int); // area -void clif_changelook_accessories(struct block_list *bl, struct map_session_data *dst); // area or target; list gloves, boots etc. -int clif_arrowequip(struct map_session_data *sd, int val); //self -int clif_arrow_fail(struct map_session_data *sd, int type); //self -int clif_statusupack(struct map_session_data *, SP, int, int); // self -int clif_equipitemack(struct map_session_data *, int, EPOS, int); // self -int clif_unequipitemack(struct map_session_data *, int, EPOS, int); // self -int clif_misceffect(struct block_list *, int); // area -int clif_changeoption(struct block_list *); // area -int clif_useitemack(struct map_session_data *, int, int, int); // self - -void clif_emotion(struct block_list *bl, int type); -void clif_sitting(int fd, struct map_session_data *sd); +int clif_changelook(dumb_ptr<block_list>, LOOK, int); // area +void clif_changelook_accessories(dumb_ptr<block_list> bl, dumb_ptr<map_session_data> dst); // area or target; list gloves, boots etc. +int clif_arrowequip(dumb_ptr<map_session_data> sd, int val); //self +int clif_arrow_fail(dumb_ptr<map_session_data> sd, int type); //self +int clif_statusupack(dumb_ptr<map_session_data>, SP, int, int); // self +int clif_equipitemack(dumb_ptr<map_session_data>, int, EPOS, int); // self +int clif_unequipitemack(dumb_ptr<map_session_data>, int, EPOS, int); // self +int clif_misceffect(dumb_ptr<block_list>, int); // area +int clif_changeoption(dumb_ptr<block_list>); // area +int clif_useitemack(dumb_ptr<map_session_data>, int, int, int); // self + +void clif_emotion(dumb_ptr<block_list> bl, int type); +void clif_sitting(int fd, dumb_ptr<map_session_data> sd); // trade -int clif_traderequest(struct map_session_data *sd, const char *name); -int clif_tradestart(struct map_session_data *sd, int type); -int clif_tradeadditem(struct map_session_data *sd, - struct map_session_data *tsd, int index, int amount); -int clif_tradeitemok(struct map_session_data *sd, int index, int amount, +int clif_traderequest(dumb_ptr<map_session_data> sd, const char *name); +int clif_tradestart(dumb_ptr<map_session_data> sd, int type); +int clif_tradeadditem(dumb_ptr<map_session_data> sd, + dumb_ptr<map_session_data> tsd, int index, int amount); +int clif_tradeitemok(dumb_ptr<map_session_data> sd, int index, int amount, int fail); -int clif_tradedeal_lock(struct map_session_data *sd, int fail); -int clif_tradecancelled(struct map_session_data *sd); -int clif_tradecompleted(struct map_session_data *sd, int fail); +int clif_tradedeal_lock(dumb_ptr<map_session_data> sd, int fail); +int clif_tradecancelled(dumb_ptr<map_session_data> sd); +int clif_tradecompleted(dumb_ptr<map_session_data> sd, int fail); // storage -int clif_storageitemlist(struct map_session_data *sd, struct storage *stor); -int clif_storageequiplist(struct map_session_data *sd, +int clif_storageitemlist(dumb_ptr<map_session_data> sd, struct storage *stor); +int clif_storageequiplist(dumb_ptr<map_session_data> sd, struct storage *stor); -int clif_updatestorageamount(struct map_session_data *sd, +int clif_updatestorageamount(dumb_ptr<map_session_data> sd, struct storage *stor); -int clif_storageitemadded(struct map_session_data *sd, struct storage *stor, +int clif_storageitemadded(dumb_ptr<map_session_data> sd, struct storage *stor, int index, int amount); -int clif_storageitemremoved(struct map_session_data *sd, int index, +int clif_storageitemremoved(dumb_ptr<map_session_data> sd, int index, int amount); -int clif_storageclose(struct map_session_data *sd); +int clif_storageclose(dumb_ptr<map_session_data> sd); // map_forallinmovearea callbacks -void clif_pcinsight(struct block_list *, struct map_session_data *); -void clif_pcoutsight(struct block_list *, struct map_session_data *); -void clif_mobinsight(struct block_list *, struct mob_data *); -void clif_moboutsight(struct block_list *, struct mob_data *); +void clif_pcinsight(dumb_ptr<block_list>, dumb_ptr<map_session_data>); +void clif_pcoutsight(dumb_ptr<block_list>, dumb_ptr<map_session_data>); +void clif_mobinsight(dumb_ptr<block_list>, dumb_ptr<mob_data>); +void clif_moboutsight(dumb_ptr<block_list>, dumb_ptr<mob_data>); -int clif_skillinfo(struct map_session_data *sd, SkillID skillid, int type, +int clif_skillinfo(dumb_ptr<map_session_data> sd, SkillID skillid, int type, int range); -int clif_skillinfoblock(struct map_session_data *sd); -int clif_skillup(struct map_session_data *sd, SkillID skill_num); +int clif_skillinfoblock(dumb_ptr<map_session_data> sd); +int clif_skillup(dumb_ptr<map_session_data> sd, SkillID skill_num); -int clif_skillcastcancel(struct block_list *bl); -int clif_skill_fail(struct map_session_data *sd, SkillID skill_id, int type, +int clif_skillcastcancel(dumb_ptr<block_list> bl); +int clif_skill_fail(dumb_ptr<map_session_data> sd, SkillID skill_id, int type, int btype); -int clif_skill_damage(struct block_list *src, struct block_list *dst, +int clif_skill_damage(dumb_ptr<block_list> src, dumb_ptr<block_list> dst, tick_t tick, interval_t sdelay, interval_t ddelay, int damage, int div, SkillID skill_id, int skill_lv, int type); -int clif_status_change(struct block_list *bl, +int clif_status_change(dumb_ptr<block_list> bl, StatusChange type, int flag); int clif_wis_message(int fd, const char *nick, const char *mes, int mes_len); int clif_wis_end(int fd, int flag); -int clif_itemlist(struct map_session_data *sd); -int clif_equiplist(struct map_session_data *sd); +int clif_itemlist(dumb_ptr<map_session_data> sd); +int clif_equiplist(dumb_ptr<map_session_data> sd); -int clif_mvp_effect(struct map_session_data *sd); +int clif_mvp_effect(dumb_ptr<map_session_data> sd); -int clif_movetoattack(struct map_session_data *sd, struct block_list *bl); +int clif_movetoattack(dumb_ptr<map_session_data> sd, dumb_ptr<block_list> bl); // party -int clif_party_created(struct map_session_data *sd, int flag); +int clif_party_created(dumb_ptr<map_session_data> sd, int flag); int clif_party_info(struct party *p, int fd); -int clif_party_invite(struct map_session_data *sd, - struct map_session_data *tsd); -int clif_party_inviteack(struct map_session_data *sd, const char *nick, int flag); -int clif_party_option(struct party *p, struct map_session_data *sd, +int clif_party_invite(dumb_ptr<map_session_data> sd, + dumb_ptr<map_session_data> tsd); +int clif_party_inviteack(dumb_ptr<map_session_data> sd, const char *nick, int flag); +int clif_party_option(struct party *p, dumb_ptr<map_session_data> sd, int flag); -int clif_party_leaved(struct party *p, struct map_session_data *sd, +int clif_party_leaved(struct party *p, dumb_ptr<map_session_data> sd, int account_id, const char *name, int flag); int clif_party_message(struct party *p, int account_id, const char *mes, int len); -int clif_party_xy(struct party *p, struct map_session_data *sd); -int clif_party_hp(struct party *p, struct map_session_data *sd); +int clif_party_xy(struct party *p, dumb_ptr<map_session_data> sd); +int clif_party_hp(struct party *p, dumb_ptr<map_session_data> sd); // atcommand void clif_displaymessage(int fd, const_string mes); -void clif_GMmessage(struct block_list *bl, const_string mes, int flag); -int clif_resurrection(struct block_list *bl, int type); +void clif_GMmessage(dumb_ptr<block_list> bl, const_string mes, int flag); +int clif_resurrection(dumb_ptr<block_list> bl, int type); -int clif_specialeffect(struct block_list *bl, int type, int flag); // special effects [Valaris] -int clif_message(struct block_list *bl, const char *msg); // messages (from mobs/npcs) [Valaris] +int clif_specialeffect(dumb_ptr<block_list> bl, int type, int flag); // special effects [Valaris] +int clif_message(dumb_ptr<block_list> bl, const char *msg); // messages (from mobs/npcs) [Valaris] -int clif_GM_kick(struct map_session_data *sd, struct map_session_data *tsd, +int clif_GM_kick(dumb_ptr<map_session_data> sd, dumb_ptr<map_session_data> tsd, int type); -int clif_foreachclient(std::function<void(struct map_session_data *)>); +int clif_foreachclient(std::function<void(dumb_ptr<map_session_data>)>); int do_init_clif (void); |