From e6aca46942da09eb9ffe809a76d166286bc5e147 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Thu, 19 Mar 2009 15:44:01 +0300
Subject: [PATCH] [7495] Fixed mangos_string entry text for .gobject target,
 and shift-links into .gobject turn/move output.

---
 sql/mangos.sql                               | 8 ++++----
 sql/updates/7495_01_mangos_mangos_string.sql | 7 +++++++
 sql/updates/Makefile.am                      | 2 ++
 src/game/Level2.cpp                          | 4 ++--
 src/shared/revision_nr.h                     | 2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 sql/updates/7495_01_mangos_mangos_string.sql

diff --git a/sql/mangos.sql b/sql/mangos.sql
index 183accb51..d9f14de37 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -22,7 +22,7 @@
 DROP TABLE IF EXISTS `db_version`;
 CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
-  `required_7493_01_mangos_command` bit(1) default NULL
+  `required_7495_01_mangos_mangos_string` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -2488,8 +2488,8 @@ INSERT INTO `mangos_string` VALUES
 (273,'Game Object (GUID: %u) not found',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (274,'Game Object (GUID: %u) has references in not found creature %u GO list, can\'t be deleted.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (275,'Game Object (GUID: %u) removed',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(276,'Game Object (GUID: %u) turned',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(277,'Game Object (GUID: %u) moved',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(276,'Game Object |cffffffff|Hgameobject:%d|h[%s]|h|r (GUID: %u) turned',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(277,'Game Object |cffffffff|Hgameobject:%d|h[%s]|h|r (GUID: %u) moved',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (278,'You must select a vendor',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (279,'You must send id for item',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (280,'Vendor has too many items (max 128)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -2681,7 +2681,7 @@ INSERT INTO `mangos_string` VALUES
 (521,'%d - |cffffffff|Hskill:%d|h[%s %s]|h|r %s %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (522,'Game Object (GUID: %u) not found',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (523,'>> Game Object %s (GUID: %u) at %f %f %f. Orientation %f.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(524,'Selected object:\n|cffffffff|Hitemset:%d|h[%s]|h|r\nGUID: %u ID: %u\nX: %f Y: %f Z: %f MapId: %u\nOrientation: %f',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(524,'Selected object:\n|cffffffff|Hgameobject:%d|h[%s]|h|r GUID: %u ID: %u\nX: %f Y: %f Z: %f MapId: %u\nOrientation: %f',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (525,'>> Add Game Object \'%i\' (%s) (GUID: %i) added at \'%f %f %f\'.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (526,'%s (lowguid: %u) movement generators stack:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (527,'   Idle',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
diff --git a/sql/updates/7495_01_mangos_mangos_string.sql b/sql/updates/7495_01_mangos_mangos_string.sql
new file mode 100644
index 000000000..2053b882e
--- /dev/null
+++ b/sql/updates/7495_01_mangos_mangos_string.sql
@@ -0,0 +1,7 @@
+ALTER TABLE db_version CHANGE COLUMN required_7493_01_mangos_command required_7495_01_mangos_mangos_string bit;
+
+DELETE FROM mangos_string WHERE entry IN (276,277,524);
+INSERT INTO mangos_string VALUES
+(276,'Game Object |cffffffff|Hgameobject:%d|h[%s]|h|r (GUID: %u) turned',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(277,'Game Object |cffffffff|Hgameobject:%d|h[%s]|h|r (GUID: %u) moved',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(524,'Selected object:\n|cffffffff|Hgameobject:%d|h[%s]|h|r GUID: %u ID: %u\nX: %f Y: %f Z: %f MapId: %u\nOrientation: %f',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
index dd391481c..76729f089 100644
--- a/sql/updates/Makefile.am
+++ b/sql/updates/Makefile.am
@@ -199,6 +199,7 @@ pkgdata_DATA = \
 	7439_01_mangos_mangos_string.sql \
 	7472_01_mangos_mangos_string.sql \
 	7493_01_mangos_command.sql \
+	7495_01_mangos_mangos_string.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -378,4 +379,5 @@ EXTRA_DIST = \
 	7439_01_mangos_mangos_string.sql \
 	7472_01_mangos_mangos_string.sql \
 	7493_01_mangos_command.sql \
+	7495_01_mangos_mangos_string.sql \
 	README
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index d93aae87a..7f36b1777 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -621,7 +621,7 @@ bool ChatHandler::HandleGameObjectTurnCommand(const char* args)
     obj->SaveToDB();
     obj->Refresh();
 
-    PSendSysMessage(LANG_COMMAND_TURNOBJMESSAGE, obj->GetGUIDLow(), o);
+    PSendSysMessage(LANG_COMMAND_TURNOBJMESSAGE, obj->GetGUIDLow(), obj->GetGOInfo()->name, obj->GetGUIDLow(), o);
 
     return true;
 }
@@ -699,7 +699,7 @@ bool ChatHandler::HandleGameObjectMoveCommand(const char* args)
     obj->SaveToDB();
     obj->Refresh();
 
-    PSendSysMessage(LANG_COMMAND_MOVEOBJMESSAGE, obj->GetGUIDLow());
+    PSendSysMessage(LANG_COMMAND_MOVEOBJMESSAGE, obj->GetGUIDLow(), obj->GetGOInfo()->name, obj->GetGUIDLow());
 
     return true;
 }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index a47d3188f..768dd4cf3 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7494"
+ #define REVISION_NR "7495"
 #endif // __REVISION_NR_H__