diff options
| -rw-r--r-- | db/packet_db.txt | 33 | ||||
| -rw-r--r-- | sql-files/main.sql | 16 | ||||
| -rw-r--r-- | src/char/int_guild.c | 4 |
3 files changed, 25 insertions, 28 deletions
diff --git a/db/packet_db.txt b/db/packet_db.txt index 50fae98bc..776fd3279 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -1776,22 +1776,25 @@ packet_ver: 31 0x08E5,41,bookingregreq,2:4 //Added to prevent disconnections 0x08d2,10 +// ========== WARNING ============= +// - 2012-07-02 is NOT STABLE. +// - The packets are kept here for reference, DONT USE THEM. //2012-07-02aRagexeRE -packet_ver: 32 -0x0363,19,wanttoconnection,2:6:10:14:18 -0x0364,6,ticksend,2 -0x085a,7,actionrequest,2:6 -0x0861,8,movefromkafra,2:4 -0x0862,10,useskilltoid,2:4:6 -0x0863,10,useskilltopos,2:4:6:8 -0x0886,6,solvecharname,2 -0x0889,90,useskilltoposinfo,2:4:6:8:10 -0x089e,6,dropitem,2:4 -0x089f,6,takeitem,2 -0x08a0,8,movetokafra,2:4 -0x094a,6,getcharnamerequest,2 -0x0953,5,walktoxy,2 -0x0960,5,changedir,2:4 +//packet_ver: 32 +//0x0363,19,wanttoconnection,2:6:10:14:18 +//0x0364,6,ticksend,2 +//0x085a,7,actionrequest,2:6 +//0x0861,8,movefromkafra,2:4 +//0x0862,10,useskilltoid,2:4:6 +//0x0863,10,useskilltopos,2:4:6:8 +//0x0886,6,solvecharname,2 +//0x0889,90,useskilltoposinfo,2:4:6:8:10 +//0x089e,6,dropitem,2:4 +//0x089f,6,takeitem,2 +//0x08a0,8,movetokafra,2:4 +//0x094a,6,getcharnamerequest,2 +//0x0953,5,walktoxy,2 +//0x0960,5,changedir,2:4 //Add new packets here //packet_ver: 33 diff --git a/sql-files/main.sql b/sql-files/main.sql index f159260f1..e69279710 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -111,7 +111,6 @@ CREATE TABLE IF NOT EXISTS `char` ( KEY `account_id` (`account_id`), KEY `party_id` (`party_id`), KEY `guild_id` (`guild_id`), - KEY `name` (`name`), KEY `online` (`online`) ) ENGINE=MyISAM AUTO_INCREMENT=150000; @@ -181,8 +180,7 @@ CREATE TABLE IF NOT EXISTS `hotkey` ( `type` TINYINT(1) unsigned NOT NULL default '0', `itemskill_id` INT(11) unsigned NOT NULL default '0', `skill_lvl` TINYINT(4) unsigned NOT NULL default '0', - PRIMARY KEY (`char_id`,`hotkey`), - INDEX (`char_id`) + PRIMARY KEY (`char_id`,`hotkey`) ) ENGINE=MyISAM; -- @@ -196,8 +194,7 @@ CREATE TABLE IF NOT EXISTS `global_reg_value` ( `type` tinyint(1) NOT NULL default '3', `account_id` int(11) unsigned NOT NULL default '0', PRIMARY KEY (`char_id`,`str`,`account_id`), - KEY `account_id` (`account_id`), - KEY `char_id` (`char_id`) + KEY `account_id` (`account_id`) ) ENGINE=MyISAM; -- @@ -310,8 +307,7 @@ CREATE TABLE IF NOT EXISTS `guild_position` ( `name` varchar(24) NOT NULL default '', `mode` tinyint(11) unsigned NOT NULL default '0', `exp_mode` tinyint(11) unsigned NOT NULL default '0', - PRIMARY KEY (`guild_id`,`position`), - KEY `guild_id` (`guild_id`) + PRIMARY KEY (`guild_id`,`position`) ) ENGINE=MyISAM; -- @@ -622,8 +618,7 @@ CREATE TABLE IF NOT EXISTS `skill` ( `char_id` int(11) unsigned NOT NULL default '0', `id` smallint(11) unsigned NOT NULL default '0', `lv` tinyint(4) unsigned NOT NULL default '0', - PRIMARY KEY (`char_id`,`id`), - KEY `char_id` (`char_id`) + PRIMARY KEY (`char_id`,`id`) ) ENGINE=MyISAM; -- @@ -634,8 +629,7 @@ CREATE TABLE IF NOT EXISTS `skill_homunculus` ( `homun_id` int(11) NOT NULL, `id` int(11) NOT NULL, `lv` smallint(6) NOT NULL, - PRIMARY KEY (`homun_id`,`id`), - KEY `homun_id` (`homun_id`) + PRIMARY KEY (`homun_id`,`id`) ) ENGINE=MyISAM; -- diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 9cb17dca8..b3a907b1a 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -602,9 +602,9 @@ static struct guild_castle* inter_guildcastle_fromsql(int castle_id) // Read exp_guild.txt static bool exp_guild_parse_row(char* split[], int column, int current) { - int exp = atoi(split[0]); + unsigned int exp = atoll(split[0]); - if (exp < 0 || exp >= INT_MAX) { + if (exp < 0 || exp >= UINT_MAX) { ShowError("exp_guild: Invalid exp %d at line %d\n", exp, current); return false; } |