- Increased capacity for Account Variables to 64

- Reverted Intravision implementation to that of stable's.
- Corrected Login Server taking it's first argument as both login config and lan config.


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

4 files changed, 7 insertions, 5 deletions

diff --git a/src/common/mmo.h b/src/common/mmo.h
index 2b940de6b..c7cd259ad 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -54,7 +54,7 @@
 #define MAX_CART 100

 #define MAX_SKILL 1100 // Bumped to 1100 for new quest skills, will need to further increase one day... [DracoRPG]

 #define GLOBAL_REG_NUM 96

-#define ACCOUNT_REG_NUM 32

+#define ACCOUNT_REG_NUM 64

 #define ACCOUNT_REG2_NUM 16

 //Should hold the max of GLOBAL/ACCOUNT/ACCOUNT2 (needed for some arrays that hold all three)

 #define MAX_REG_NUM 96

diff --git a/src/login/login.c b/src/login/login.c
index c294665e4..3979c64ce 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -4112,7 +4112,7 @@ int do_init(int argc, char **argv) {
 	login_config_read((argc > 1) ? argv[1] : LOGIN_CONF_NAME);

 	display_conf_warnings(); // not in login_config_read, because we can use 'import' option, and display same message twice or more

 	save_config_in_log(); // not before, because log file name can be changed

-	login_lan_config_read((argc > 1) ? argv[1] : LAN_CONF_NAME);

+	login_lan_config_read((argc > 2) ? argv[2] : LAN_CONF_NAME);

 

 	srand((unsigned int)time(NULL));

 

diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index 07fed4836..4f8a8d1b2 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -2279,7 +2279,7 @@ int do_init(int argc,char **argv){
 	//read login configue

 	login_config_read( (argc>1)?argv[1]:LOGIN_CONF_NAME );

 	sql_config_read(SQL_CONF_NAME);

-	login_lan_config_read((argc > 1) ? argv[1] : LAN_CONF_NAME);

+	login_lan_config_read((argc > 2) ? argv[2] : LAN_CONF_NAME);

 	//Generate Passworded Key.

 	ShowInfo("Initializing md5key...\n");

 	memset(md5key, 0, sizeof(md5key));

diff --git a/src/map/clif.c b/src/map/clif.c
index 61846b85d..c67321d3c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -322,6 +322,8 @@ int clif_send_sub(struct block_list *bl, va_list ap)
 				//Check if hidden, better to modify the char's buffer than the

 				//given buffer to prevent intravision affecting the packet as 

 				//it's being received by everyone. [Skotlex]

+				/* New implemenation... not quite correct yet as the client no longer

+				 * displays correctly the SI_INTRAVISION effect.

 				if ((sd->special_state.intravision || sd->sc.data[SC_INTRAVISION].timer != -1 )

 						&& bl != src_bl && WFIFOW(sd->fd,0) == 0x0196)

 				{	//New intravision method, just modify the status change/start packet. [Skotlex]

@@ -332,8 +334,9 @@ int clif_send_sub(struct block_list *bl, va_list ap)
 							WFIFOW(sd->fd,2) = SI_INTRAVISION;

 					}

 				}

+				*/

 

-				/* Previous implementation.

+				// Previous implementation.

 					if ((sd->special_state.intravision || sd->sc.data[SC_INTRAVISION].timer != -1 ) && bl != src_bl) {

 

 					struct status_change *sc = status_get_sc(src_bl);

@@ -357,7 +360,6 @@ int clif_send_sub(struct block_list *bl, va_list ap)
 						}

 					}

 				}

-				*/

 				WFIFOSET(sd->fd,len);

 			}

 		}