summaryrefslogtreecommitdiff
path: root/src/map/npc.h
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-12-20 22:57:29 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-12-20 22:57:29 +0000
commit8d050598f736bdb24f4eccf1760bc04c26e39e31 (patch)
tree73157e2ea0134ded227268c4e698ced5c0246c40 /src/map/npc.h
parentfd7ef4f94dfd354582c06341716c159d5b9234c6 (diff)
downloadhercules-8d050598f736bdb24f4eccf1760bc04c26e39e31.tar.gz
hercules-8d050598f736bdb24f4eccf1760bc04c26e39e31.tar.bz2
hercules-8d050598f736bdb24f4eccf1760bc04c26e39e31.tar.xz
hercules-8d050598f736bdb24f4eccf1760bc04c26e39e31.zip
* Extended how duplicates work: (based on Orcao's work in bugreport:2361) [FlavioJS]
- you can duplicate warps/shops/cashshops/npcs (before only npcs could be duplicated) - warp duplicates inherit the target location - shop/cashshop duplicates inherit the item list - npc duplicates inherit the script code (backward compatible behaviour) - updated script_commands.txt with the information git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13407 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.h')
-rw-r--r--src/map/npc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.h b/src/map/npc.h
index b2fd2954f..411e7e026 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -40,6 +40,7 @@ struct npc_data {
void* chatdb; // pointer to a npc_parse struct (see npc_chat.c)
enum npc_subtype subtype;
+ int src_id;
union {
struct {
struct script_code *script;
@@ -50,7 +51,6 @@ struct npc_data {
struct npc_timerevent_list *timer_event;
int label_list_num;
struct npc_label_list *label_list;
- int src_id;
} scr;
struct {
struct npc_item_list* shop_item;