mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 303

Browse source 
Conflicts:
	src/game/ObjectMgr.h
This commit is contained in:
tomrus88 2008-10-27 01:27:48 +03:00
commit 233e5eac6f
32 changed files with 160 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/mangos.sql
View file

@ -2158,6 +2158,8 @@ INSERT INTO `mangos_string` VALUES
(54,'The new passwords do not match',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(55,'Your password can\'t be longer than 16 characters (client limit), password not changed!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(56,'Current Message of the day: \r\n%s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(57,'Using World DB: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(58,'Using script library: %s',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)\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),

5
sql/updates/2008_10_26_01_mangos_mangos_string.sql Normal file
View file

@ -0,0 +1,5 @@
DELETE FROM mangos_string WHERE entry IN (57,58);
INSERT INTO mangos_string VALUES
(57,'Using World DB: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(58,'Using script library: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

2
sql/updates/Makefile.am
View file

@ -106,6 +106,7 @@ pkgdata_DATA = \
2008_10_23_03_mangos_mangos_string.sql \
2008_10_23_04_mangos_command.sql \
2008_10_23_05_mangos_command.sql \
2008_10_26_01_mangos_mangos_string.sql \
README
## Additional files to include when running 'make dist'
@ -193,4 +194,5 @@ EXTRA_DIST = \
2008_10_23_03_mangos_mangos_string.sql \
2008_10_23_04_mangos_command.sql \
2008_10_23_05_mangos_command.sql \
2008_10_26_01_mangos_mangos_string.sql \
README