- Fixed the char table having party/guild_id as smallint when they need int there. Thanks to hermematon for pointing it out (use svn_ugprade7580.sql)

- Applied k3dt fixes to pet-hatching, ice-wall check, and wedding skills.
- Fixed endow skills calling the skill no damage packet twice.
- Fixed a crash on warpwaitingpc when the chat-room is empty.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7580 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 4 insertions, 2 deletions

diff --git a/sql-files/main.sql b/sql-files/main.sql
index d6dfabf5f..8272499d9 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -54,8 +54,8 @@ CREATE TABLE `char` (
   `option` int(11) NOT NULL default '0',
   `karma` tinyint(3) NOT NULL default '0',
   `manner` tinyint(3) NOT NULL default '0',
-  `party_id` smallint(11) unsigned NOT NULL default '0',
-  `guild_id` smallint(11) unsigned NOT NULL default '0',
+  `party_id` int(11) unsigned NOT NULL default '0',
+  `guild_id` int(11) unsigned NOT NULL default '0',
   `pet_id` int(11) unsigned NOT NULL default '0',
   `hair` tinyint(4) unsigned NOT NULL default '0',
   `hair_color` smallint(5) unsigned NOT NULL default '0',
diff --git a/sql-files/upgrade_svn7580.sql b/sql-files/upgrade_svn7580.sql
new file mode 100644
index 000000000..0df8894d0
--- /dev/null
+++ b/sql-files/upgrade_svn7580.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `char` MODIFY `party_id` int(11) unsigned NOT NULL default '0';

+ALTER TABLE `char` MODIFY `guild_id` int(11) unsigned NOT NULL default '0';