diff options
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/src/map/map.h b/src/map/map.h index 2963a316e..96cbc9fb3 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -20,7 +20,7 @@ #define MAX_STATUSCHANGE 210 #define MAX_SKILLUNITGROUP 32 #define MAX_MOBSKILLUNITGROUP 8 -#define MAX_SKILLUNITGROUPTICKSET 128 +#define MAX_SKILLUNITGROUPTICKSET 32 #define MAX_SKILLTIMERSKILL 32 #define MAX_MOBSKILLTIMERSKILL 10 #define MAX_MOBSKILL 32 @@ -85,13 +85,13 @@ struct skill_unit_group { int src_id; int party_id; int guild_id; - int map,range; + int map; int target_flag; unsigned int tick; int limit,interval; int skill_id,skill_lv; - int val1,val2; + int val1,val2,val3; char *valstr; int unit_id; int group_id; @@ -582,6 +582,7 @@ struct map_data_other_server { unsigned char *gat; // NULL�Œ�ɂ��Ĕ��f unsigned long ip; unsigned int port; + struct map_data* map; }; struct flooritem_data { @@ -646,20 +647,29 @@ enum { LOOK_BASE,LOOK_HAIR,LOOK_WEAPON,LOOK_HEAD_BOTTOM,LOOK_HEAD_TOP,LOOK_HEAD_MID,LOOK_HAIR_COLOR,LOOK_CLOTHES_COLOR,LOOK_SHIELD,LOOK_SHOES }; +// CELL +#define CELL_MASK 0x0f +#define CELL_NPC 0x80 // NPC�Z�� +#define CELL_BASILICA 0x40 // BASILICA�Z�� /* - * map_getcell()�����Ī����ի髰 + * map_getcell()�Ŏg�p�����t���O */ typedef enum { - CELL_CHKWALL=1, // ��(���뫿����1) - CELL_CHKWATER=3, // ���(���뫿����3) - CELL_CHKGROUND=5, // ������ڪ(���뫿����5) - CELL_CHKNPC=0x80, // ���ë������ת�NPC(���뫿����0x80�ի髰) - CELL_CHKPASS, // ��Φʦ��(���뫿����1,5���) - CELL_CHKNOPASS, // ��Φ��ʦ(���뫿����1,5) - CELL_GETTYPE // ���뫿���ת����� + CELL_CHKWALL=0, // ��(�Z���^�C�v1) + CELL_CHKWATER, // ����(�Z���^�C�v3) + CELL_CHKGROUND, // �n�ʏ�Q��(�Z���^�C�v5) + CELL_CHKPASS, // �ʉ߉\(�Z���^�C�v1,5�ȊO) + CELL_CHKNOPASS, // �ʉߕs��(�Z���^�C�v1,5) + CELL_GETTYPE, // �Z���^�C�v��Ԃ� + CELL_CHKNPC=0x10, // �^�b�`�^�C�v��NPC(�Z���^�C�v0x80�t���O) + CELL_CHKBASILICA, // �o�W���J(�Z���^�C�v0x40�t���O) } cell_t; -// map_setcell()�����Ī����ի髰 -#define CELL_SETNPC 0x80 // ���ë������ת�NPC�ë� +// map_setcell()�Ŏg�p�����t���O +enum { + CELL_SETNPC=0x10, // �^�b�`�^�C�v��NPC���Z�b�g + CELL_SETBASILICA, // �o�W���J���Z�b�g + CELL_CLRBASILICA, // �o�W���J���N���A +}; struct chat_data { struct block_list bl; @@ -718,7 +728,7 @@ void map_foreachinpath(int (*func)(struct block_list*,va_list),int m,int x0,int int map_countnearpc(int,int,int); //block�֘A�ɒlj� int map_count_oncell(int m,int x,int y); -struct skill_unit *map_find_skill_unit_oncell(int m,int x,int y,int skill_id); +struct skill_unit *map_find_skill_unit_oncell(struct block_list *,int x,int y,int skill_id,struct skill_unit *); // �ꎞ�Iobject�֘A int map_addobject(struct block_list *); int map_delobject(int); @@ -747,6 +757,7 @@ int map_mapname2mapid(char*); int map_mapname2ipport(char*,int*,int*); int map_setipport(char *name,unsigned long ip,int port); int map_eraseipport(char *name,unsigned long ip,int port); +int map_eraseallipport(void); void map_addiddb(struct block_list *); void map_deliddb(struct block_list *bl); int map_foreachiddb(int (*)(void*,void*,va_list),...); |