From 44d7606656a650dc43018b5c63bb56ad1f70e77c Mon Sep 17 00:00:00 2001
From: gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 20 Jan 2012 20:33:32 +0000
Subject: Merged TXT removal branch back to trunk. * TXT save engine is removed
 and no longer supported. * See also tid:53926, tid:57717.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15503 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/log.c | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'src/map/log.c')

diff --git a/src/map/log.c b/src/map/log.c
index fb1aa11a1..76497db3c 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -136,7 +136,6 @@ void log_branch(struct map_session_data* sd)
 	if( !log_config.branch )
 		return;
 
-#ifndef TXT_ONLY
 	if( log_config.sql_logs )
 	{
 		SqlStmt* stmt;
@@ -152,7 +151,6 @@ void log_branch(struct map_session_data* sd)
 		SqlStmt_Free(stmt);
 	}
 	else
-#endif
 	{
 		char timestring[255];
 		time_t curtime;
@@ -179,7 +177,6 @@ void log_pick(int id, int m, e_log_pick_type type, int amount, struct item* itm)
 	if( !should_log_item(itm->nameid, amount, itm->refine) )
 		return; //we skip logging this item set - it doesn't meet our logging conditions [Lupus]
 
-#ifndef TXT_ONLY
 	if( log_config.sql_logs )
 	{
 		if( SQL_ERROR == Sql_Query(logmysql_handle, LOG_QUERY " INTO `%s` (`time`, `char_id`, `type`, `nameid`, `amount`, `refine`, `card0`, `card1`, `card2`, `card3`, `map`) VALUES (NOW(), '%d', '%c', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%s')",
@@ -190,7 +187,6 @@ void log_pick(int id, int m, e_log_pick_type type, int amount, struct item* itm)
 		}
 	}
 	else
-#endif
 	{
 		char timestring[255];
 		time_t curtime;
@@ -228,7 +224,6 @@ void log_zeny(struct map_session_data* sd, e_log_pick_type type, struct map_sess
 	if( !log_config.zeny || ( log_config.zeny != 1 && abs(amount) < log_config.zeny ) )
 		return;
 
-#ifndef TXT_ONLY
 	if( log_config.sql_logs )
 	{
 		if( SQL_ERROR == Sql_Query(logmysql_handle, LOG_QUERY " INTO `%s` (`time`, `char_id`, `src_id`, `type`, `amount`, `map`) VALUES (NOW(), '%d', '%d', '%c', '%d', '%s')",
@@ -239,7 +234,6 @@ void log_zeny(struct map_session_data* sd, e_log_pick_type type, struct map_sess
 		}
 	}
 	else
-#endif
 	{
 		char timestring[255];
 		time_t curtime;
@@ -263,7 +257,6 @@ void log_mvpdrop(struct map_session_data* sd, int monster_id, int* log_mvp)
 	if( !log_config.mvpdrop )
 		return;
 
-#ifndef TXT_ONLY
 	if( log_config.sql_logs )
 	{
 		if( SQL_ERROR == Sql_Query(logmysql_handle, LOG_QUERY " INTO `%s` (`mvp_date`, `kill_char_id`, `monster_id`, `prize`, `mvpexp`, `map`) VALUES (NOW(), '%d', '%d', '%d', '%d', '%s') ",
@@ -274,7 +267,6 @@ void log_mvpdrop(struct map_session_data* sd, int monster_id, int* log_mvp)
 		}
 	}
 	else
-#endif
 	{
 		char timestring[255];
 		time_t curtime;
@@ -298,7 +290,6 @@ void log_atcommand(struct map_session_data* sd, int cmdlvl, const char* message)
 	if( cmdlvl < log_config.gm )
 		return;
 
-#ifndef TXT_ONLY
 	if( log_config.sql_logs )
 	{
 		SqlStmt* stmt;
@@ -316,7 +307,6 @@ void log_atcommand(struct map_session_data* sd, int cmdlvl, const char* message)
 		SqlStmt_Free(stmt);
 	}
 	else
-#endif
 	{
 		char timestring[255];
 		time_t curtime;
@@ -340,7 +330,6 @@ void log_npc(struct map_session_data* sd, const char* message)
 	if( !log_config.npc )
 		return;
 
-#ifndef TXT_ONLY
 	if( log_config.sql_logs )
 	{
 		SqlStmt* stmt;
@@ -357,7 +346,6 @@ void log_npc(struct map_session_data* sd, const char* message)
 		SqlStmt_Free(stmt);
 	}
 	else
-#endif
 	{
 		char timestring[255];
 		time_t curtime;
@@ -386,7 +374,6 @@ void log_chat(e_log_chat_type type, int type_id, int src_charid, int src_accid,
 		return;
 	}
 
-#ifndef TXT_ONLY
 	if( log_config.sql_logs )
 	{
 		SqlStmt* stmt;
@@ -404,7 +391,6 @@ void log_chat(e_log_chat_type type, int type_id, int src_charid, int src_accid,
 		SqlStmt_Free(stmt);
 	}
 	else
-#endif
 	{
 		char timestring[255];
 		time_t curtime;
@@ -457,16 +443,7 @@ int log_config_read(const char* cfgName)
 			if( strcmpi(w1, "enable_logs") == 0 )
 				log_config.enable_logs = (e_log_pick_type)config_switch(w2);
 			else if( strcmpi(w1, "sql_logs") == 0 )
-			{
 				log_config.sql_logs = (bool)config_switch(w2);
-#ifdef TXT_ONLY
-				if( log_config.sql_logs )
-				{
-					ShowWarning("log_config_read: SQL logging is not supported on this server.\n");
-					log_config.sql_logs = false;
-				}
-#endif
-			}
 //start of common filter settings
 			else if( strcmpi(w1, "rare_items_log") == 0 )
 				log_config.rare_items_log = atoi(w2);
-- 
cgit v1.2.3-60-g2f50