diff options
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 19db45465..ab26721fd 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -161,11 +161,7 @@ struct map_session_data { unsigned short mapindex; unsigned char head_dir; //0: Look forward. 1: Look right, 2: Look left. unsigned int client_tick; - int npc_id,areanpc_id,npc_shopid; - struct { - int npc_id; - short x,y; - } ontouch; + int npc_id,areanpc_id,npc_shopid,touching_id; int npc_item_flag; //Marks the npc_id with which you can use items during interactions with said npc (see script command enable_itemuse) int npc_menu; // internal variable, used in npc menu handling int npc_amount; @@ -358,7 +354,7 @@ struct map_session_data { unsigned short pvp_rank, pvp_lastusers; unsigned short pvp_won, pvp_lost; - char eventqueue[MAX_EVENTQUEUE][50]; + char eventqueue[MAX_EVENTQUEUE][NAME_LENGTH*2+3]; int eventtimer[MAX_EVENTTIMER]; unsigned short eventcount; // [celest] |