- Added SC_KEEPING/SC_BARRIER to calc_flag in status_change_end

- Added Option constants for Carts, fixed OPTION_FLYING (it conflicts with OPTION_XMAS?)
- Updated clif.c to check for OPTION_WEDDING|OPTION_XMAS instead of view class to block attacks and skill usage.
- Removed struct pc_base_job and functions pc_calc_base_job/pc_calc_base_job2 which are no longer used anywhere (were long ago deprecated infavor of the new jobid system)
- Cleaned up change-cart code.
- Modified SC_XMAS to not change your view anymore and only set the proper option value (OPTION_XMAS)
- Cleaned up the code regarding char_gm reading.
- Changed the option field to unsigned short to make room for the higher values.


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

2 files changed, 31 insertions, 34 deletions

diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index ad51a2825..3690ae43a 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -339,30 +339,30 @@ int isGM(int account_id) {
 }

 

 void read_gm_account(void) {

-	if(char_gm_read)

-	{

-		if (gm_account != NULL)

-			aFree(gm_account);

-		GM_num = 0;

+	if(!char_gm_read)

+		return;

+	

+	if (gm_account != NULL)

+		aFree(gm_account);

+	GM_num = 0;

 

-		sprintf(tmp_sql, "SELECT `%s`,`%s` FROM `%s` WHERE `%s`>='%d'",login_db_account_id,login_db_level,gm_db,login_db_level,lowest_gm_level);

-		if (mysql_query(&lmysql_handle, tmp_sql)) {

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

-			ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);

-		}

-		lsql_res = mysql_store_result(&lmysql_handle);

-		if (lsql_res) {

-			gm_account = (struct gm_account*)aCalloc(sizeof(struct gm_account) * (size_t)mysql_num_rows(lsql_res), 1);

-			while ((lsql_row = mysql_fetch_row(lsql_res))) {

-				gm_account[GM_num].account_id = atoi(lsql_row[0]);

-				gm_account[GM_num].level = atoi(lsql_row[1]);

-				GM_num++;

-			}

+	sprintf(tmp_sql, "SELECT `%s`,`%s` FROM `%s` WHERE `%s`>='%d'",login_db_account_id,login_db_level,gm_db,login_db_level,lowest_gm_level);

+	if (mysql_query(&lmysql_handle, tmp_sql)) {

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

+		ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);

+	}

+	lsql_res = mysql_store_result(&lmysql_handle);

+	if (lsql_res) {

+		gm_account = (struct gm_account*)aCalloc(sizeof(struct gm_account) * (size_t)mysql_num_rows(lsql_res), 1);

+		while ((lsql_row = mysql_fetch_row(lsql_res))) {

+			gm_account[GM_num].account_id = atoi(lsql_row[0]);

+			gm_account[GM_num].level = atoi(lsql_row[1]);

+			GM_num++;

 		}

-

-		mysql_free_result(lsql_res);

-		mapif_send_gmaccounts();

 	}

+

+	mysql_free_result(lsql_res);

+	mapif_send_gmaccounts();

 }

 

 int compare_item(struct item *a, struct item *b) {

@@ -2054,11 +2054,9 @@ int parse_tologin(int fd) {
 			break;

 

 		case 0x2732:

-			if(!char_gm_read)

-			{

-				if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))

-					return 0;

-			  {

+			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))

+				return 0;

+			if(!char_gm_read) {

 				unsigned char buf[32000];

 				if (gm_account != NULL)

 					aFree(gm_account);

@@ -2075,9 +2073,8 @@ int parse_tologin(int fd) {
 				memcpy(buf, RFIFOP(fd,0), RFIFOW(fd,2));

 				WBUFW(buf,0) = 0x2b15;

 				mapif_sendall(buf, RFIFOW(fd,2));

-			  }

-				RFIFOSKIP(fd,RFIFOW(fd,2));

 			}

+			RFIFOSKIP(fd,RFIFOW(fd,2));

 			break;

 

 		// Receive GM accounts [Freya login server packet by Yor]

@@ -3895,8 +3892,8 @@ void sql_config_read(const char *cfgName){ /* Kalaspuff, to get login_db */
 		}else if(strcmpi(w1,"use_sql_db")==0){ // added for sql item_db read for char server [Valaris]

 			db_use_sqldbs = config_switch(w2);

 			ShowStatus("Using SQL dbs: %s\n",w2);

-		} else if(strcmpi(w1,"connection_ping_interval")==0) {


-			connection_ping_interval = config_switch(w2);


+		} else if(strcmpi(w1,"connection_ping_interval")==0) {

+			connection_ping_interval = config_switch(w2);

 		//custom columns for login database

 		}else if(strcmpi(w1,"login_db_level")==0){

 			strcpy(login_db_level,w2);

diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c
index 74da7f303..137e25d47 100644
--- a/src/char_sql/inter.c
+++ b/src/char_sql/inter.c
@@ -303,10 +303,10 @@ int inter_log(char *fmt,...)
 	return 0;

 }

 

-/*======================================================


+/*======================================================

  * Does a mysql_ping to all connection handles. [Skotlex]

- *------------------------------------------------------


- */


+ *------------------------------------------------------

+ */

 int inter_sql_ping(int tid, unsigned int tick, int id, int data) 

 {

 	ShowInfo("Pinging SQL server to keep connection alive...\n");

@@ -373,7 +373,7 @@ int inter_init(const char *file)
 	//i=add_timer_interval(gettick()+autosave_interval,inter_save_timer,0,0,autosave_interval);

 

 	if (connection_ping_interval) {

-		add_timer_func_list(inter_sql_ping, "inter_sql_ping");


+		add_timer_func_list(inter_sql_ping, "inter_sql_ping");

 		add_timer_interval(gettick()+connection_ping_interval*60*60*1000,

 				inter_sql_ping, 0, 0, connection_ping_interval*60*60*1000);

 	}