From 069f39e8a1ebee3e4a4ce8302d0099842876782b Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 13 Dec 2012 16:25:50 -0800 Subject: Some formatting fixes before I go insane Also delete the French translation from ladmin. --- src/map/map.hpp | 400 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 200 insertions(+), 200 deletions(-) (limited to 'src/map/map.hpp') diff --git a/src/map/map.hpp b/src/map/map.hpp index f52537b..a94b46f 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -50,20 +50,20 @@ // [Fate] status.option properties. These are persistent status changes. // IDs that are not listed are not used in the code (to the best of my knowledge) -#define OPTION_HIDE2 0x0002 // apparently some weaker non-GM hide -#define OPTION_CLOAK 0x0004 -#define OPTION_10 0x0010 -#define OPTION_20 0x0020 -#define OPTION_HIDE 0x0040 // [Fate] This is the GM `@hide' flag -#define OPTION_800 0x0800 -#define OPTION_INVISIBILITY 0x1000 // [Fate] Complete invisibility to other clients -#define OPTION_SCRIBE 0x2000 // [Fate] Auto-logging of nearby comments -#define OPTION_CHASEWALK 0x4000 +#define OPTION_HIDE2 0x0002 // apparently some weaker non-GM hide +#define OPTION_CLOAK 0x0004 +#define OPTION_10 0x0010 +#define OPTION_20 0x0020 +#define OPTION_HIDE 0x0040 // [Fate] This is the GM `@hide' flag +#define OPTION_800 0x0800 +#define OPTION_INVISIBILITY 0x1000 // [Fate] Complete invisibility to other clients +#define OPTION_SCRIBE 0x2000 // [Fate] Auto-logging of nearby comments +#define OPTION_CHASEWALK 0x4000 // Below are special clif_changestatus() IDs reserved for option updates -#define CLIF_OPTION_SC_BASE 0x1000 -#define CLIF_OPTION_SC_INVISIBILITY (CLIF_OPTION_SC_BASE) -#define CLIF_OPTION_SC_SCRIBE (CLIF_OPTION_SC_BASE + 1) +#define CLIF_OPTION_SC_BASE 0x1000 +#define CLIF_OPTION_SC_INVISIBILITY (CLIF_OPTION_SC_BASE) +#define CLIF_OPTION_SC_SCRIBE (CLIF_OPTION_SC_BASE + 1) enum { BL_NUL, BL_PC, BL_NPC, BL_MOB, BL_ITEM, BL_CHAT, BL_SKILL, BL_SPELL }; @@ -72,7 +72,7 @@ enum struct block_list { struct block_list *next, *prev; - int id; + int id; short m, x, y; unsigned char type; unsigned char subtype; @@ -85,19 +85,19 @@ struct walkpath_data }; struct script_reg { - int index; - int data; + int index; + int data; }; struct script_regstr { - int index; + int index; char data[256]; }; struct status_change { - int timer; - int val1, val2, val3, val4; - int spell_invocation; /* [Fate] If triggered by a spell, record here */ + int timer; + int val1, val2, val3, val4; + int spell_invocation; /* [Fate] If triggered by a spell, record here */ }; struct invocation; @@ -109,42 +109,42 @@ struct skill_unit struct skill_unit_group *group; - int limit; - int val1, val2; + int limit; + int val1, val2; short alive, range; }; struct skill_unit_group { - int src_id; - int party_id; - int map, range; - int target_flag; + int src_id; + int party_id; + int map, range; + int target_flag; unsigned int tick; - int limit, interval; + int limit, interval; - int skill_id, skill_lv; - int val1, val2; + int skill_id, skill_lv; + int val1, val2; char *valstr; - int unit_id; - int group_id; - int unit_count, alive_count; + int unit_id; + int group_id; + int unit_count, alive_count; struct skill_unit *unit; }; struct skill_unit_group_tickset { unsigned int tick; - int group_id; + int group_id; }; struct skill_timerskill { - int timer; - int src_id; - int target_id; - int map; + int timer; + int src_id; + int target_id; + int map; short x, y; short skill_id, skill_lv; - int type; - int flag; + int type; + int flag; }; struct npc_data; @@ -153,7 +153,7 @@ struct square; struct quick_regeneration { // [Fate] - int amount; // Amount of HP/SP left to regenerate + int amount; // Amount of HP/SP left to regenerate unsigned char speed; // less is faster (number of half-second ticks to wait between updates) unsigned char tickdelay; // number of ticks to next update }; @@ -204,27 +204,27 @@ struct map_session_data unsigned infinite_autospell:1; unsigned deaf:1; } special_state; - int char_id, login_id1, login_id2, sex; + int char_id, login_id1, login_id2, sex; unsigned char tmw_version; // tmw client version struct mmo_charstatus status; struct item_data *inventory_data[MAX_INVENTORY]; short equip_index[11]; - int weight, max_weight; - int cart_weight, cart_max_weight, cart_num, cart_max_num; + int weight, max_weight; + int cart_weight, cart_max_weight, cart_num, cart_max_num; char mapname[24]; - int fd, new_fd; + int fd, new_fd; short to_x, to_y; short speed, prev_speed; short opt1, opt2, opt3; char dir, head_dir; unsigned int client_tick, server_tick; struct walkpath_data walkpath; - int walktimer; - int npc_id, areanpc_id, npc_shopid; - int npc_pos; - int npc_menu; - int npc_amount; - int npc_stack, npc_stackmax; + int walktimer; + int npc_id, areanpc_id, npc_shopid; + int npc_pos; + int npc_menu; + int npc_amount; + int npc_stack, npc_stackmax; const ScriptCode *npc_script, *npc_scriptroot; char *npc_stackbuf; char npc_str[256]; @@ -235,17 +235,17 @@ struct map_session_data } npc_flags; unsigned int chatID; - int attacktimer; - int attacktarget; + int attacktimer; + int attacktarget; short attacktarget_lv; unsigned int attackabletime; - int followtimer; // [MouseJstr] - int followtarget; + int followtimer; // [MouseJstr] + int followtarget; unsigned int cast_tick; // [Fate] Next tick at which spellcasting is allowed struct invocation *active_spells; // [Fate] Singly-linked list of active spells linked to this PC - int attack_spell_override; // [Fate] When an attack spell is active for this player, they trigger it + int attack_spell_override; // [Fate] When an attack spell is active for this player, they trigger it // like a weapon. Check pc_attack_timer() for details. short attack_spell_icon_override; // Weapon equipment slot (slot 4) item override short attack_spell_look_override; // Weapon `look' (attack animation) override @@ -256,8 +256,8 @@ struct map_session_data //_current slowly approximates _target, and _target is determined by equipment. short attackrange, attackrange_; - int skilltimer; - int skilltarget; + int skilltimer; + int skilltarget; short skillx, skilly; short skillid, skilllv; short skillitem, skillitemlv; @@ -266,124 +266,124 @@ struct map_session_data struct skill_unit_group skillunit[MAX_SKILLUNITGROUP]; struct skill_unit_group_tickset skillunittick[MAX_SKILLUNITGROUPTICKSET]; struct skill_timerskill skilltimerskill[MAX_SKILLTIMERSKILL]; - int cloneskill_id, cloneskill_lv; - int potion_hp, potion_sp, potion_per_hp, potion_per_sp; + int cloneskill_id, cloneskill_lv; + int potion_hp, potion_sp, potion_per_hp, potion_per_sp; // [Fate] Used for gradual healing; amount of enqueued regeneration struct quick_regeneration quick_regeneration_hp, quick_regeneration_sp; // [Fate] XP that can be extracted from this player by healing - int heal_xp; // i.e., OTHER players (healers) can partake in this player's XP + int heal_xp; // i.e., OTHER players (healers) can partake in this player's XP - int invincible_timer; + int invincible_timer; unsigned int canact_tick; unsigned int canmove_tick; unsigned int canlog_tick; - int hp_sub, sp_sub; - int inchealhptick, inchealsptick, inchealspirithptick, + int hp_sub, sp_sub; + int inchealhptick, inchealsptick, inchealspirithptick, inchealspiritsptick; // -- moonsoul (new tick for berserk self-damage) - int berserkdamagetick; - int fame; + int berserkdamagetick; + int fame; short view_class; short weapontype1, weapontype2; short disguiseflag, disguise; // [Valaris] - int paramb[6], paramc[6], parame[6], paramcard[6]; - int hit, flee, flee2, aspd, amotion, dmotion; - int watk, watk2, atkmods[3]; - int def, def2, mdef, mdef2, critical, matk1, matk2; - int atk_ele, def_ele, star, overrefine; - 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]; //二刀流のために追加 - 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], + int paramb[6], paramc[6], parame[6], paramcard[6]; + int hit, flee, flee2, aspd, amotion, dmotion; + int watk, watk2, atkmods[3]; + int def, def2, mdef, mdef2, critical, matk1, matk2; + int atk_ele, def_ele, star, overrefine; + 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]; //二刀流のために追加 + 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], arrow_addeff[10], arrow_addeff2[10]; - int nhealhp, nhealsp, nshealhp, nshealsp, nsshealhp, nsshealsp; - int aspd_rate, speed_rate, hprecov_rate, sprecov_rate, critical_def, + int nhealhp, nhealsp, nshealhp, nshealsp, nsshealhp, nsshealsp; + int aspd_rate, speed_rate, hprecov_rate, sprecov_rate, critical_def, double_rate; - int near_attack_def_rate, long_attack_def_rate, magic_def_rate, + int near_attack_def_rate, long_attack_def_rate, magic_def_rate, misc_def_rate; - int matk_rate, ignore_def_ele, ignore_def_race, ignore_def_ele_, + int matk_rate, ignore_def_ele, ignore_def_race, ignore_def_ele_, ignore_def_race_; - int ignore_mdef_ele, ignore_mdef_race; - int magic_addele[10], magic_addrace[12], magic_subrace[12]; - int perfect_hit, get_zeny_num; - int critical_rate, hit_rate, flee_rate, flee2_rate, def_rate, def2_rate, + int ignore_mdef_ele, ignore_mdef_race; + int magic_addele[10], magic_addrace[12], magic_subrace[12]; + int perfect_hit, get_zeny_num; + int critical_rate, hit_rate, flee_rate, flee2_rate, def_rate, def2_rate, mdef_rate, mdef2_rate; - int def_ratio_atk_ele, def_ratio_atk_ele_, def_ratio_atk_race, + int def_ratio_atk_ele, def_ratio_atk_ele_, def_ratio_atk_race, def_ratio_atk_race_; - int add_damage_class_count, add_damage_class_count_, + int add_damage_class_count, add_damage_class_count_, add_magic_damage_class_count; short add_damage_classid[10], add_damage_classid_[10], add_magic_damage_classid[10]; - int add_damage_classrate[10], add_damage_classrate_[10], + int add_damage_classrate[10], add_damage_classrate_[10], add_magic_damage_classrate[10]; short add_def_class_count, add_mdef_class_count; short add_def_classid[10], add_mdef_classid[10]; - int add_def_classrate[10], add_mdef_classrate[10]; + int add_def_classrate[10], add_mdef_classrate[10]; short monster_drop_item_count; short monster_drop_itemid[10]; - int monster_drop_race[10], monster_drop_itemrate[10]; - int double_add_rate, speed_add_rate, aspd_add_rate, perfect_hit_add, + int monster_drop_race[10], monster_drop_itemrate[10]; + int double_add_rate, speed_add_rate, aspd_add_rate, perfect_hit_add, get_zeny_add_num; short splash_range, splash_add_range; short autospell_id, autospell_lv, autospell_rate; short hp_drain_rate, hp_drain_per, sp_drain_rate, sp_drain_per; short hp_drain_rate_, hp_drain_per_, sp_drain_rate_, sp_drain_per_; - int short_weapon_damage_return, long_weapon_damage_return; - int weapon_coma_ele[10], weapon_coma_race[12]; + int short_weapon_damage_return, long_weapon_damage_return; + int weapon_coma_ele[10], weapon_coma_race[12]; short break_weapon_rate, break_armor_rate; short add_steal_rate; short spiritball, spiritball_old; - int spirit_timer[MAX_SKILL_LEVEL]; - int magic_damage_return; // AppleGirl Was Here - int random_attack_increase_add, random_attack_increase_per; // [Valaris] - int perfect_hiding; // [Valaris] - int unbreakable; + int spirit_timer[MAX_SKILL_LEVEL]; + int magic_damage_return; // AppleGirl Was Here + int random_attack_increase_add, random_attack_increase_per; // [Valaris] + int perfect_hiding; // [Valaris] + int unbreakable; - int die_counter; + int die_counter; short doridori_counter; - int reg_num; + int reg_num; struct script_reg *reg; - int regstr_num; + int regstr_num; struct script_regstr *regstr; struct status_change sc_data[MAX_STATUSCHANGE]; short sc_count; struct square dev; - int trade_partner; - int deal_item_index[10]; - int deal_item_amount[10]; - int deal_zeny; + int trade_partner; + int deal_item_index[10]; + int deal_item_amount[10]; + int deal_zeny; short deal_locked; - int party_sended, party_invite, party_invite_account; - int party_hp, party_x, party_y; + int party_sended, party_invite, party_invite_account; + int party_hp, party_x, party_y; - int partyspy; // [Syrus22] + int partyspy; // [Syrus22] char message[80]; - int catch_target_class; + int catch_target_class; - int pvp_point, pvp_rank, pvp_timer, pvp_lastusers; + int pvp_point, pvp_rank, pvp_timer, pvp_lastusers; char eventqueue[MAX_EVENTQUEUE][50]; - int eventtimer[MAX_EVENTTIMER]; + int eventtimer[MAX_EVENTTIMER]; - int last_skillid, last_skilllv; // Added by RoVeRT + int last_skillid, last_skilllv; // Added by RoVeRT struct { char name[24]; } ignore[80]; - int ignoreAll; + int ignoreAll; short sg_count; struct @@ -393,8 +393,8 @@ struct map_session_data time_t chat_reset_due; time_t chat_repeat_reset_due; - int chat_lines_in; - int chat_total_repeats; + int chat_lines_in; + int chat_total_repeats; char chat_lastmsg[513]; unsigned int flood_rates[0x220]; @@ -406,16 +406,16 @@ struct map_session_data struct npc_timerevent_list { - int timer, pos; + int timer, pos; }; struct npc_label_list { char name[24]; - int pos; + int pos; }; struct npc_item_list { - int nameid, value; + int nameid, value; }; struct npc_data { @@ -425,7 +425,7 @@ struct npc_data short speed; char name[24]; char exname[24]; - int chat_id; + int chat_id; short opt1, opt2, opt3, option; short flag; union @@ -434,12 +434,12 @@ struct npc_data { const ScriptCode *script; short xs, ys; - int timer, timerid, timeramount, nexttimer; + int timer, timerid, timeramount, nexttimer; unsigned int timertick; struct npc_timerevent_list *timer_event; - int label_list_num; + int label_list_num; struct npc_label_list *label_list; - int src_id; + int src_id; } scr; struct npc_item_list shop_item[1]; struct @@ -453,12 +453,12 @@ struct npc_data // ここにメンバを追加してはならない(shop_itemが可変長の為) char eventqueue[MAX_EVENTQUEUE][50]; - int eventtimer[MAX_EVENTTIMER]; + int eventtimer[MAX_EVENTTIMER]; short arenaflag; }; -#define MOB_MODE_SUMMONED 0x1000 -#define MOB_MODE_TURNS_AGAINST_BAD_MASTER 0x2000 +#define MOB_MODE_SUMMONED 0x1000 +#define MOB_MODE_TURNS_AGAINST_BAD_MASTER 0x2000 #define MOB_SENSIBLE_MASK 0xf000 // fate: mob mode flags that I actually understand @@ -486,7 +486,7 @@ struct mob_data short base_class, mob_class, dir, mode; short m, x0, y0, xs, ys; char name[24]; - int spawndelay1, spawndelay2; + int spawndelay1, spawndelay2; struct { unsigned state:8; @@ -500,10 +500,10 @@ struct mob_data unsigned walk_easy:1; unsigned special_mob_ai:3; } state; - int timer; + int timer; short to_x, to_y; - int hp; - int target_id, attacked_id; + int hp; + int target_id, attacked_id; short target_lv; struct walkpath_data walkpath; unsigned int next_walktime; @@ -513,8 +513,8 @@ struct mob_data short move_fail_count; struct { - int id; - int dmg; + int id; + int dmg; } dmglog[DAMAGELOG_SIZE]; struct item *lootitem; short lootitem_count; @@ -524,16 +524,16 @@ struct mob_data short opt1, opt2, opt3, option; short min_chase; short sg_count; - int deletetimer; + int deletetimer; - int skilltimer; - int skilltarget; + int skilltimer; + int skilltarget; short skillx, skilly; short skillid, skilllv, skillidx; unsigned int skilldelay[MAX_MOBSKILL]; - int def_ele; - int master_id, master_dist; - int exclusion_src, exclusion_party; + int def_ele; + int master_id, master_dist; + int exclusion_src, exclusion_party; struct skill_timerskill skilltimerskill[MAX_MOBSKILLTIMERSKILL]; struct skill_unit_group skillunit[MAX_MOBSKILLUNITGROUP]; struct skill_unit_group_tickset skillunittick[MAX_SKILLUNITGROUPTICKSET]; @@ -559,11 +559,11 @@ struct map_data struct block_list **block; struct block_list **block_mob; int *block_count, *block_mob_count; - int m; + int m; short xs, ys; short bxs, bys; - int npc_num; - int users; + int npc_num; + int users; struct { unsigned alias:1; @@ -597,9 +597,9 @@ struct map_data struct npc_data *npc[MAX_NPC_PER_MAP]; struct { - int drop_id; - int drop_type; - int drop_per; + int drop_id; + int drop_type; + int drop_per; } drop_list[MAX_DROP_PER_MAP]; }; struct map_data_other_server @@ -616,8 +616,8 @@ struct flooritem_data { struct block_list bl; short subx, suby; - int cleartimer; - int first_get_id, second_get_id, third_get_id; + int cleartimer; + int first_get_id, second_get_id, third_get_id; unsigned int first_get_tick, second_get_tick, third_get_tick; struct item item_data; }; @@ -719,96 +719,96 @@ extern char talkie_mes[]; extern char wisp_server_name[]; // 鯖全体情報 -void map_setusers (int); -int map_getusers (void); +void map_setusers(int); +int map_getusers(void); // block削除関連 -int map_freeblock (void *bl); -int map_freeblock_lock (void); -int map_freeblock_unlock (void); +int map_freeblock(void *bl); +int map_freeblock_lock(void); +int map_freeblock_unlock(void); // block関連 -int map_addblock (struct block_list *); -int map_delblock (struct block_list *); -void map_foreachinarea (void (*)(struct block_list *, va_list), int, int, int, +int map_addblock(struct block_list *); +int map_delblock(struct block_list *); +void map_foreachinarea(void(*)(struct block_list *, va_list), int, int, int, int, int, int, ...); // -- moonsoul (added map_foreachincell) -void map_foreachincell (void (*)(struct block_list *, va_list), int, int, int, +void map_foreachincell(void(*)(struct block_list *, va_list), int, int, int, int, ...); -void map_foreachinmovearea (void (*)(struct block_list *, va_list), int, int, +void map_foreachinmovearea(void(*)(struct block_list *, va_list), int, int, int, int, int, int, int, int, ...); -int map_countnearpc (int, int, int); +int map_countnearpc(int, int, int); //block関連に追加 -int map_count_oncell (int m, int x, int y); +int map_count_oncell(int m, int x, int y); // 一時的object関連 -int map_addobject (struct block_list *); -int map_delobject (int, int type); -int map_delobjectnofree (int id, int type); -void map_foreachobject (void (*)(struct block_list *, va_list), int, ...); +int map_addobject(struct block_list *); +int map_delobject(int, int type); +int map_delobjectnofree(int id, int type); +void map_foreachobject(void(*)(struct block_list *, va_list), int, ...); // -int map_quit (struct map_session_data *); +int map_quit(struct map_session_data *); // npc -int map_addnpc (int, struct npc_data *); +int map_addnpc(int, struct npc_data *); extern FILE *map_logfile; __attribute__((format(printf, 1, 2))) -void map_write_log (const char *format, ...); +void map_write_log(const char *format, ...); #define MAP_LOG(format, args...) {if (map_logfile) map_write_log(format, ##args);} #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) // 床アイテム関連 -void map_clearflooritem_timer (timer_id, tick_t, custom_id_t, custom_data_t); +void map_clearflooritem_timer(timer_id, tick_t, custom_id_t, custom_data_t); #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, +int map_addflooritem_any(struct item *, int amount, int m, int x, int y, struct map_session_data **owners, int *owner_protection, int lifetime, int dispersal); -int map_addflooritem (struct item *, int, int, int, int, +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); +int map_searchrandfreecell(int, int, int, int); // キャラid=>キャラ名 変換関連 -void map_addchariddb (int charid, const char *name); -void map_delchariddb (int charid); -int map_reqchariddb (struct map_session_data *sd, int charid); -char *map_charid2nick (int); - -struct map_session_data *map_id2sd (int); -struct block_list *map_id2bl (int); -int map_mapname2mapid (const char *); -int map_mapname2ipport (const char *, struct in_addr *, int *); -int map_setipport (const char *name, struct in_addr ip, int port); -int map_eraseipport (const char *name, struct in_addr ip, int port); -void map_addiddb (struct block_list *); -void map_deliddb (struct block_list *bl); -int map_foreachiddb (db_func_t, ...); -void map_addnickdb (struct map_session_data *); -int map_scriptcont (struct map_session_data *sd, int id); /* Continues a script either on a spell or on an NPC */ -struct map_session_data *map_nick2sd (const char *); -int compare_item (struct item *a, struct item *b); - -struct map_session_data *map_get_first_session (void); -struct map_session_data *map_get_last_session (void); -struct map_session_data *map_get_next_session (struct map_session_data +void map_addchariddb(int charid, const char *name); +void map_delchariddb(int charid); +int map_reqchariddb(struct map_session_data *sd, int charid); +char *map_charid2nick(int); + +struct map_session_data *map_id2sd(int); +struct block_list *map_id2bl(int); +int map_mapname2mapid(const char *); +int map_mapname2ipport(const char *, struct in_addr *, int *); +int map_setipport(const char *name, struct in_addr ip, int port); +int map_eraseipport(const char *name, struct in_addr ip, int port); +void map_addiddb(struct block_list *); +void map_deliddb(struct block_list *bl); +int map_foreachiddb(db_func_t, ...); +void map_addnickdb(struct map_session_data *); +int map_scriptcont(struct map_session_data *sd, int id); /* Continues a script either on a spell or on an NPC */ +struct map_session_data *map_nick2sd(const char *); +int compare_item(struct item *a, struct item *b); + +struct map_session_data *map_get_first_session(void); +struct map_session_data *map_get_last_session(void); +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 +struct map_session_data *map_get_prev_session(struct map_session_data *current); // gat関連 -int map_getcell (int, int, int); -int map_setcell (int, int, int, int); +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); +int map_check_dir(int s_dir, int t_dir); +int map_calc_dir(struct block_list *src, int x, int y); // 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); +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); -int map_who (int fd); +int map_who(int fd); -void map_helpscreen (void); // [Valaris] -int map_delmap (char *mapname); +void map_helpscreen(void); // [Valaris] +int map_delmap(char *mapname); #endif -- cgit v1.2.3-60-g2f50