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

Moved common, config and mapcache to C++ (#3200)

Browse Source 
Dropped BETA_THREAD_TEST and everything around it
Dropped mt19937
Replaced msinttypes with cinttypes
Removed IRC link and updated README name
This commit is contained in:
Lemongrass3110
2018-06-14 21:51:58 +02:00
committed by GitHub
parent fc951469e7
commit 801d3ed942
240 changed files with 1163 additions and 8613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/map/map.cpp
View File

@@ -6,19 +6,19 @@
#include <stdlib.h>
#include <math.h>
#include "../common/cbasetypes.h"
#include "../common/core.h"
#include "../common/timer.h"
#include "../common/grfio.h"
#include "../common/malloc.h"
#include "../common/socket.h" // WFIFO*()
#include "../common/showmsg.h"
#include "../common/nullpo.h"
#include "../common/random.h"
#include "../common/strlib.h"
#include "../common/utils.h"
#include "../common/cli.h"
#include "../common/ers.h"
#include "../common/cbasetypes.hpp"
#include "../common/core.hpp"
#include "../common/timer.hpp"
#include "../common/grfio.hpp"
#include "../common/malloc.hpp"
#include "../common/socket.hpp" // WFIFO*()
#include "../common/showmsg.hpp"
#include "../common/nullpo.hpp"
#include "../common/random.hpp"
#include "../common/strlib.hpp"
#include "../common/utils.hpp"
#include "../common/cli.hpp"
#include "../common/ers.hpp"
#include "path.hpp"
#include "chrif.hpp"
@@ -4106,20 +4106,19 @@ int map_sql_close(void)
Sql_Free(qsmysql_handle);
mmysql_handle = NULL;
qsmysql_handle = NULL;
#ifndef BETA_THREAD_TEST
if (log_config.sql_logs)
{
ShowStatus("Close Log DB Connection....\n");
Sql_Free(logmysql_handle);
logmysql_handle = NULL;
}
#endif
return 0;
}
int log_sql_init(void)
{
#ifndef BETA_THREAD_TEST
// log db connection
logmysql_handle = Sql_Malloc();
@@ -4136,7 +4135,7 @@ int log_sql_init(void)
if( strlen(default_codepage) > 0 )
if ( SQL_ERROR == Sql_SetEncoding(logmysql_handle, default_codepage) )
Sql_ShowDebug(logmysql_handle);
#endif
return 0;
}