From 61248161ad0386b46d3f37ed4457366841501036 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 1 Dec 2006 17:17:09 +0000 Subject: - 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 --- src/map/chrif.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/map/chrif.c') diff --git a/src/map/chrif.c b/src/map/chrif.c index 8c1acdaa4..b11640b74 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -211,7 +211,7 @@ int chrif_save(struct map_session_data *sd, int flag) intif_saveregistry(sd, 1); //Save account2 regs #ifndef TXT_ONLY if(charsave_method){ //New 'Local' save - charsave_savechar(sd->char_id, &sd->status); + charsave_savechar(sd->status.char_id, &sd->status); if (flag) //Character final saved. sd->state.finalsave = 1; if (flag == 1) @@ -222,8 +222,8 @@ int chrif_save(struct map_session_data *sd, int flag) WFIFOHEAD(char_fd, sizeof(sd->status) + 13); WFIFOW(char_fd,0) = 0x2b01; WFIFOW(char_fd,2) = sizeof(sd->status) + 13; - WFIFOL(char_fd,4) = sd->bl.id; - WFIFOL(char_fd,8) = sd->char_id; + WFIFOL(char_fd,4) = sd->status.account_id; + WFIFOL(char_fd,8) = sd->status.char_id; WFIFOB(char_fd,12) = (flag==1)?1:0; //Flag to tell char-server this character is quitting. memcpy(WFIFOP(char_fd,13), &sd->status, sizeof(sd->status)); WFIFOSET(char_fd, WFIFOW(char_fd,2)); @@ -1147,10 +1147,10 @@ int chrif_updatefamelist(struct map_session_data *sd) WFIFOHEAD(char_fd, 12); WFIFOW(char_fd, 0) = 0x2b10; - WFIFOL(char_fd, 2) = sd->char_id; + WFIFOL(char_fd, 2) = sd->status.char_id; WFIFOL(char_fd, 6) = sd->status.fame; WFIFOB(char_fd, 10) = type; - WFIFOB(char_fd, 11) = pc_famerank(sd->char_id, sd->class_&MAPID_UPPERMASK); + WFIFOB(char_fd, 11) = pc_famerank(sd->status.char_id, sd->class_&MAPID_UPPERMASK); WFIFOSET(char_fd, 12); return 0; -- cgit v1.2.3-70-g09d2