summaryrefslogtreecommitdiff
path: root/src/map/npc.h
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-08-07 09:26:17 -0300
committerJesusaves <cpntb1@ymail.com>2020-08-07 09:26:17 -0300
commitc53f8a099151f2e8c26c0ab36f35d34256c0d6cb (patch)
tree0558845f1cb8070f39f9af424c8ffcd930a33b90 /src/map/npc.h
parentf18ad8f29090dd7c95b47922aabfb5e5569c7630 (diff)
downloadhercules-c53f8a099151f2e8c26c0ab36f35d34256c0d6cb.tar.gz
hercules-c53f8a099151f2e8c26c0ab36f35d34256c0d6cb.tar.bz2
hercules-c53f8a099151f2e8c26c0ab36f35d34256c0d6cb.tar.xz
hercules-c53f8a099151f2e8c26c0ab36f35d34256c0d6cb.zip
This is Hercules v2019.08.25r12.4+1
Diffstat (limited to 'src/map/npc.h')
-rw-r--r--src/map/npc.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/npc.h b/src/map/npc.h
index 2819cbd87..5ff63532d 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -34,6 +34,8 @@ struct hplugin_data_store;
struct itemlist; // map/itemdb.h
struct view_data;
+enum market_buy_result;
+
enum npc_parse_options {
NPO_NONE = 0x0,
NPO_ONINIT = 0x1,
@@ -149,7 +151,7 @@ enum actor_classes {
#define MAX_NPC_CLASS 1000
// New NPC range
#define MAX_NPC_CLASS2_START 10001
-#define MAX_NPC_CLASS2_END 10310
+#define MAX_NPC_CLASS2_END 10344
//Script NPC events.
enum npce_event {
@@ -310,7 +312,7 @@ struct npc_interface {
void (*trader_count_funds) (struct npc_data *nd, struct map_session_data *sd);
bool (*trader_pay) (struct npc_data *nd, struct map_session_data *sd, int price, int points);
void (*trader_update) (int master);
- int (*market_buylist) (struct map_session_data *sd, struct itemlist *item_list);
+ enum market_buy_result (*market_buylist) (struct map_session_data *sd, struct itemlist *item_list);
int (*barter_buylist) (struct map_session_data *sd, struct barteritemlist *item_list);
bool (*trader_open) (struct map_session_data *sd, struct npc_data *nd);
void (*market_fromsql) (void);