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/party.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/party.hpp')
| -rw-r--r-- | src/map/party.hpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/map/party.hpp b/src/map/party.hpp index 77e3aaf..e2cabb3 100644 --- a/src/map/party.hpp +++ b/src/map/party.hpp @@ -3,6 +3,8 @@ #include <functional> +#include "map.hpp" + struct party; struct map_session_data; struct block_list; @@ -11,16 +13,16 @@ void do_init_party(void); struct party *party_search(int party_id); struct party *party_searchname(const char *str); -int party_create(struct map_session_data *sd, const char *name); +int party_create(dumb_ptr<map_session_data> sd, const char *name); int party_created(int account_id, int fail, int party_id, const char *name); int party_request_info(int party_id); -int party_invite(struct map_session_data *sd, int account_id); +int party_invite(dumb_ptr<map_session_data> sd, int account_id); int party_member_added(int party_id, int account_id, int flag); -int party_leave(struct map_session_data *sd); -int party_removemember(struct map_session_data *sd, int account_id, +int party_leave(dumb_ptr<map_session_data> sd); +int party_removemember(dumb_ptr<map_session_data> sd, int account_id, const char *name); int party_member_leaved(int party_id, int account_id, const char *name); -int party_reply_invite(struct map_session_data *sd, int account_id, +int party_reply_invite(dumb_ptr<map_session_data> sd, int account_id, int flag); int party_recv_noinfo(int party_id); int party_recv_info(const struct party *sp); @@ -29,20 +31,20 @@ int party_recv_movemap(int party_id, int account_id, const char *map, int party_broken(int party_id); int party_optionchanged(int party_id, int account_id, int exp, int item, int flag); -int party_changeoption(struct map_session_data *sd, int exp, int item); +int party_changeoption(dumb_ptr<map_session_data> sd, int exp, int item); -int party_send_movemap(struct map_session_data *sd); -int party_send_logout(struct map_session_data *sd); +int party_send_movemap(dumb_ptr<map_session_data> sd); +int party_send_logout(dumb_ptr<map_session_data> sd); -int party_send_message(struct map_session_data *sd, const char *mes, int len); +int party_send_message(dumb_ptr<map_session_data> sd, const char *mes, int len); int party_recv_message(int party_id, int account_id, const char *mes, int len); int party_send_xy_clear(struct party *p); -void party_send_hp_check(struct block_list *bl, int party_id, int *flag); +void party_send_hp_check(dumb_ptr<block_list> bl, int party_id, int *flag); int party_exp_share(struct party *p, int map, int base_exp, int job_exp); -void party_foreachsamemap(std::function<void(struct block_list *)> func, - struct map_session_data *sd, int type); +void party_foreachsamemap(std::function<void(dumb_ptr<block_list>)> func, + dumb_ptr<map_session_data> sd, int type); #endif // PARTY_HPP |