From 780a0d771edbe21dcfa3405163ffbdf7f7fa4604 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Mon, 13 Oct 2014 13:16:34 -0700 Subject: Convert container lookups to use Option> --- src/map/party.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/map/party.hpp') diff --git a/src/map/party.hpp b/src/map/party.hpp index 01a8125..466ee6a 100644 --- a/src/map/party.hpp +++ b/src/map/party.hpp @@ -24,6 +24,8 @@ #include +#include "../compat/fwd.hpp" + #include "../strings/fwd.hpp" #include "../generic/fwd.hpp" @@ -34,8 +36,8 @@ namespace tmwa { void do_init_party(void); -PartyPair party_search(PartyId party_id); -PartyPair party_searchname(PartyName str); +Option party_search(PartyId party_id); +Option party_searchname(PartyName str); int party_create(dumb_ptr sd, PartyName name); void party_created(AccountId account_id, int fail, PartyId party_id, PartyName name); @@ -65,7 +67,7 @@ void party_recv_message(PartyId party_id, AccountId account_id, XString mes); void party_send_xy_clear(PartyPair p); void party_send_hp_check(dumb_ptr bl, PartyId party_id, int *flag); -int party_exp_share(PartyPair p, map_local *map, int base_exp, int job_exp); +int party_exp_share(PartyPair p, Borrowed map, int base_exp, int job_exp); void party_foreachsamemap(std::function)> func, dumb_ptr sd, int type); -- cgit v1.2.3-70-g09d2