pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-18 15:31:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

moveto converted to xyz_heading

Browse Source
This commit is contained in:
Arthur Ice 2014-12-02 11:20:10 -08:00
parent 9d6a89c65d
commit 04e24ddce4
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/embparser_api.cpp
View File

@ -1392,7 +1392,7 @@ XS(XS__moveto)
else else
saveguard = false; saveguard = false;
quest_manager.moveto(x, y, z, h, saveguard); quest_manager.moveto(xyz_heading(x, y, z, h), saveguard);
XSRETURN_EMPTY; XSRETURN_EMPTY;
} }

6
zone/lua_general.cpp
View File

@ -421,15 +421,15 @@ void lua_pause(int duration) {
} }
void lua_move_to(float x, float y, float z) { void lua_move_to(float x, float y, float z) {
quest_manager.moveto(x, y, z, 0, false); quest_manager.moveto(xyz_heading(x, y, z, 0.0f), false);
} }
void lua_move_to(float x, float y, float z, float h) { void lua_move_to(float x, float y, float z, float h) {
quest_manager.moveto(x, y, z, h, false); quest_manager.moveto(xyz_heading(x, y, z, h), false);
} }
void lua_move_to(float x, float y, float z, float h, bool save_guard_spot) { void lua_move_to(float x, float y, float z, float h, bool save_guard_spot) {
quest_manager.moveto(x, y, z, h, save_guard_spot); quest_manager.moveto(xyz_heading(x, y, z, h), save_guard_spot);
} }
void lua_path_resume() { void lua_path_resume() {

3
zone/questmgr.cpp
View File

@ -1553,12 +1553,11 @@ void QuestManager::pause(int duration) {
owner->CastToNPC()->PauseWandering(duration); owner->CastToNPC()->PauseWandering(duration);
} }
void QuestManager::moveto(float x, float y, float z, float h, bool saveguardspot) { void QuestManager::moveto(const xyz_heading& position, bool saveguardspot) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if (!owner || !owner->IsNPC()) if (!owner || !owner->IsNPC())
return; return;
auto position = xyz_heading(x,y,z,h);
owner->CastToNPC()->MoveTo(position, saveguardspot); owner->CastToNPC()->MoveTo(position, saveguardspot);
} }

2
zone/questmgr.h
View File

@ -135,7 +135,7 @@ public:
void start(int wp); void start(int wp);
void stop(); void stop();
void pause(int duration); void pause(int duration);
void moveto(float x, float y, float z, float h, bool saveguardspot); void moveto(const xyz_heading& position, bool saveguardspot);
void resume(); void resume();
void addldonpoints(int32 points, uint32 theme); void addldonpoints(int32 points, uint32 theme);
void addldonwin(int32 wins, uint32 theme); void addldonwin(int32 wins, uint32 theme);