diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-08 16:05:20 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-08 16:05:20 +0000 |
| commit | 24f1e9e8b1865f47475d32214bcaa039a79a5df2 (patch) | |
| tree | c63d5930dd96beed7f79674284f3b022bc3ef745 /src/map/guild.c | |
| parent | 80de35a12f4da3003c7e4c8f63bbc72b075baa0f (diff) | |
| download | hercules-24f1e9e8b1865f47475d32214bcaa039a79a5df2.tar.gz hercules-24f1e9e8b1865f47475d32214bcaa039a79a5df2.tar.bz2 hercules-24f1e9e8b1865f47475d32214bcaa039a79a5df2.tar.xz hercules-24f1e9e8b1865f47475d32214bcaa039a79a5df2.zip | |
- Updated some Guild WoE rules to behave as explained here: http://www.eathena.ws/board/index.php?showtopic=146581
- Removed the nosave mapflags from the Guild Castles, as per the previously linked topic.
- Added some missing map_freeblock_lock calls to castend_pos and castend_id functions to prevent (rather unlikely) dangling pointer crashes.
- Improved the debug message when the npc_scriptcont npc IDs don't match.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10187 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index 8399022e3..6b7dcbf65 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -650,7 +650,7 @@ int guild_invite(struct map_session_data *sd,struct map_session_data *tsd) } if(tsd->status.guild_id>0 || tsd->guild_invite>0 || - map[tsd->bl.m].flag.gvg_castle) + (agit_flag && map[tsd->bl.m].flag.gvg_castle)) { //Can't invite people inside castles. [Skotlex] clif_guild_inviteack(sd,0); return 0; @@ -784,7 +784,7 @@ int guild_leave(struct map_session_data *sd,int guild_id, if(sd->status.account_id!=account_id || sd->status.char_id!=char_id || sd->status.guild_id!=guild_id || - map[sd->bl.m].flag.gvg_castle) //Can't leave inside guild castles. + (agit_flag && map[sd->bl.m].flag.gvg_castle)) return 0; intif_guild_leave(sd->status.guild_id, sd->status.account_id, sd->status.char_id,0,mes); @@ -814,7 +814,7 @@ int guild_expulsion(struct map_session_data *sd,int guild_id, //Can't leave inside guild castles. if ((tsd = map_id2sd(account_id)) && tsd->status.char_id == char_id && - map[tsd->bl.m].flag.gvg_castle) + (agit_flag && map[tsd->bl.m].flag.gvg_castle)) return 0; for(i=0;i<g->max_member;i++){ // 所属しているか @@ -1407,11 +1407,6 @@ int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd) return 0; } - if(agit_flag) { - clif_displaymessage(sd->fd,"You cannot make oppositions during Guild Wars!"); - return 0; - } - for(i=0;i<MAX_GUILDALLIANCE;i++){ // すでに関係を持っているか確認 if(g->alliance[i].guild_id==tsd->status.guild_id){ if(g->alliance[i].opposition==1){ // すでに敵対 |