From 25ea5b250d182c5ec71a3bb4d742beca55b47bb6 Mon Sep 17 00:00:00 2001 From: ultramage Date: Tue, 24 Nov 2009 23:40:42 +0000 Subject: Cleaned up leftover PACKETVER define on the charserver (followup to r14155). Expanded the error message in guild_castledataloadack() to actually provide some useful info. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14168 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/char/char.h | 6 ------ src/char_sql/char.h | 6 ------ src/common/mmo.h | 1 + src/map/guild.c | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/char/char.h b/src/char/char.h index b53f66ffa..8c8d7c554 100644 --- a/src/char/char.h +++ b/src/char/char.h @@ -16,12 +16,6 @@ struct character_data { struct global_reg global[GLOBAL_REG_NUM]; }; -// server->client protocol version -// 20061023 - 2006-10-23aSakexe+ - 0x6b, 0x6d -#ifndef PACKETVER - #define PACKETVER 20061023 -#endif - struct mmo_charstatus* search_character(int aid, int cid); struct mmo_charstatus* search_character_byname(char* character_name); int search_character_index(char* character_name); diff --git a/src/char_sql/char.h b/src/char_sql/char.h index bd9f06d3e..a40340cfb 100644 --- a/src/char_sql/char.h +++ b/src/char_sql/char.h @@ -17,12 +17,6 @@ enum { TABLE_GUILD_STORAGE, }; -// server->client protocol version -// 20061023 - 2006-10-23aSakexe+ - 0x6b, 0x6d -#ifndef PACKETVER - #define PACKETVER 20061023 -#endif - int memitemdata_to_sql(const struct item items[], int max, int id, int tableswitch); int mapif_sendall(unsigned char *buf,unsigned int len); diff --git a/src/common/mmo.h b/src/common/mmo.h index 69a316dc4..3b49de419 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -16,6 +16,7 @@ // 5 - 2003-12-18aSakexe+ - 0x1ee, 0x1ef, 0x1f0, ?0x1c4, 0x1c5? // 6 - 2004-03-02aSakexe+ - 0x1f4, 0x1f5 // 7 - 2005-04-11aSakexe+ - 0x229, 0x22a, 0x22b, 0x22c +// 20061023 - 2006-10-23aSakexe+ - 0x6b, 0x6d // 20070521 - 2007-05-21aSakexe+ - 0x283 // 20070821 - 2007-08-21aSakexe+ - 0x2c5 // 20070918 - 2007-09-18aSakexe+ - 0x2d7, 0x2d9, 0x2da diff --git a/src/map/guild.c b/src/map/guild.c index 0eb7af712..280f7aa01 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1771,7 +1771,7 @@ int guild_castledataloadack(int castle_id,int index,int value) case 17: gc->guardian[index-10].visible = value; break; default: - ShowError("guild_castledataloadack ERROR!! (Not found index=%d)\n", index); + ShowError("guild_castledataloadack ERROR!! (Not found castle_id=%d index=%d)\n", castle_id, index); return 0; } -- cgit v1.2.3-70-g09d2