diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-12 22:36:08 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-12 22:36:08 -0800 |
| commit | 608f959900968e83fd25231c72308fc608742dd5 (patch) | |
| tree | 33a250f00947d7c83ba50779da466b5f5885db9f /src/map/map.hpp | |
| parent | d8e5c96fbbed5d526dd77d2e427bcb3090bddd58 (diff) | |
| download | tmwa-608f959900968e83fd25231c72308fc608742dd5.tar.gz tmwa-608f959900968e83fd25231c72308fc608742dd5.tar.bz2 tmwa-608f959900968e83fd25231c72308fc608742dd5.tar.xz tmwa-608f959900968e83fd25231c72308fc608742dd5.zip | |
Remove guilds, finally
If anyone in the future wonders why I did this,
just look at how many lines of code this eliminates.
Diffstat (limited to 'src/map/map.hpp')
| -rw-r--r-- | src/map/map.hpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/map/map.hpp b/src/map/map.hpp index 5a252f9..f52537b 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -117,7 +117,6 @@ struct skill_unit_group { int src_id; int party_id; - int guild_id; int map, range; int target_flag; unsigned int tick; @@ -182,7 +181,7 @@ struct map_session_data unsigned produce_flag:1; unsigned make_arrow_flag:1; unsigned potionpitcher_flag:1; - unsigned storage_flag:2; //0: closed, 1: Normal Storage open, 2: guild storage open [Skotlex] + unsigned storage_open:1; unsigned shroud_active:1; unsigned shroud_hides_name_talking:1; unsigned shroud_disappears_on_pickup:1; @@ -368,9 +367,6 @@ struct map_session_data int party_sended, party_invite, party_invite_account; int party_hp, party_x, party_y; - int guild_sended, guild_invite, guild_invite_account; - int guild_emblem_id, guild_alliance, guild_alliance_account; - int guildspy; // [Syrus22] int partyspy; // [Syrus22] char message[80]; @@ -438,7 +434,6 @@ struct npc_data { const ScriptCode *script; short xs, ys; - int guild_id; int timer, timerid, timeramount, nexttimer; unsigned int timertick; struct npc_timerevent_list *timer_event; @@ -529,7 +524,6 @@ struct mob_data short opt1, opt2, opt3, option; short min_chase; short sg_count; - int guild_id; int deletetimer; int skilltimer; @@ -539,7 +533,7 @@ struct mob_data unsigned int skilldelay[MAX_MOBSKILL]; int def_ele; int master_id, master_dist; - int exclusion_src, exclusion_party, exclusion_guild; + 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]; @@ -582,11 +576,8 @@ struct map_data unsigned nopenalty:1; unsigned pvp:1; unsigned pvp_noparty:1; - unsigned pvp_noguild:1; unsigned pvp_nightmaredrop:1; unsigned pvp_nocalcrank:1; - unsigned gvg:1; - unsigned gvg_noparty:1; unsigned nozenypenalty:1; unsigned notrade:1; unsigned noskill:1; @@ -718,7 +709,6 @@ extern struct map_data map[]; extern int map_num; extern int autosave_interval; extern int save_settings; -extern int agit_flag; extern int night_flag; // 0=day, 1=night [Yor] extern char motd_txt[]; |