TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleans up extra=extra complaint

Browse source
This commit is contained in:
Azaezel 2018-03-12 17:41:22 -05:00
parent 261a71c3f9
commit 452bbc7bb1
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/afx/afxChoreographer.cpp
View file

@ -142,7 +142,7 @@ afxChoreographer::afxChoreographer()
lod = 0;
exec_conds_mask = 0;
choreographer_id = 0;
extra = 0;
mExtra = 0;
started_with_newop = false;
postpone_activation = false;
remapped_cons_sent = false; // CONSTRAINT REMAPPING
@ -179,7 +179,7 @@ afxChoreographer::~afxChoreographer()
void afxChoreographer::initPersistFields()
{
// conditionals
addField("extra", TYPEID<SimObject>(), Offset(extra, afxChoreographer),
addField("extra", TYPEID<SimObject>(), Offset(mExtra, afxChoreographer),
"...");
addField("postponeActivation", TypeBool, Offset(postpone_activation, afxChoreographer),
"...");

4
Engine/source/afx/afxChoreographer.h
View file

@ -121,7 +121,7 @@ protected:
U8 ranking;
U8 lod;
U32 exec_conds_mask;
SimObject* extra;
SimObject* mExtra;
Vector<NetConnection*> explicit_clients;
bool started_with_newop;
bool postpone_activation;
@ -182,7 +182,7 @@ public:
void clearChoreographerId() { choreographer_id = 0; }
U32 getChoreographerId() { return choreographer_id; }
void setGhostConstraintObject(SceneObject*, StringTableEntry cons_name);
void setExtra(SimObject* extra) { this->extra = extra; }
void setExtra(SimObject* extra) { mExtra = extra; }
void addExplicitClient(NetConnection* conn);
void removeExplicitClient(NetConnection* conn);
U32 getExplicitClientCount() { return explicit_clients.size(); }

6
Engine/source/afx/afxEffectron.cpp
View file

@ -407,9 +407,9 @@ U32 afxEffectron::packUpdate(NetConnection* conn, U32 mask, BitStream* stream)
if (stream->writeFlag(mask & InitialUpdateMask))
{
// pack extra object's ghost index or scope id if not yet ghosted
if (stream->writeFlag(dynamic_cast<NetObject*>(extra) != 0))
if (stream->writeFlag(dynamic_cast<NetObject*>(mExtra) != 0))
{
NetObject* net_extra = (NetObject*)extra;
NetObject* net_extra = (NetObject*)mExtra;
S32 ghost_idx = conn->getGhostIndex(net_extra);
if (stream->writeFlag(ghost_idx != -1))
stream->writeRangedU32(U32(ghost_idx), 0, NetConnection::MaxGhostCount);
@ -476,7 +476,7 @@ void afxEffectron::unpackUpdate(NetConnection * conn, BitStream * stream)
if (stream->readFlag()) // is ghost_idx
{
S32 ghost_idx = stream->readRangedU32(0, NetConnection::MaxGhostCount);
extra = dynamic_cast<SimObject*>(conn->resolveGhost(ghost_idx));
mExtra = dynamic_cast<SimObject*>(conn->resolveGhost(ghost_idx));
}
else
{

6
Engine/source/afx/afxMagicSpell.cpp
View file

@ -1089,9 +1089,9 @@ U32 afxMagicSpell::packUpdate(NetConnection* conn, U32 mask, BitStream* stream)
if (stream->writeFlag(mask & InitialUpdateMask))
{
// pack extra object's ghost index or scope id if not yet ghosted
if (stream->writeFlag(dynamic_cast<NetObject*>(extra) != 0))
if (stream->writeFlag(dynamic_cast<NetObject*>(mExtra) != 0))
{
NetObject* net_extra = (NetObject*)extra;
NetObject* net_extra = (NetObject*)mExtra;
S32 ghost_idx = conn->getGhostIndex(net_extra);
if (stream->writeFlag(ghost_idx != -1))
stream->writeRangedU32(U32(ghost_idx), 0, NetConnection::MaxGhostCount);
@ -1252,7 +1252,7 @@ void afxMagicSpell::unpackUpdate(NetConnection * conn, BitStream * stream)
if (stream->readFlag()) // is ghost_idx
{
S32 ghost_idx = stream->readRangedU32(0, NetConnection::MaxGhostCount);
extra = dynamic_cast<SimObject*>(conn->resolveGhost(ghost_idx));
mExtra = dynamic_cast<SimObject*>(conn->resolveGhost(ghost_idx));
}
else
{