- 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

1 files changed, 4 insertions, 4 deletions

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);

 	}