diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2019-07-08 16:16:10 +0400 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2019-07-08 14:16:10 +0200 |
| commit | e71773140c8efbea4abe612a71d4a65f041d450c (patch) | |
| tree | 76b04baf6a325504535da6c5a5d80884476aa71c /src/server/scripts/Commands | |
| parent | 671052575a36624b06379ee5e13a7fea26870194 (diff) | |
Scripts/Commands: update .wp commands to use orientation field from DB (PR #23566)
Closes #23330
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_debug.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_wp.cpp | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index ac1c9570e80..d5e9a003d25 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -1564,7 +1564,7 @@ public: { Player* player = handler->GetSession()->GetPlayer(); - TC_LOG_INFO("sql.dev", "(@PATH, XX, %.3f, %.3f, %.5f, 0, 0, 0, 100, 0),", player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); + TC_LOG_INFO("sql.dev", "(@PATH, XX, %.3f, %.3f, %.5f, %.5f, 0, 0, 0, 100, 0),", player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation()); handler->PSendSysMessage("Waypoint SQL written to SQL Developer log"); return true; diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 2c84d63a06a..b48fe25b67d 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -135,6 +135,7 @@ public: stmt->setFloat(2, player->GetPositionX()); stmt->setFloat(3, player->GetPositionY()); stmt->setFloat(4, player->GetPositionZ()); + stmt->setFloat(5, player->GetOrientation()); WorldDatabase.Execute(stmt); @@ -693,8 +694,9 @@ public: stmt->setFloat(0, chr->GetPositionX()); stmt->setFloat(1, chr->GetPositionY()); stmt->setFloat(2, chr->GetPositionZ()); - stmt->setUInt32(3, pathid); - stmt->setUInt32(4, point); + stmt->setFloat(3, chr->GetOrientation()); + stmt->setUInt32(4, pathid); + stmt->setUInt32(5, point); WorldDatabase.Execute(stmt); handler->PSendSysMessage(LANG_WAYPOINT_CHANGED); @@ -864,12 +866,12 @@ public: float x = fields[1].GetFloat(); float y = fields[2].GetFloat(); float z = fields[3].GetFloat(); + float o = fields[4].GetFloat(); uint32 id = VISUAL_WAYPOINT; Player* chr = handler->GetSession()->GetPlayer(); Map* map = chr->GetMap(); - float o = chr->GetOrientation(); Creature* wpCreature = new Creature(); if (!wpCreature->Create(map->GenerateLowGuid<HighGuid::Unit>(), map, chr->GetPhaseMaskForSpawn(), id, { x, y, z, o })) @@ -928,10 +930,11 @@ public: float x = fields[0].GetFloat(); float y = fields[1].GetFloat(); float z = fields[2].GetFloat(); + float o = fields[3].GetFloat(); + uint32 id = VISUAL_WAYPOINT; Player* chr = handler->GetSession()->GetPlayer(); - float o = chr->GetOrientation(); Map* map = chr->GetMap(); Creature* creature = new Creature(); |
