- 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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/map/log.c b/src/map/log.c
index 556c7c414..0d6f010f2 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -120,11 +120,11 @@ int log_pick_pc(struct map_session_data *sd, const char *type, int nameid, int a
 		if (itm==NULL) {

 		//We log common item

 			sprintf(tmp_sql, "INSERT DELAYED INTO `%s` (`time`, `char_id`, `type`, `nameid`, `amount`, `map`) VALUES (NOW(), '%d', '%s', '%d', '%d', '%s')",

-			 log_config.log_pick_db, sd->char_id, type, nameid, amount, mapname);

+			 log_config.log_pick_db, sd->status.char_id, type, nameid, amount, mapname);

 		} else {

 		//We log Extended item

 			sprintf(tmp_sql, "INSERT DELAYED INTO `%s` (`time`, `char_id`, `type`, `nameid`, `amount`, `refine`, `card0`, `card1`, `card2`, `card3`, `map`) VALUES (NOW(), '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%s')",

-			 log_config.log_pick_db, sd->char_id, type, itm->nameid, amount, itm->refine, itm->card[0], itm->card[1], itm->card[2], itm->card[3], mapname);

+			 log_config.log_pick_db, sd->status.char_id, type, itm->nameid, amount, itm->refine, itm->card[0], itm->card[1], itm->card[2], itm->card[3], mapname);

 		}

 

 		if(mysql_query(&logmysql_handle, tmp_sql))

@@ -144,12 +144,12 @@ int log_pick_pc(struct map_session_data *sd, const char *type, int nameid, int a
 	if (itm==NULL) {

 	//We log common item

 		fprintf(logfp,"%s - %d\t%s\t%d,%d,%s%s",

-			timestring, sd->char_id, type, nameid, amount, mapname, RETCODE);

+			timestring, sd->status.char_id, type, nameid, amount, mapname, RETCODE);

 

 	} else {

 	//We log Extended item

 		fprintf(logfp,"%s - %d\t%s\t%d,%d,%d,%d,%d,%d,%d,%s%s",

-			timestring, sd->char_id, type, itm->nameid, amount, itm->refine, itm->card[0], itm->card[1], itm->card[2], itm->card[3], mapname, RETCODE);

+			timestring, sd->status.char_id, type, itm->nameid, amount, itm->refine, itm->card[0], itm->card[1], itm->card[2], itm->card[3], mapname, RETCODE);

 	}

 	fclose(logfp);

 	return 1; //Logged

@@ -223,7 +223,7 @@ int log_zeny(struct map_session_data *sd, char *type, struct map_session_data *s
 	if(log_config.sql_logs > 0)

 	{

 		sprintf(tmp_sql, "INSERT DELAYED INTO `%s` (`time`, `char_id`, `src_id`, `type`, `amount`, `map`) VALUES (NOW(), '%d', '%d', '%s', '%d', '%s')",

-			 log_config.log_zeny_db, sd->char_id, src_sd->char_id, type, amount, mapindex_id2name(sd->mapindex));

+			 log_config.log_zeny_db, sd->status.char_id, src_sd->status.char_id, type, amount, mapindex_id2name(sd->mapindex));

 		if(mysql_query(&logmysql_handle, tmp_sql))

 		{

 			ShowSQL("DB error - %s\n",mysql_error(&logmysql_handle));