aboutsummaryrefslogtreecommitdiff
path: root/src/game/WaypointManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/WaypointManager.cpp')
-rw-r--r--src/game/WaypointManager.cpp32
1 files changed, 0 insertions, 32 deletions
diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp
index b9fb027d9c5..add7cd8998d 100644
--- a/src/game/WaypointManager.cpp
+++ b/src/game/WaypointManager.cpp
@@ -17,21 +17,17 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#include "Database/DatabaseEnv.h"
#include "GridDefines.h"
#include "WaypointManager.h"
#include "ProgressBar.h"
#include "MapManager.h"
-
UNORDERED_MAP<uint32, WaypointPath*> waypoint_map;
WaypointStore WaypointMgr;
-
void WaypointStore::Free()
{
waypoint_map.clear();
}
-
void WaypointStore::Load()
{
QueryResult *result = WorldDatabase.PQuery("SELECT COUNT(id) FROM waypoint_data");
@@ -40,42 +36,33 @@ void WaypointStore::Load()
sLog.outError("an error occured while loading the table `waypoint_data` (maybe it doesn't exist ?)");
exit(1); // Stop server at loading non exited table or not accessable table
}
-
records = (*result)[0].GetUInt32();
delete result;
-
result = WorldDatabase.PQuery("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data ORDER BY id, point");
if(!result)
{
sLog.outErrorDb("The table `waypoint_data` is empty or corrupted");
return;
}
-
WaypointPath* path_data;
uint32 total_records = result->GetRowCount();
-
barGoLink bar( total_records);
Field *fields;
uint32 last_id = 0;
-
do
{
fields = result->Fetch();
uint32 id = fields[0].GetUInt32();
bar.step();
WaypointData *wp = new WaypointData;
-
if(last_id != id)
path_data = new WaypointPath;
-
float x,y,z;
x = fields[2].GetFloat();
y = fields[3].GetFloat();
z = fields[4].GetFloat();
-
Trinity::NormalizeMapCoord(x);
Trinity::NormalizeMapCoord(y);
-
wp->id = fields[1].GetUInt32();
wp->x = x;
wp->y = y;
@@ -84,50 +71,35 @@ void WaypointStore::Load()
wp->delay = fields[6].GetUInt32();
wp->event_id = fields[7].GetUInt32();
wp->event_chance = fields[8].GetUInt8();
-
path_data->push_back(wp);
-
if(id != last_id)
waypoint_map[id] = path_data;
-
last_id = id;
-
} while(result->NextRow()) ;
-
delete result;
}
-
void WaypointStore::UpdatePath(uint32 id)
{
if(waypoint_map.find(id)!= waypoint_map.end())
waypoint_map[id]->clear();
-
QueryResult *result;
-
result = WorldDatabase.PQuery("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data WHERE id = %u ORDER BY point", id);
-
if(!result)
return;
-
WaypointPath* path_data;
path_data = new WaypointPath;
Field *fields;
-
do
{
fields = result->Fetch();
uint32 id = fields[0].GetUInt32();
-
WaypointData *wp = new WaypointData;
-
float x,y,z;
x = fields[2].GetFloat();
y = fields[3].GetFloat();
z = fields[4].GetFloat();
-
Trinity::NormalizeMapCoord(x);
Trinity::NormalizeMapCoord(y);
-
wp->id = fields[1].GetUInt32();
wp->x = x;
wp->y = y;
@@ -136,14 +108,10 @@ void WaypointStore::UpdatePath(uint32 id)
wp->delay = fields[6].GetUInt32();
wp->event_id = fields[7].GetUInt32();
wp->event_chance = fields[8].GetUInt8();
-
path_data->push_back(wp);
-
}
while (result->NextRow());
-
waypoint_map[id] = path_data;
-
delete result;
}