* Updated field `weapon` in table `char` to default to '0' (bare-handed) rather than '1' (knife) (follow up to r11696).

- Apply upgrade_svn14796.sql to reflect the change on existing setups.

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

3 files changed, 4 insertions, 1 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index d6d67176f..41c7f759e 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,8 @@
 Date	Added
 
 2011/04/16
+	* Updated field `weapon` in table `char` to default to '0' (bare-handed) rather than '1' (knife) (follow up to r11696). [Ai4rei]
+	- Apply upgrade_svn14796.sql to reflect the change on existing setups.
 	* Some cleanups related to player and monster states. [Ai4rei]
 	- Moved user_font and bg_id out of states as they are data, not states.
 	- Reordered members of state structs so that bitfields are packed together (less memory gets wasted).
diff --git a/sql-files/main.sql b/sql-files/main.sql
index 239f8dac3..c2a30e086 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -83,7 +83,7 @@ CREATE TABLE IF NOT EXISTS `char` (
   `hair` tinyint(4) unsigned NOT NULL default '0',
   `hair_color` smallint(5) unsigned NOT NULL default '0',
   `clothes_color` smallint(5) unsigned NOT NULL default '0',
-  `weapon` smallint(6) unsigned NOT NULL default '1',
+  `weapon` smallint(6) unsigned NOT NULL default '0',
   `shield` smallint(6) unsigned NOT NULL default '0',
   `head_top` smallint(6) unsigned NOT NULL default '0',
   `head_mid` smallint(6) unsigned NOT NULL default '0',
diff --git a/sql-files/upgrade_svn14796.sql b/sql-files/upgrade_svn14796.sql
new file mode 100644
index 000000000..21c1bcd55
--- /dev/null
+++ b/sql-files/upgrade_svn14796.sql
@@ -0,0 +1 @@
+ALTER TABLE `char` MODIFY `weapon` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0';