summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-08 16:36:48 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-08 16:36:48 +0000
commit0d9bd14770104ad2ed43a5f498aed29e4d476427 (patch)
tree460d38df3917ccb89ed7334d7cee1fbf697e8584
parent545f9a5c14d46cf37bc03845fbb515e6417e3a2e (diff)
downloadhercules-0d9bd14770104ad2ed43a5f498aed29e4d476427.tar.gz
hercules-0d9bd14770104ad2ed43a5f498aed29e4d476427.tar.bz2
hercules-0d9bd14770104ad2ed43a5f498aed29e4d476427.tar.xz
hercules-0d9bd14770104ad2ed43a5f498aed29e4d476427.zip
- Added upgrade_svn8675.sql in case, for some reason, your guild table still has the emblem_data field as a 'blob' with "NOT NULL" specified.
- Some minor cleanups. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8675 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--sql-files/upgrade_svn8675.sql1
-rw-r--r--src/char_sql/int_guild.c5
-rw-r--r--src/char_sql/inter.c3
-rw-r--r--src/map/clif.h1
5 files changed, 6 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index f8d2503f1..51b83b013 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/09/08
+ * Added upgrade_svn8675.sql in case, for some reason, your guild table
+ still has the emblem_data field as a 'blob' with "NOT NULL" specified.
+ [Skotlex]
* Fixed alliance/opposition making not cancelling out map-server-side when
the guild already had max number of alliances/oppositions (thanks to k3dt)
[Skotlex]
diff --git a/sql-files/upgrade_svn8675.sql b/sql-files/upgrade_svn8675.sql
new file mode 100644
index 000000000..5f6d15299
--- /dev/null
+++ b/sql-files/upgrade_svn8675.sql
@@ -0,0 +1 @@
+ALTER TABLE `guild` MODIFY `emblem_data` blob;
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index b0549800c..1d190300a 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -1025,8 +1025,8 @@ int mapif_guild_leaved(int guild_id,int account_id,int char_id,int flag, const c
WBUFW(buf, 0)=0x3834;
WBUFL(buf, 2)=guild_id;
WBUFL(buf, 6)=account_id;
- WBUFL(buf, 10)=char_id;
- WBUFB(buf, 14)=flag;
+ WBUFL(buf,10)=char_id;
+ WBUFB(buf,14)=flag;
memcpy(WBUFP(buf,15),mes,40);
memcpy(WBUFP(buf,55),name,NAME_LENGTH);
mapif_sendall(buf,55+NAME_LENGTH);
@@ -1873,7 +1873,6 @@ int mapif_parse_GuildNotice(int fd,int guild_id,const char *mes1,const char *mes
return mapif_guild_notice(g);
}
-
int mapif_parse_GuildEmblem(int fd,int len,int guild_id,int dummy,const char *data)
{
struct guild * g;
diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c
index 73b049044..ba0507313 100644
--- a/src/char_sql/inter.c
+++ b/src/char_sql/inter.c
@@ -80,10 +80,7 @@ int inter_recv_packet_length[]={
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
48,14,-1, 6, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3080-0x308f
-// 44,10,-1, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x3090 - 0x309f Homunculus packets [albator]
68,10,-1, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x3090 - 0x309f Homunculus packets [albator]
-
-
};
struct WisData {
diff --git a/src/map/clif.h b/src/map/clif.h
index 9c258282f..94255b31f 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -86,7 +86,6 @@ int clif_selllist(struct map_session_data*); //self
int clif_scriptmes(struct map_session_data*,int,char*); //self
int clif_scriptnext(struct map_session_data*,int); //self
int clif_scriptclose(struct map_session_data*,int); //self
-void clif_sendfakenpc(struct map_session_data *sd, int npcid); //self
int clif_scriptmenu(struct map_session_data*,int,char*); //self
int clif_scriptinput(struct map_session_data*,int); //self
int clif_scriptinputstr(struct map_session_data *sd,int npcid); // self