summaryrefslogtreecommitdiff
path: root/src/map/guild.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-01 17:17:09 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-01 17:17:09 +0000
commit61248161ad0386b46d3f37ed4457366841501036 (patch)
tree2b7e762eeda38166316d2e7cc8018509831d9475 /src/map/guild.c
parent22746a0a0a9efe5fc7e84496f5780116c52f2abe (diff)
downloadhercules-61248161ad0386b46d3f37ed4457366841501036.tar.gz
hercules-61248161ad0386b46d3f37ed4457366841501036.tar.bz2
hercules-61248161ad0386b46d3f37ed4457366841501036.tar.xz
hercules-61248161ad0386b46d3f37ed4457366841501036.zip
- Fixed txt-converter compilation.
- Added my_global.h include to login converter - Removed sd->char_id since we can use sd->status.char_id instead. - Small speedup in STRECOVERY, and made it not unlock a mob's target. - Fixed GS_GROUNDDRIFT consuming ammo when it's time expires (so it was consuming 2 grenades instead of one). Also added a "explosion effect" when their time runs out. - gvg_dungeon mapflag won't set pvp related mapflags anymore, pc_dead will force pvp ranking gain/loss on gvg_dungeon maps now. - Now when coming out of hiding land-effects will trigger on the character. - Made the pc_setpos message when being placed on an unwalkable tile tell you which player triggered it. - Fixed land effects not taking effect inmediately on map-load when the invincible timer is disabled. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9374 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
-rw-r--r--src/map/guild.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 609e84700..6e3f33646 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -937,7 +937,7 @@ int guild_recv_memberinfoshort(int guild_id,int account_id,int char_id,int onlin
if(idx == -1 || c == 0) {
// ギルドのメンバー外なので追放扱いする
struct map_session_data *sd = map_id2sd(account_id);
- if(sd && sd->char_id == char_id) {
+ if(sd && sd->status.char_id == char_id) {
sd->status.guild_id=0;
sd->guild_emblem_id=0;
sd->state.guild_sent=0;