Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 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.

Browse Source 
- Some minor cleanups.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8675 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-09-08 16:36:48 +00:00
parent 630af02756
commit 6db8420f3c
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -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]

1
sql-files/upgrade_svn8675.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `guild` MODIFY `emblem_data` blob;

5
src/char_sql/int_guild.c
View File

@ -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;

3
src/char_sql/inter.c
View File

@ -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 {

1
src/map/clif.h
View File

@ -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