diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-22 12:25:18 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-22 12:25:18 -0800 |
| commit | b2f0d495cd85188e0f9f2d4d363655da40e6e5e6 (patch) | |
| tree | ccc8997361bd66efeea6e7e1502e1b483f04ed7f /src/char | |
| parent | 57e5142d5c9d326912610e3bd60743420f8a328a (diff) | |
| download | tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.tar.gz tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.tar.bz2 tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.tar.xz tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.zip | |
Have I mentioned that I hate ADL?
Diffstat (limited to 'src/char')
| -rw-r--r-- | src/char/char.cpp | 6 | ||||
| -rw-r--r-- | src/char/int_party.cpp | 2 | ||||
| -rw-r--r-- | src/char/int_storage.cpp | 2 | ||||
| -rw-r--r-- | src/char/inter.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp index 57788ee..0bee093 100644 --- a/src/char/char.cpp +++ b/src/char/char.cpp @@ -409,7 +409,7 @@ AString mmo_char_tostr(struct CharPair *cp) } static -bool extract(XString str, Point *p) +bool impl_extract(XString str, Point *p) { return extract(str, record<','>(&p->map_, &p->x, &p->y)); } @@ -422,7 +422,7 @@ struct skill_loader }; static -bool extract(XString str, struct skill_loader *s) +bool impl_extract(XString str, struct skill_loader *s) { uint32_t flags_and_level; if (!extract(str, @@ -437,7 +437,7 @@ bool extract(XString str, struct skill_loader *s) // Function to set the character from the line (at read of characters file) //------------------------------------------------------------------------- static -bool extract(XString str, CharPair *cp) +bool impl_extract(XString str, CharPair *cp) { CharKey *k = &cp->key; CharData *p = cp->data.get(); diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp index 731669a..a16bc20 100644 --- a/src/char/int_party.cpp +++ b/src/char/int_party.cpp @@ -93,7 +93,7 @@ AString inter_party_tostr(PartyPair p) } static -bool extract(XString str, PartyPair *pp) +bool impl_extract(XString str, PartyPair *pp) { PartyPair& p = *pp; diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp index c02f037..0c76678 100644 --- a/src/char/int_storage.cpp +++ b/src/char/int_storage.cpp @@ -95,7 +95,7 @@ AString storage_tostr(Storage *p) // 文字列を倉庫データに変換 static -bool extract(XString str, Storage *p) +bool impl_extract(XString str, Storage *p) { std::vector<Item> storage_items; if (!extract(str, diff --git a/src/char/inter.cpp b/src/char/inter.cpp index c081825..4b10dbc 100644 --- a/src/char/inter.cpp +++ b/src/char/inter.cpp @@ -85,7 +85,7 @@ AString inter_accreg_tostr(struct accreg *reg) // アカウント変数を文字列から変換 static -bool extract(XString str, struct accreg *reg) +bool impl_extract(XString str, struct accreg *reg) { std::vector<GlobalReg> vars; if (!extract(str, |