OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2026-01-21 22:30:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[refactor] E g g s

Browse Source
This commit is contained in:
dongresource
2021-03-17 22:28:24 +01:00
parent a55a34e09a
commit 610a683804
11 changed files with 324 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/CustomCommands.cpp
View File

@@ -3,6 +3,7 @@
#include "PlayerManager.hpp"
#include "TableData.hpp"
#include "NPCManager.hpp"
#include "Eggs.hpp"
#include "MobAI.hpp"
#include "Items.hpp"
#include "db/Database.hpp"
@@ -485,7 +486,7 @@ static void buffCommand(std::string full, std::vector<std::string>& args, CNSock
if (*tmp)
return;
if (NPCManager::eggBuffPlayer(sock, skillId, 0, duration)<0)
if (Eggs::eggBuffPlayer(sock, skillId, 0, duration)<0)
Chat::sendServerMessage(sock, "/buff: unknown skill Id");
}
@@ -501,7 +502,7 @@ static void eggCommand(std::string full, std::vector<std::string>& args, CNSocke
if (*tmp)
return;
if (NPCManager::EggTypes.find(eggType) == NPCManager::EggTypes.end()) {
if (Eggs::EggTypes.find(eggType) == Eggs::EggTypes.end()) {
Chat::sendServerMessage(sock, "/egg: Unknown egg type");
return;
}
@@ -518,7 +519,7 @@ static void eggCommand(std::string full, std::vector<std::string>& args, CNSocke
Egg* egg = new Egg(plr->x + addX, plr->y + addY, plr->z, plr->instanceID, eggType, id, false); // change last arg to true after gruntwork
NPCManager::NPCs[id] = egg;
NPCManager::Eggs[id] = egg;
Eggs::Eggs[id] = egg;
NPCManager::updateNPCPosition(id, plr->x + addX, plr->y + addY, plr->z, plr->instanceID, plr->angle);
// add to template