diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-24 12:14:18 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-24 12:14:18 +0000 |
| commit | 3ecde465534c93315a1f88430129e8400f4d9fe2 (patch) | |
| tree | fb1153e7be48da7d89b9697be733124650045fdf /src/common | |
| parent | 04580084c4ac2113d06a23fdf2ca4596dd04011b (diff) | |
| download | hercules-3ecde465534c93315a1f88430129e8400f4d9fe2.tar.gz hercules-3ecde465534c93315a1f88430129e8400f4d9fe2.tar.bz2 hercules-3ecde465534c93315a1f88430129e8400f4d9fe2.tar.xz hercules-3ecde465534c93315a1f88430129e8400f4d9fe2.zip | |
* Cleaned up some messy guild code (more to come)
* Cleaned up the mail code, no more pointless dynamic allocation
* Added upgrade_svn11548.sql to convert the mail table to new format
* Updated vs7 and vs6 project files
* Increased the max. send buffer size to 5M since 1M is not enough
* Please complain if something stops working ^^;
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11571 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/malloc.h | 2 | ||||
| -rw-r--r-- | src/common/mmo.h | 12 | ||||
| -rw-r--r-- | src/common/socket.c | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/common/malloc.h b/src/common/malloc.h index 43eff40f1..f73ff6588 100644 --- a/src/common/malloc.h +++ b/src/common/malloc.h @@ -28,7 +28,7 @@ // Whether to use Athena's built-in Memory Manager (enabled by default) // To disable just comment the following line #if !defined(DMALLOC) && !defined(BCHECK) - #define USE_MEMMGR + //#define USE_MEMMGR #endif // Whether to enable Memory Manager's logging #define LOG_MEMMGR diff --git a/src/common/mmo.h b/src/common/mmo.h index 2389264d9..171c6c3de 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -132,7 +132,7 @@ struct skill { struct global_reg { char str[32]; - char value[256]; // [zBuffer] + char value[256]; }; //Holds array of global registries, used by the char server and converter. @@ -247,12 +247,11 @@ struct mail_message { char send_name[NAME_LENGTH]; int dest_id; char dest_name[NAME_LENGTH]; - char title[MAIL_TITLE_LENGTH]; char body[MAIL_BODY_LENGTH]; unsigned char read; - unsigned int timestamp; + unsigned int timestamp; // marks when the message was sent int zeny; struct item item; @@ -261,10 +260,8 @@ struct mail_message { struct mail_data { short amount; bool changed, full; - + short unchecked, unread; struct mail_message msg[MAIL_MAX_INBOX]; - - short unchecked, unreaded; }; struct registry { @@ -292,8 +289,6 @@ struct guild_storage { struct item storage_[MAX_GUILD_STORAGE]; }; -struct map_session_data; - struct gm_account { int account_id; int level; @@ -319,6 +314,7 @@ struct party { struct party_member member[MAX_PARTY]; }; +struct map_session_data; struct guild_member { int account_id, char_id; short hair,hair_color,gender,class_,lv; diff --git a/src/common/socket.c b/src/common/socket.c index 79b95c563..7759a67ee 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -452,7 +452,7 @@ int realloc_writefifo(int fd, size_t addition) return 0; // crash prevention for bugs that cause the send queue to fill up in an infinite loop - if( newsize > 1*1024*1024 ) // 1 megabyte is way beyond reasonable + if( newsize > 5*1024*1024 ) // 5 MB is way beyond reasonable { ShowError("realloc_writefifo: session #%d's send buffer was overloaded! Disconnecting...\n", fd); // drop all data (but the space will still be available) |