diff options
author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-27 11:09:57 +0000 |
---|---|---|
committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-27 11:09:57 +0000 |
commit | bb0488451bdc08e6abe7622d10bbcb4135f2dc8f (patch) | |
tree | 9b981f46337325e893178f641dae39399fd6118d /src/map/guild.c | |
parent | af99be9bd11d716e0b8ef8eab4a36c9b9925e4c8 (diff) | |
download | hercules-bb0488451bdc08e6abe7622d10bbcb4135f2dc8f.tar.gz hercules-bb0488451bdc08e6abe7622d10bbcb4135f2dc8f.tar.bz2 hercules-bb0488451bdc08e6abe7622d10bbcb4135f2dc8f.tar.xz hercules-bb0488451bdc08e6abe7622d10bbcb4135f2dc8f.zip |
Corrected r12662 where a guild break would trigger the OnGuildBreak event for all castles (even of other guilds).
Corrected some x64 compilation warnings in ers/malloc files.
cleaned up a case of bad variable reuse.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12666 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
-rw-r--r-- | src/map/guild.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index b4104f4d0..0f4ec272b 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1594,7 +1594,7 @@ int guild_broken(int guild_id,int flag) if( (gc=guild_castle_search(i)) != NULL ){ if(gc->guild_id == guild_id){ safestrncpy(name, gc->castle_event, 50); - npc_event_do("::OnGuildBreak"); + npc_event_do(strcat(name,"::OnGuildBreak")); } } } |