diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-07-06 14:33:18 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-07-06 14:33:18 -0600 |
commit | 2855e018b8e177878ca0d83c61e4442ddf3e505c (patch) | |
tree | 8521b323327952857072214e5a5cbb9195601cb5 /src/map/map.h | |
parent | 2e87e5b65a02d8d9f867a0510f039cc319b3ffcb (diff) | |
download | tmwa-2855e018b8e177878ca0d83c61e4442ddf3e505c.tar.gz tmwa-2855e018b8e177878ca0d83c61e4442ddf3e505c.tar.bz2 tmwa-2855e018b8e177878ca0d83c61e4442ddf3e505c.tar.xz tmwa-2855e018b8e177878ca0d83c61e4442ddf3e505c.zip |
Revert "Add a new trade spam system"
This reverts commit 2e87e5b65a02d8d9f867a0510f039cc319b3ffcb.
Diffstat (limited to 'src/map/map.h')
-rw-r--r-- | src/map/map.h | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/src/map/map.h b/src/map/map.h index 1cdcc2f..7275734 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -273,8 +273,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]; //̂߂ɒlj + int atk_ele_,star_,overrefine_; //̂߂ɒlj 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],arrow_addeff[10],arrow_addeff2[10]; @@ -358,9 +358,6 @@ struct map_session_data { time_t chat_reset_due; int chat_lines_in; char chat_lastmsg[513]; - - time_t trade_reset_due; - int trades_in; }; struct npc_timerevent_list { @@ -403,7 +400,7 @@ struct npc_data { } warp; char *message; // for MESSAGE: only send this message } u; - // �����Ƀ����o���lj���Ă͂Ȃ��Ȃ�(shop_item���ϒ��̈�) + // ɃoljĂ͂ȂȂ(shop_itemϔ) char eventqueue[MAX_EVENTQUEUE][50]; int eventtimer[MAX_EVENTTIMER]; @@ -496,12 +493,12 @@ enum { MS_IDLE,MS_WALK,MS_ATTACK,MS_DEAD,MS_DELAY }; enum { NONE_ATTACKABLE,ATTACKABLE }; -enum { ATK_LUCKY=1,ATK_FLEE,ATK_DEF}; // �͂܂��y�i���e�B�v�Z�p +enum { ATK_LUCKY=1,ATK_FLEE,ATK_DEF}; // ͂܂yieBvZp 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; @@ -549,7 +546,7 @@ struct map_data { }; struct map_data_other_server { char name[24]; - unsigned char *gat; // NULL�Œ��ɂ��Ĕ��f + unsigned char *gat; // NULLŒɂĔf unsigned long ip; unsigned int port; }; @@ -652,14 +649,14 @@ extern char talkie_mes[]; extern char wisp_server_name[]; -// �I�S�̏��� +// IS̏ void map_setusers(int); int map_getusers(void); -// block�폜�֘A +// block폜֘A int map_freeblock( void *bl ); int map_freeblock_lock(void); int map_freeblock_unlock(void); -// block�֘A +// block֘A int map_addblock(struct block_list *); int map_delblock(struct block_list *); void map_foreachinarea(int (*)(struct block_list*,va_list),int,int,int,int,int,int,...); @@ -667,9 +664,9 @@ void map_foreachinarea(int (*)(struct block_list*,va_list),int,int,int,int,int,i void map_foreachincell(int (*)(struct block_list*,va_list),int,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֘Aɒlj int map_count_oncell(int m,int x,int y); -// �ꎞ�Iobject�֘A +// ꎞIobject֘A int map_addobject(struct block_list *); int map_delobject(int, int type); int map_delobjectnofree(int id, int type); @@ -679,7 +676,7 @@ int map_quit(struct map_session_data *); // npc int map_addnpc(int,struct npc_data *); -// ���A�C�e���֘A +// ACe֘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, @@ -689,7 +686,7 @@ int map_addflooritem_any(struct item *,int amount,int m,int x,int y, int map_addflooritem(struct item *,int,int,int,int,struct map_session_data *,struct map_session_data *,struct map_session_data *,int); int map_searchrandfreecell(int,int,int,int); -// �L����id�����L������ �ϊ��֘A +// LidL ϊ֘A void map_addchariddb(int charid,char *name); void map_delchariddb(int charid); int map_reqchariddb(struct map_session_data * sd,int charid); @@ -714,15 +711,15 @@ struct map_session_data * map_get_last_session(); struct map_session_data * map_get_next_session(struct map_session_data *current); struct map_session_data * map_get_prev_session(struct map_session_data *current); -// gat�֘A +// gat֘A 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); |