diff options
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/map/map.h b/src/map/map.h index dde7d7f..53f6dfc 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -294,8 +294,8 @@ struct map_session_data int castrate, hprate, sprate, dsprate; int addele[10], addrace[12], addsize[3], subele[10], subrace[12]; int addeff[10], addeff2[10], reseff[10]; - int watk_, watk_2, atkmods_[3], addele_[10], addrace_[12], addsize_[3]; //���̂��߂ɒlj� - int atk_ele_, star_, overrefine_; //���̂��߂ɒlj� + int watk_, watk_2, atkmods_[3], addele_[10], addrace_[12], addsize_[3]; //二刀流のために追加 + int atk_ele_, star_, overrefine_; //二刀流のために追加 int base_atk, atk_rate; int arrow_atk, arrow_ele, arrow_cri, arrow_hit, arrow_range; int arrow_addele[10], arrow_addrace[12], arrow_addsize[3], @@ -452,7 +452,7 @@ struct npc_data } warp; char *message; // for MESSAGE: only send this message } u; - // �����Ƀ����o��lj����Ă͂Ȃ�Ȃ�(shop_item���ϒ��̈�) + // ここにメンバを追加してはならない(shop_itemが可変長の為) char eventqueue[MAX_EVENTQUEUE][50]; int eventtimer[MAX_EVENTTIMER]; @@ -552,13 +552,13 @@ enum { NONE_ATTACKABLE, ATTACKABLE }; enum -{ ATK_LUCKY = 1, ATK_FLEE, ATK_DEF }; // �͂܂�y�i���e�B�v�Z�p +{ ATK_LUCKY = 1, ATK_FLEE, ATK_DEF }; // 囲まれペナルティ計算用 struct map_data { char name[24]; char alias[24]; // [MouseJstr] - unsigned char *gat; // NULL�Ȃ牺��map_data_other_server�Ƃ��Ĉ��� + unsigned char *gat; // NULLなら下のmap_data_other_serverとして扱う struct block_list **block; struct block_list **block_mob; int *block_count, *block_mob_count; @@ -611,7 +611,7 @@ struct map_data struct map_data_other_server { char name[24]; - unsigned char *gat; // NULL�Œ�ɂ��Ĕ��f + unsigned char *gat; // NULL固定にして判断 unsigned long ip; unsigned int port; }; @@ -725,14 +725,14 @@ extern char talkie_mes[]; extern char wisp_server_name[]; -// �I�S�̏�� +// 鯖全体情報 void map_setusers (int); int map_getusers (void); -// block�폜�֘A +// block削除関連 int map_freeblock (void *bl); int map_freeblock_lock (void); int map_freeblock_unlock (void); -// block�֘A +// block関連 int map_addblock (struct block_list *); int map_delblock (struct block_list *); void map_foreachinarea (int (*)(struct block_list *, va_list), int, int, int, @@ -743,9 +743,9 @@ void map_foreachincell (int (*)(struct block_list *, va_list), int, int, int, void map_foreachinmovearea (int (*)(struct block_list *, va_list), int, int, int, int, int, int, int, int, ...); int map_countnearpc (int, int, int); -//block�֘A�ɒlj� +//block関連に追加 int map_count_oncell (int m, int x, int y); -// �ꎞ�Iobject�֘A +// 一時的object関連 int map_addobject (struct block_list *); int map_delobject (int, int type); int map_delobjectnofree (int id, int type); @@ -761,7 +761,7 @@ void map_write_log (char *format, ...); #define MAP_LOG_PC(sd, fmt, args...) MAP_LOG("PC%d %d:%d,%d " fmt, sd->status.char_id, sd->bl.m, sd->bl.x, sd->bl.y, ## args) -// ���A�C�e���֘A +// 床アイテム関連 int map_clearflooritem_timer (int, unsigned int, int, int); #define map_clearflooritem(id) map_clearflooritem_timer(0,0,id,1) int map_addflooritem_any (struct item *, int amount, int m, int x, int y, @@ -773,7 +773,7 @@ int map_addflooritem (struct item *, int, int, int, int, struct map_session_data *, int); int map_searchrandfreecell (int, int, int, int); -// �L����id�����L������ �ϊ��֘A +// キャラid＝＞キャラ名 変換関連 void map_addchariddb (int charid, char *name); void map_delchariddb (int charid); int map_reqchariddb (struct map_session_data *sd, int charid); @@ -800,15 +800,15 @@ struct map_session_data *map_get_next_session (struct map_session_data struct map_session_data *map_get_prev_session (struct map_session_data *current); -// gat�֘A +// gat関連 int map_getcell (int, int, int); int map_setcell (int, int, int, int); -// ���̑� +// その他 int map_check_dir (int s_dir, int t_dir); int map_calc_dir (struct block_list *src, int x, int y); -// path.c��� +// path.cより int path_search (struct walkpath_data *, int, int, int, int, int, int); int path_blownpos (int m, int x0, int y0, int dx, int dy, int count); |