TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-19 14:43:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into EngineAPI-Refactor

Browse source
This commit is contained in:
Areloch 2018-12-09 14:48:50 -06:00 • committed by GitHub
commit 3a71c75596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1937 changed files with 102332 additions and 70549 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/sim/netGhost.cpp
View file

@ -428,7 +428,7 @@ void NetConnection::ghostWritePacket(BitStream *bstream, PacketNotify *notify)
//
for(i = mGhostZeroUpdateIndex - 1; i >= 0 && !bstream->isFull(); i--)
{
GhostInfo *walk = mGhostArray[i];
walk = mGhostArray[i];
if(walk->flags & (GhostInfo::KillingGhost | GhostInfo::Ghosting))
continue;

22
Engine/source/sim/netObject.cpp
View file

@ -56,9 +56,9 @@ NetObject::NetObject()
mNextDirtyList = NULL;
mDirtyMaskBits = 0;
#ifdef TORQUE_AFX_ENABLED
scope_id = 0;
scope_refs = 0;
scope_registered = false;
mScope_id = 0;
mScope_refs = 0;
mScope_registered = false;
#endif
}
@ -478,23 +478,23 @@ DefineEngineMethod( NetObject, isServerObject, bool, (),,
#ifdef TORQUE_AFX_ENABLED
U16 NetObject::addScopeRef()
{
if (scope_refs == 0)
if (mScope_refs == 0)
{
scope_id = arcaneFX::generateScopeId();
mScope_id = arcaneFX::generateScopeId();
onScopeIdChange();
}
scope_refs++;
return scope_id;
mScope_refs++;
return mScope_id;
}
void NetObject::removeScopeRef()
{
if (scope_refs == 0)
if (mScope_refs == 0)
return;
scope_refs--;
if (scope_refs == 0)
mScope_refs--;
if (mScope_refs == 0)
{
scope_id = 0;
mScope_id = 0;
onScopeIdChange();
}
}

12
Engine/source/sim/netObject.h
View file

@ -411,17 +411,17 @@ public:
/// @}
protected:
U16 scope_id;
U16 scope_refs;
bool scope_registered;
U16 mScope_id;
U16 mScope_refs;
bool mScope_registered;
virtual void onScopeIdChange() { }
public:
enum { SCOPE_ID_BITS = 14 };
U16 getScopeId() const { return scope_id; }
U16 getScopeId() const { return mScope_id; }
U16 addScopeRef();
void removeScopeRef();
void setScopeRegistered(bool flag) { scope_registered = flag; }
bool getScopeRegistered() const { return scope_registered; }
void setScopeRegistered(bool flag) { mScope_registered = flag; }
bool getScopeRegistered() const { return mScope_registered; }
protected:
/// Add a networked field