diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2013-02-07 19:38:32 -0800 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-02-07 22:41:23 -0800 |
commit | 83b2e0b3ceda907b7186acfcc56c214fc04d9c13 (patch) | |
tree | f4dcc8d8b59fd9a633bc2604cc92f0523cc76ee4 /src/map/itemdb.hpp | |
parent | c67c2b7435a13d7ce17b2075e22dc5c6036f702a (diff) | |
download | tmwa-83b2e0b3ceda907b7186acfcc56c214fc04d9c13.tar.gz tmwa-83b2e0b3ceda907b7186acfcc56c214fc04d9c13.tar.bz2 tmwa-83b2e0b3ceda907b7186acfcc56c214fc04d9c13.tar.xz tmwa-83b2e0b3ceda907b7186acfcc56c214fc04d9c13.zip |
Remove some macros
Diffstat (limited to 'src/map/itemdb.hpp')
-rw-r--r-- | src/map/itemdb.hpp | 61 |
1 files changed, 51 insertions, 10 deletions
diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index 540fced..688fac1 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -50,19 +50,60 @@ struct random_item_data struct item_data *itemdb_searchname(const char *name); struct item_data *itemdb_search(int nameid); struct item_data *itemdb_exists(int nameid); -#define itemdb_type(n) itemdb_search(n)->type -#define itemdb_look(n) itemdb_search(n)->look -#define itemdb_weight(n) itemdb_search(n)->weight -#define itemdb_equipscript(n) itemdb_search(n)->equip_script -#define itemdb_wlv(n) itemdb_search(n)->wlv -#define itemdb_available(n) (itemdb_exists(n) && itemdb_search(n)->flag.available) -#define itemdb_viewid(n) (itemdb_search(n)->view_id) + +inline +ItemType itemdb_type(int n) +{ + return itemdb_search(n)->type; +} +inline +int itemdb_look(int n) +{ + return itemdb_search(n)->look; +} +inline +int itemdb_weight(int n) +{ + return itemdb_search(n)->weight; +} +inline +const ScriptCode *itemdb_equipscript(int n) +{ + return itemdb_search(n)->equip_script; +} +inline +int itemdb_wlv(int n) +{ + return itemdb_search(n)->wlv; +} +inline +bool itemdb_available(int n) +{ + return itemdb_exists(n) && itemdb_search(n)->flag.available; +} +inline +int itemdb_viewid(int n) +{ + return itemdb_search(n)->view_id; +} int itemdb_searchrandomid(int flags); -#define itemdb_value_sell(n) itemdb_search(n)->value_sell -#define itemdb_value_notdc(n) itemdb_search(n)->flag.value_notdc -#define itemdb_value_notoc(n) itemdb_search(n)->flag.value_notoc +inline +int itemdb_value_sell(int n) +{ + return itemdb_search(n)->value_sell; +} +inline +int itemdb_value_notdc(int n) +{ + return itemdb_search(n)->flag.value_notdc; +} +inline +int itemdb_value_notoc(int n) +{ + return itemdb_search(n)->flag.value_notoc; +} int itemdb_isequip(int); int itemdb_isequip2(struct item_data *); |