From 2265aef916e3b2d63d87faa68a2b51e7d747c54c Mon Sep 17 00:00:00 2001
From: Seline <none@none>
Date: Tue, 14 Oct 2008 11:57:03 -0500
Subject: [svn] * Merge Temp dev SVN with Assembla. * Changes include:    -
 Implementation of w12x's Outdoor PvP and Game Event Systems.    - Temporary
 removal of IRC Chat Bot (until infinite loop when disabled is fixed).    -
 All mangos -> trinity (to convert your mangos_string table, please run
 mangos_string_to_trinity_string.sql).    - Improved Config cleanup.    - And
 many more changes.

--HG--
branch : trunk
---
 contrib/vmap_debugger/ModelContainerView.cpp | 4 ++--
 contrib/vmap_debugger/ModelContainerView.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'contrib/vmap_debugger')

diff --git a/contrib/vmap_debugger/ModelContainerView.cpp b/contrib/vmap_debugger/ModelContainerView.cpp
index c29666c0bca..fa6b2b40b29 100644
--- a/contrib/vmap_debugger/ModelContainerView.cpp
+++ b/contrib/vmap_debugger/ModelContainerView.cpp
@@ -451,7 +451,7 @@ namespace VMAP
 
     //====================================================================
 
-    Vector3 ModelContainerView::convertPositionToMangosRep(float x, float y, float z) const {
+    Vector3 ModelContainerView::convertPositionToTrinityRep(float x, float y, float z) const {
         float pos[3];
         pos[0] = z;
         pos[1] = x;
@@ -490,7 +490,7 @@ namespace VMAP
 #if 0
             i_App->defaultController.getPosition();
             Vector3 pos = i_App->defaultController.getPosition();
-            Vector3 pos2 = convertPositionToMangosRep(pos.x, pos.y, pos.z);
+            Vector3 pos2 = convertPositionToTrinityRep(pos.x, pos.y, pos.z);
             //Vector3 pos3 = iVMapManager->convertPositionToInternalRep(pos2.x, pos2.y, pos2.z);
             //pos3 = iVMapManager->convertPositionToInternalRep(pos2.x, pos2.y, pos2.z);
 
diff --git a/contrib/vmap_debugger/ModelContainerView.h b/contrib/vmap_debugger/ModelContainerView.h
index 28d992a0c16..ff41f7d1784 100644
--- a/contrib/vmap_debugger/ModelContainerView.h
+++ b/contrib/vmap_debugger/ModelContainerView.h
@@ -51,7 +51,7 @@ namespace VMAP
         bool iPosSent;
         Array<Command> iPrevLoadCommands;
 	private:
-		Vector3 convertPositionToMangosRep(float x, float y, float z) const;
+		Vector3 convertPositionToTrinityRep(float x, float y, float z) const;
 
 	public:
 		ModelContainerView(const G3D::GApp::Settings& settings);
-- 
cgit v1.2.3