- Removed useless inter_athena settings (they were doing absolutely nothing): read_gm_interval, gm_db, gm_db_level, gm_db_account_id, use_new_sql_db

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8968 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 10 insertions, 40 deletions

diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index d4a4b6c76..ffed623c6 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,5 +1,9 @@
 Date	Added

 

+2006/10/11

+	* Removed useless inter_athena settings (they were doing absolutely

+	  nothing): read_gm_interval, gm_db, gm_db_level, gm_db_account_id,

+	  use_new_sql_db [Skotlex]

 2006/10/06

 	* status_cast_cancel is now a type 4 (object bitmasks) setting

 	  (status.conf). [Skotlex]

diff --git a/conf-tmpl/inter_athena.conf b/conf-tmpl/inter_athena.conf
index 9d841a39f..7b6948c68 100644
--- a/conf-tmpl/inter_athena.conf
+++ b/conf-tmpl/inter_athena.conf
@@ -52,16 +52,6 @@ gm_read_method: 0
 // by gm_can_drop_lv (battle_athena.conf). 

 lowest_gm_level: 1

 

-// How often the GM accounts will be reloaded by the map-server in minutes

-read_gm_interval: 10

-

-// Ideally under linux, you want to use localhost instead of 127.0.0.1. 

-// 

-// Under windows, you want to use 127.0.0.1.  If you see a message like

-// "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)"

-// and you have localhost, switch it to 127.0.0.1

-

-

 // You can specify the codepage to use in your mySQL tables here.

 // (Note that this feature requires MySQL 4.1+)

 //default_codepage: 

@@ -73,6 +63,11 @@ read_gm_interval: 10
 // "MySQL server has gone Away" errors due to lack of activity on your server

 connection_ping_interval: 7

 

+// For IPs, ideally under linux, you want to use localhost instead of 127.0.0.1 

+// Under windows, you want to use 127.0.0.1.  If you see a message like

+// "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)"

+// and you have localhost, switch it to 127.0.0.1

+

 // MySQL Login SQL Server

 login_server_ip: 127.0.0.1

 login_server_port: 3306

@@ -119,19 +114,14 @@ db_server_logindb: ragnarok
 // this is meant for people who KNOW their stuff, and for some reason want to change their

 // database layout. [CLOWNISIUS]

 

+//Column names for the login table.

 login_db_account_id: account_id

 login_db_userid: userid

 login_db_user_pass: user_pass

 login_db_level: level

 

-

 // ALL MySQL Database Table names

 

-// GM Account Database Table

-gm_db: login

-gm_db_level: level

-gm_db_account_id: account_id

-

 // Login Database Tables

 login_db: login

 loginlog_db: loginlog

@@ -171,10 +161,6 @@ mail_db: mail
 //Use SQL item_db and mob_db for the map server

 use_sql_db: no

 

-//SQL for the rest of the databases.

-//This is experimental and not meant to be used by anyone other than developers yet.

-use_new_sql_db: no

-

 // Use SQL Mail Server

 mail_server_enable: no

 

diff --git a/src/map/map.c b/src/map/map.c
index e7e2ad7b7..a05dcc465 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -106,12 +106,6 @@ char mail_server_pw[32] = "ragnarok";
 char mail_server_db[32] = "ragnarok";
 int mail_server_enable = 0;
 
-char gm_db[32] = "login";
-char gm_db_level[32] = "level";
-char gm_db_account_id[32] = "account_id";
-
-int read_gm_interval = 600000;
-
 char char_db[32] = "char";
 
 char mail_db[32] = "mail";
@@ -3457,12 +3451,6 @@ int inter_config_read(char *cfgName)
 			strcpy(login_db,w2);
 		} else if (strcmpi(w1, "char_db") == 0) {
 			strcpy(char_db, w2);
-		} else if(strcmpi(w1,"gm_db_level")==0){
-			strcpy(gm_db_level,w2);
-		} else if(strcmpi(w1,"gm_db_account_id")==0){
-		    strcpy(gm_db_account_id,w2);
-		} else if(strcmpi(w1,"gm_db")==0){
-			strcpy(gm_db,w2);
 		//Map Server SQL DB
 		} else if(strcmpi(w1,"map_server_ip")==0){
 			strcpy(map_server_ip, w2);
@@ -3492,8 +3480,6 @@ int inter_config_read(char *cfgName)
 			strcpy(login_server_pw, w2);
 		} else if(strcmpi(w1,"login_server_db")==0){
 			strcpy(login_server_db, w2);
-		} else if(strcmpi(w1,"read_gm_interval")==0){
-			read_gm_interval = ( atoi(w2) * 60 * 1000 ); // Minutes multiplied by 60 secs per min by 1000 milliseconds per second
 		}else if(strcmpi(w1, "char_server_ip") == 0){
 			strcpy(charsql_host, w2);
 		}else if(strcmpi(w1, "char_server_port") == 0){
diff --git a/src/map/map.h b/src/map/map.h
index e05647bc4..9ea81ef4c 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -1473,12 +1473,6 @@ extern char login_db[32];
 extern char login_db_level[32];

 extern char login_db_account_id[32];

 

-extern char gm_db[32];

-extern char gm_db_level[32];

-extern char gm_db_account_id[32];

-

-extern int read_gm_interval;

-

 extern char char_db[32];

 

 extern char mail_db[32];