*Cleanup, fix many cases of unoptimized loops, potential crashes, excessively large data types, unnecessary or wrong casts, non-standardized function calls, and so on..

*Proper Maexxna Web Spray locations (old locations sent players flying into the air)

--HG--
branch : trunk

4 files changed, 18 insertions, 7 deletions

diff --git a/sql/characters.sql b/sql/characters.sql
index 8ff9616c487..80b164ba143 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -444,14 +444,14 @@ CREATE TABLE `character_aura` (
   `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
   `caster_guid` bigint(20) unsigned NOT NULL default '0' COMMENT 'Full Global Unique Identifier',
   `spell` int(11) unsigned NOT NULL default '0',
-  `effect_mask` int(11) unsigned NOT NULL default '0',
-  `stackcount` int(11) NOT NULL default '1',
+  `effect_mask` tinyint(3) unsigned NOT NULL default '0',
+  `stackcount` tinyint(3) unsigned NOT NULL default '1',
   `amount0` int(11) NOT NULL default '0',
   `amount1` int(11) NOT NULL default '0',
   `amount2` int(11) NOT NULL default '0',
   `maxduration` int(11) NOT NULL default '0',
   `remaintime` int(11) NOT NULL default '0',
-  `remaincharges` int(11) NOT NULL default '0',
+  `remaincharges` tinyint(3) unsigned NOT NULL default '0',
   PRIMARY KEY  (`guid`,`spell`,`effect_mask`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
 
@@ -1492,14 +1492,14 @@ CREATE TABLE `pet_aura` (
   `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
   `caster_guid` bigint(20) unsigned NOT NULL default '0' COMMENT 'Full Global Unique Identifier',
   `spell` int(11) unsigned NOT NULL default '0',
-  `effect_mask` int(11) unsigned NOT NULL default '0',
-  `stackcount` int(11) NOT NULL default '1',
+  `effect_mask` tinyint(3) unsigned NOT NULL default '0',
+  `stackcount` tinyint(3) unsigned NOT NULL default '1',
   `amount0` int(11) NOT NULL default '0',
   `amount1` int(11) NOT NULL default '0',
   `amount2` int(11) NOT NULL default '0',
   `maxduration` int(11) NOT NULL default '0',
   `remaintime` int(11) NOT NULL default '0',
-  `remaincharges` int(11) NOT NULL default '0',
+  `remaincharges` tinyint(3) unsigned NOT NULL default '0',
   PRIMARY KEY  (`guid`,`spell`,`effect_mask`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Pet System';
 
diff --git a/sql/updates/6156_characters.sql b/sql/updates/6156_characters.sql
new file mode 100644
index 00000000000..b0e3d4e540f
--- /dev/null
+++ b/sql/updates/6156_characters.sql
@@ -0,0 +1,8 @@
+
+ALTER TABLE `character_aura` MODIFY COLUMN `effect_mask` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
+ MODIFY COLUMN `stackcount` TINYINT(3) UNSIGNED NOT NULL DEFAULT 1,
+ MODIFY COLUMN `remaincharges` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+
+ALTER TABLE `pet_aura` MODIFY COLUMN `effect_mask` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
+ MODIFY COLUMN `stackcount` TINYINT(3) UNSIGNED NOT NULL DEFAULT 1,
+ MODIFY COLUMN `remaincharges` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
diff --git a/sql/updates/6156_world.sql b/sql/updates/6156_world.sql
new file mode 100644
index 00000000000..eed5fcddc13
--- /dev/null
+++ b/sql/updates/6156_world.sql
@@ -0,0 +1,3 @@
+
+-- the (4) in TINYINT(4) is kind of useless here, but whatever. This column should be unsigned.
+ALTER TABLE `exploration_basexp` MODIFY COLUMN `level` TINYINT(4) UNSIGNED NOT NULL DEFAULT 0;
diff --git a/sql/world.sql b/sql/world.sql
index 3b50a4383d6..391aae19be6 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -694,7 +694,7 @@ DROP TABLE IF EXISTS `exploration_basexp`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `exploration_basexp` (
-  `level` tinyint(4) NOT NULL default '0',
+  `level` tinyint(4) unsigned NOT NULL default '0',
   `basexp` mediumint(9) NOT NULL default '0',
   PRIMARY KEY  (`level`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Exploration System';