diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-12 09:55:13 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-12 09:55:13 +0000 |
| commit | ed87621c65d7c13ddd4993101a5b7c2287b6609e (patch) | |
| tree | a035e4d010d2b9a690c82114dff33dfa36d9f889 /src/common | |
| parent | 1c5fab35e935b870939bcae24ea95e957ed76d5a (diff) | |
| download | hercules-ed87621c65d7c13ddd4993101a5b7c2287b6609e.tar.gz hercules-ed87621c65d7c13ddd4993101a5b7c2287b6609e.tar.bz2 hercules-ed87621c65d7c13ddd4993101a5b7c2287b6609e.tar.xz hercules-ed87621c65d7c13ddd4993101a5b7c2287b6609e.zip | |
* Some preparations for the guild script update
- cleaned up npc event execution code
- cleaned up guild data loading/saving code; to be improved later
- removed dummy 'account name' expulsion list management code
- removed columns 'rsv1' and 'rsv2' from guild member data
- removed columns 'rsv1' 'rsv2' 'rsv3' and 'acc' from guild expulsion data
- added upgrade_svn11895.sql for SQL
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11895 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/mmo.h | 7 | ||||
| -rw-r--r-- | src/common/showmsg.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h index 56e4eb9ce..6bb916299 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -328,7 +328,6 @@ struct guild_member { unsigned int exp; int exp_payper; short online,position; - int rsv1,rsv2; char name[NAME_LENGTH]; struct map_session_data *sd; unsigned char modified; @@ -350,9 +349,7 @@ struct guild_alliance { struct guild_expulsion { char name[NAME_LENGTH]; char mes[40]; - char acc[40]; int account_id; - int rsv1,rsv2,rsv3; }; struct guild_skill { @@ -364,10 +361,6 @@ struct guild { short guild_lv, connect_member, max_member, average_lv; unsigned int exp,next_exp; int skill_point; -#ifdef TXT_ONLY - //FIXME: Gotta remove this variable completely, but doing so screws up the format of the txt save file... - int castle_id; -#endif char name[NAME_LENGTH],master[NAME_LENGTH]; struct guild_member member[MAX_GUILD]; struct guild_position position[MAX_GUILDPOSITION]; diff --git a/src/common/showmsg.c b/src/common/showmsg.c index 6fb8a2e6c..fa744f0e4 100644 --- a/src/common/showmsg.c +++ b/src/common/showmsg.c @@ -76,7 +76,7 @@ int msg_silent = 0; //Specifies how silent the console is. buf.d_ = StringBuf_Malloc(); \ buf.l_ = StringBuf_Vprintf(buf.d_, fmt, args); \ buf.v_ = StringBuf_Value(buf.d_); \ - ShowDebug("showmsg: dynamic buffer used, increase the static buffer size to %d or more.", buf.l_+1);\ + ShowDebug("showmsg: dynamic buffer used, increase the static buffer size to %d or more.\n", buf.l_+1);\ } \ //define BUFVPRINTF |