diff options
| author | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-20 20:33:32 +0000 |
|---|---|---|
| committer | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-20 20:33:32 +0000 |
| commit | 44d7606656a650dc43018b5c63bb56ad1f70e77c (patch) | |
| tree | a34a45286714803911fe2bf55315c611a444e605 /src/map/map.c | |
| parent | a02514bc54c044f141520118ffd7e0b6ff5ecae2 (diff) | |
| download | hercules-44d7606656a650dc43018b5c63bb56ad1f70e77c.tar.gz hercules-44d7606656a650dc43018b5c63bb56ad1f70e77c.tar.bz2 hercules-44d7606656a650dc43018b5c63bb56ad1f70e77c.tar.xz hercules-44d7606656a650dc43018b5c63bb56ad1f70e77c.zip | |
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
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/map/map.c b/src/map/map.c index fee813241..841e95df1 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -44,9 +44,7 @@ #include "mercenary.h" #include "atcommand.h" #include "log.h" -#ifndef TXT_ONLY #include "mail.h" -#endif #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -56,7 +54,6 @@ #include <unistd.h> #endif -#ifndef TXT_ONLY char default_codepage[32] = ""; int map_server_port = 3306; @@ -83,8 +80,6 @@ char log_db_pw[32] = "ragnarok"; char log_db_db[32] = "log"; Sql* logmysql_handle; -#endif /* not TXT_ONLY */ - // This param using for sending mainchat // messages like whispers to this nick. [LuzZza] char main_chat_nick[16] = "Main"; @@ -3240,8 +3235,6 @@ int inter_config_read(char *cfgName) if(strcmpi(w1, "main_chat_nick")==0) safestrncpy(main_chat_nick, w2, sizeof(main_chat_nick)); - - #ifndef TXT_ONLY else if(strcmpi(w1,"item_db_db")==0) strcpy(item_db_db,w2); @@ -3295,7 +3288,6 @@ int inter_config_read(char *cfgName) else if(strcmpi(w1,"log_db_db")==0) strcpy(log_db_db, w2); - #endif else if( mapreg_config_read(w1,w2) ) continue; @@ -3309,7 +3301,6 @@ int inter_config_read(char *cfgName) return 0; } -#ifndef TXT_ONLY /*======================================= * MySQL Init *---------------------------------------*/ @@ -3363,8 +3354,6 @@ int log_sql_init(void) return 0; } -#endif /* not TXT_ONLY */ - int map_db_final(DBKey k,void *d,va_list ap) { struct map_data_other_server *mdos = (struct map_data_other_server*)d; @@ -3498,9 +3487,8 @@ void do_final(void) iwall_db->destroy(iwall_db, NULL); regen_db->destroy(regen_db, NULL); -#ifndef TXT_ONLY map_sql_close(); -#endif /* not TXT_ONLY */ + ShowStatus("Finished.\n"); } @@ -3762,11 +3750,9 @@ int do_init(int argc, char *argv[]) iwall_db = strdb_alloc(DB_OPT_RELEASE_DATA,2*NAME_LENGTH+2+1); // [Zephyrus] Invisible Walls -#ifndef TXT_ONLY map_sql_init(); if (log_config.sql_logs) log_sql_init(); -#endif /* not TXT_ONLY */ mapindex_init(); if(enable_grf) |