Clean up level0.cpp and return proper errormessages (fix by ogeraisi)

Closes issue #286

--HG--
branch : trunk

2 files changed, 6 insertions, 1 deletions

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 32e82380dd0..a0c566f550c 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -14636,7 +14636,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_
 (24, 'You used it recently.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (25, 'Password not changed (unknown error)!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (26, 'The password was changed', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(27, 'The new passwords do not match or the old password is wrong', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(27, 'The old password is wrong', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (28, 'Your account is now locked.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (29, 'Your account is now unlocked.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (30, ', rank ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -14671,6 +14671,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_
 (59, 'Using creature EventAI: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (60, 'Online players: %u (max: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (61, 'Up to %u expansion allowed now.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(62, 'One on more parameters have incorrect values', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (100, 'Global notify: ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (101, 'Map: %u (%s) Zone: %u (%s) Area: %u (%s) Phase: %u\nX: %f Y: %f Z: %f Orientation: %f\ngrid[%u,%u]cell[%u,%u] InstanceID: %u\n ZoneX: %f ZoneY: %f\nGroundZ: %f FloorZ: %f Have height data (Map: %u VMap: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (102, '%s is already being teleported.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
diff --git a/sql/updates/8915_world_trinity_string.sql b/sql/updates/8915_world_trinity_string.sql
new file mode 100644
index 00000000000..49676b0870a
--- /dev/null
+++ b/sql/updates/8915_world_trinity_string.sql
@@ -0,0 +1,4 @@
+-- UPDATE so we don't kill customized locale strings if user has any
+UPDATE `trinity_string` SET `content_default`='The old password is wrong' WHERE `entry`=27;
+-- INSERT as this string has not been used before
+INSERT INTO `trinity_string` VALUES (62, 'One on more parameters have incorrect values', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);