Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Added SC_KEEPING/SC_BARRIER to calc_flag in status_change_end

Browse Source 
- 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://svn.code.sf.net/p/rathena/svn/trunk@6229 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex
2006-04-22 05:21:24 +00:00
parent 74deaf13cb
commit 41a6c38e23
11 changed files with 122 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/char_sql/inter.c
View File

@@ -303,10 +303,10 @@ int inter_log(char *fmt,...)
return 0;
}
/*======================================================
/*======================================================
* Does a mysql_ping to all connection handles. [Skotlex]
* 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) {
//i=add_timer_interval(gettick()+autosave_interval,inter_save_timer,0,0,autosave_interval);
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);
}