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/trade.cpp | |
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/trade.cpp')
-rw-r--r-- | src/map/trade.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/map/trade.cpp b/src/map/trade.cpp index ba789c3..ff54caa 100644 --- a/src/map/trade.cpp +++ b/src/map/trade.cpp @@ -17,9 +17,9 @@ * 取引要請を相手に送る *------------------------------------------ */ -void trade_traderequest(struct map_session_data *sd, int target_id) +void trade_traderequest(dumb_ptr<map_session_data> sd, int target_id) { - struct map_session_data *target_sd; + dumb_ptr<map_session_data> target_sd; nullpo_retv(sd); @@ -71,9 +71,9 @@ void trade_traderequest(struct map_session_data *sd, int target_id) * 取引要請 *------------------------------------------ */ -void trade_tradeack(struct map_session_data *sd, int type) +void trade_tradeack(dumb_ptr<map_session_data> sd, int type) { - struct map_session_data *target_sd; + dumb_ptr<map_session_data> target_sd; nullpo_retv(sd); if ((target_sd = map_id2sd(sd->trade_partner)) != NULL) @@ -102,9 +102,9 @@ void trade_tradeack(struct map_session_data *sd, int type) * アイテム追加 *------------------------------------------ */ -void trade_tradeadditem(struct map_session_data *sd, int index, int amount) +void trade_tradeadditem(dumb_ptr<map_session_data> sd, int index, int amount) { - struct map_session_data *target_sd; + dumb_ptr<map_session_data> target_sd; struct item_data *id; int trade_i; int trade_weight = 0; @@ -227,9 +227,9 @@ void trade_tradeadditem(struct map_session_data *sd, int index, int amount) * アイテム追加完了(ok押し) *------------------------------------------ */ -void trade_tradeok(struct map_session_data *sd) +void trade_tradeok(dumb_ptr<map_session_data> sd) { - struct map_session_data *target_sd; + dumb_ptr<map_session_data> target_sd; int trade_i; nullpo_retv(sd); @@ -259,9 +259,9 @@ void trade_tradeok(struct map_session_data *sd) * 取引キャンセル *------------------------------------------ */ -void trade_tradecancel(struct map_session_data *sd) +void trade_tradecancel(dumb_ptr<map_session_data> sd) { - struct map_session_data *target_sd; + dumb_ptr<map_session_data> target_sd; int trade_i; nullpo_retv(sd); @@ -312,9 +312,9 @@ void trade_tradecancel(struct map_session_data *sd) * 取引許諾(trade押し) *------------------------------------------ */ -void trade_tradecommit(struct map_session_data *sd) +void trade_tradecommit(dumb_ptr<map_session_data> sd) { - struct map_session_data *target_sd; + dumb_ptr<map_session_data> target_sd; int trade_i; nullpo_retv(sd); @@ -416,9 +416,9 @@ void trade_tradecommit(struct map_session_data *sd) // This is called when a char's zeny is changed // This helps prevent money duplication and other problems // [Jaxad0127] -void trade_verifyzeny(struct map_session_data *sd) +void trade_verifyzeny(dumb_ptr<map_session_data> sd) { - struct map_session_data *target_sd; + dumb_ptr<map_session_data> target_sd; nullpo_retv(sd); |