mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-09-29 06:52:47 +00:00
215da0130d
Was getting frustrated by the inconsistency in our include statements, which were causing me problems. As a result, I went through and manually re-organized every include statement in non-core files. I'm just gonna copy my rant from Discord: FOR HEADER FILES (.hpp): - everything you use IN THE HEADER must be EXPLICITLY INCLUDED with the exception of things that fall under Core.hpp - you may NOT include ANYTHING ELSE FOR SOURCE FILES (.cpp): - you can #include whatever you want as long as the partner header is included first - anything that gets included by another include is fair game - redundant includes are ok because they'll be harmless AS LONG AS our header files stay lean. the point of this is NOT to optimize the number of includes used all around or make things more efficient necessarily. it's to improve readability & coherence and make it easier to avoid cyclical issues
137 lines
3.3 KiB
C++
137 lines
3.3 KiB
C++
#include "Entities.hpp"
|
|
|
|
#include "NPCManager.hpp"
|
|
#include "PlayerManager.hpp"
|
|
|
|
#include <assert.h>
|
|
|
|
static_assert(std::is_standard_layout<EntityRef>::value);
|
|
static_assert(std::is_trivially_copyable<EntityRef>::value);
|
|
|
|
EntityRef::EntityRef(CNSocket *s) {
|
|
kind = EntityKind::PLAYER;
|
|
sock = s;
|
|
}
|
|
|
|
EntityRef::EntityRef(int32_t i) {
|
|
id = i;
|
|
|
|
assert(NPCManager::NPCs.find(id) != NPCManager::NPCs.end());
|
|
kind = NPCManager::NPCs[id]->kind;
|
|
}
|
|
|
|
bool EntityRef::isValid() const {
|
|
if (kind == EntityKind::PLAYER)
|
|
return PlayerManager::players.find(sock) != PlayerManager::players.end();
|
|
|
|
return NPCManager::NPCs.find(id) != NPCManager::NPCs.end();
|
|
}
|
|
|
|
Entity *EntityRef::getEntity() const {
|
|
assert(isValid());
|
|
|
|
if (kind == EntityKind::PLAYER)
|
|
return PlayerManager::getPlayer(sock);
|
|
|
|
return NPCManager::NPCs[id];
|
|
}
|
|
|
|
sNPCAppearanceData BaseNPC::getAppearanceData() {
|
|
sNPCAppearanceData data = {};
|
|
data.iAngle = angle;
|
|
data.iBarkerType = 0; // unused?
|
|
data.iConditionBitFlag = cbf;
|
|
data.iHP = hp;
|
|
data.iNPCType = type;
|
|
data.iNPC_ID = id;
|
|
data.iX = x;
|
|
data.iY = y;
|
|
data.iZ = z;
|
|
return data;
|
|
}
|
|
|
|
/*
|
|
* Entity coming into view.
|
|
*/
|
|
void BaseNPC::enterIntoViewOf(CNSocket *sock) {
|
|
INITSTRUCT(sP_FE2CL_NPC_ENTER, pkt);
|
|
pkt.NPCAppearanceData = getAppearanceData();
|
|
sock->sendPacket(pkt, P_FE2CL_NPC_ENTER);
|
|
}
|
|
|
|
void Bus::enterIntoViewOf(CNSocket *sock) {
|
|
INITSTRUCT(sP_FE2CL_TRANSPORTATION_ENTER, pkt);
|
|
|
|
// TODO: Potentially decouple this from BaseNPC?
|
|
pkt.AppearanceData = {
|
|
3, id, type,
|
|
x, y, z
|
|
};
|
|
|
|
sock->sendPacket(pkt, P_FE2CL_TRANSPORTATION_ENTER);
|
|
}
|
|
|
|
void Egg::enterIntoViewOf(CNSocket *sock) {
|
|
INITSTRUCT(sP_FE2CL_SHINY_ENTER, pkt);
|
|
|
|
// TODO: Potentially decouple this from BaseNPC?
|
|
pkt.ShinyAppearanceData = {
|
|
id, type, 0, // client doesn't care about map num
|
|
x, y, z
|
|
};
|
|
|
|
sock->sendPacket(pkt, P_FE2CL_SHINY_ENTER);
|
|
}
|
|
|
|
sPCAppearanceData Player::getAppearanceData() {
|
|
sPCAppearanceData data = {};
|
|
data.iID = iID;
|
|
data.iHP = HP;
|
|
data.iLv = level;
|
|
data.iX = x;
|
|
data.iY = y;
|
|
data.iZ = z;
|
|
data.iAngle = angle;
|
|
data.PCStyle = PCStyle;
|
|
data.Nano = Nanos[activeNano];
|
|
data.iPCState = iPCState;
|
|
data.iSpecialState = iSpecialState;
|
|
memcpy(data.ItemEquip, Equip, sizeof(sItemBase) * AEQUIP_COUNT);
|
|
return data;
|
|
}
|
|
|
|
// TODO: this is less effiecient than it was, because of memset()
|
|
void Player::enterIntoViewOf(CNSocket *sock) {
|
|
INITSTRUCT(sP_FE2CL_PC_NEW, pkt);
|
|
pkt.PCAppearanceData = getAppearanceData();
|
|
sock->sendPacket(pkt, P_FE2CL_PC_NEW);
|
|
}
|
|
|
|
/*
|
|
* Entity leaving view.
|
|
*/
|
|
void BaseNPC::disappearFromViewOf(CNSocket *sock) {
|
|
INITSTRUCT(sP_FE2CL_NPC_EXIT, pkt);
|
|
pkt.iNPC_ID = id;
|
|
sock->sendPacket(pkt, P_FE2CL_NPC_EXIT);
|
|
}
|
|
|
|
void Bus::disappearFromViewOf(CNSocket *sock) {
|
|
INITSTRUCT(sP_FE2CL_TRANSPORTATION_EXIT, pkt);
|
|
pkt.eTT = 3;
|
|
pkt.iT_ID = id;
|
|
sock->sendPacket(pkt, P_FE2CL_TRANSPORTATION_EXIT);
|
|
}
|
|
|
|
void Egg::disappearFromViewOf(CNSocket *sock) {
|
|
INITSTRUCT(sP_FE2CL_SHINY_EXIT, pkt);
|
|
pkt.iShinyID = id;
|
|
sock->sendPacket(pkt, P_FE2CL_SHINY_EXIT);
|
|
}
|
|
|
|
void Player::disappearFromViewOf(CNSocket *sock) {
|
|
INITSTRUCT(sP_FE2CL_PC_EXIT, pkt);
|
|
pkt.iID = iID;
|
|
sock->sendPacket(pkt, P_FE2CL_PC_EXIT);
|
|
}
|