diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-27 19:38:16 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-27 19:38:16 +0000 |
| commit | 0df22ffb8c24d3b89722de875d264ee2c2f7a72e (patch) | |
| tree | 47214df2a70a4b001aa80ed9f99ac0f0ce158974 /src/map | |
| parent | 4fe91e88780a26861e7e03d27f1136ed1cf43627 (diff) | |
| download | hercules-0df22ffb8c24d3b89722de875d264ee2c2f7a72e.tar.gz hercules-0df22ffb8c24d3b89722de875d264ee2c2f7a72e.tar.bz2 hercules-0df22ffb8c24d3b89722de875d264ee2c2f7a72e.tar.xz hercules-0df22ffb8c24d3b89722de875d264ee2c2f7a72e.zip | |
* TXT/SQL login server code synchronization
- exported several core structures to login.h
- split off ladmin communication code from the TXT login server
- removed all occurences of login_log(); a unified function should be added when SQL's loginlog_db logging code gets synced with TXT
- removed conf setting login_log_filename
- fixed ladmin getting timeouts since the ping system was changed
- removed login/char server_fd[] arrays, added server[].fd instead
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11826 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.h | 2 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.h b/src/map/clif.h index ca26a9b67..daca310ef 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -30,7 +30,7 @@ struct guild; // v8 - 2007-05-21aSakexe+ - 0x283 // v9 - 2007-11-06aSakexe+ - 0x78, 0x7c, 0x22c #ifndef PACKETVER - #define PACKETVER 8 + #define PACKETVER 7 #endif // packet DB diff --git a/src/map/script.c b/src/map/script.c index 4e81e752e..bf8b3ea93 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11610,7 +11610,7 @@ BUILDIN_FUNC(query_sql) num_cols = Sql_NumColumns(mmysql_handle); if( num_vars < num_cols ) { - ShowWarning("script:query_sql: Too many columns, discarting last %u columns.\n", (unsigned int)(num_cols-num_vars)); + ShowWarning("script:query_sql: Too many columns, discarding last %u columns.\n", (unsigned int)(num_cols-num_vars)); script_reportsrc(st); } else if( num_vars > num_cols ) |