- Added inter config connection_ping_interval which specifies interval in hours at which mysql_ping's must be done on all connection handles to keep the mysql connection alive. Defaults to 0 (disabled)

- Removed login sql handle from the map server as it isn't used for anything.
- Made the login sql handle on the char-sql server be used only when gm_read_method 1 is enabled.
- Small fixes to npc_enable, added BL_NPC handling on status_get_sc.
- Added a path_search check in map_random_dir, so that the random direction picked up doesn't goes through walls and all that.
- Some changes to close-confine, status start will fail when the source is not found or it doesn't has sc-data.
- pc_setoption no longer changes the character's class when mounting/dismounting, it only changes the view-class.
- The peco-crash-fix from the char servers is still needed. This packet must be wrong! We likely need to sniff it.
- Modified the char-txt server to modify the class of mounted characters to their non-mounted version. Added an upgrade_svn file to handle the class update on the sql tables.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5902 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 2 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index 936c04226..3c20b5691 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -116,10 +116,10 @@ int npc_enable(const char *name,int flag)
 		nd->sc.option&=~OPTION_HIDE;

 		clif_changeoption(&nd->bl);

 	}else if (flag&4){

-		nd->sc.option = OPTION_HIDE;

+		nd->sc.option|= OPTION_HIDE;

 		clif_changeoption(&nd->bl);

 	}else{	//Can't change the view_data to invisible class because the view_data for all npcs is shared! [Skotlex]

-		nd->sc.option = OPTION_INVISIBLE;

+		nd->sc.option|= OPTION_INVISIBLE;

 		clif_changeoption(&nd->bl);

 	}

 	if(flag&3 && (nd->u.scr.xs > 0 || nd->u.scr.ys >0))