- Added an Info message when pinging the SQL servers.
- Changed line terminators back to *nix on map.c because otherwise it's impossible to run a diff between the stable and trunk versions of the file. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6043 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
73f37619f0
commit
dc8d892b45
@ -3,8 +3,8 @@ Date Added
|
|||||||
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
|
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
|
||||||
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
|
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
|
||||||
|
|
||||||
|
|
||||||
2006/04/13
|
2006/04/13
|
||||||
|
* Added an Info message when pinging the SQL servers. [Skotlex]
|
||||||
* Fixed crash when looking for SC_MIRACLE in battle_calc_weapon_attack
|
* Fixed crash when looking for SC_MIRACLE in battle_calc_weapon_attack
|
||||||
[Skotlex]
|
[Skotlex]
|
||||||
* Some more standard C code cleanups. [Skotlex]
|
* Some more standard C code cleanups. [Skotlex]
|
||||||
|
@ -309,6 +309,7 @@ int inter_log(char *fmt,...)
|
|||||||
*/
|
*/
|
||||||
int inter_sql_ping(int tid, unsigned int tick, int id, int data)
|
int inter_sql_ping(int tid, unsigned int tick, int id, int data)
|
||||||
{
|
{
|
||||||
|
ShowInfo("Pinging SQL server to keep connection alive...\n");
|
||||||
mysql_ping(&mysql_handle);
|
mysql_ping(&mysql_handle);
|
||||||
if(char_gm_read)
|
if(char_gm_read)
|
||||||
mysql_ping(&lmysql_handle);
|
mysql_ping(&lmysql_handle);
|
||||||
|
@ -359,6 +359,7 @@ int e_mail_check(char *email) {
|
|||||||
*/
|
*/
|
||||||
int login_sql_ping(int tid, unsigned int tick, int id, int data)
|
int login_sql_ping(int tid, unsigned int tick, int id, int data)
|
||||||
{
|
{
|
||||||
|
ShowInfo("Pinging SQL server to keep connection alive...\n");
|
||||||
mysql_ping(&mysql_handle);
|
mysql_ping(&mysql_handle);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -144,7 +144,6 @@ void chrif_checkdefaultlogin(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*==========================================
|
/*==========================================
|
||||||
*
|
*
|
||||||
*------------------------------------------
|
*------------------------------------------
|
||||||
|
7608
src/map/map.c
7608
src/map/map.c
File diff suppressed because it is too large
Load Diff
@ -2785,4 +2785,3 @@ int npc_changename(const char *name, const char *newname, short look){
|
|||||||
npc_enable(newname,1);
|
npc_enable(newname,1);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user