Tribes2/T2-CPP
1
0
Fork 0
mirror of https://github.com/Ragora/T2-CPP.git synced 2026-02-25 01:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge Bahke's latest changes in

Browse source
This commit is contained in:
Robert MacGregor 2016-02-23 02:07:23 -05:00
parent 752155db59
commit bdca76020c
10 changed files with 351 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CommonAPI/Common/source/DXAPI/NetConnection.cpp
View file

@ -24,18 +24,24 @@ namespace DX
}
return ghostid;
}
NetObject NetConnection::resolveGhostParent(S32 id) {
unsigned int NetConnection::resolveGhostParent(S32 id) {
if (this->getGhostFrom()) {
if (this->mGhostRefs[id].obj)
{
return NetObject((unsigned int)(this->mGhostRefs[id].obj));
return (unsigned int)(this->mGhostRefs[id].obj);
}
}
return NULL;
}
NetObject NetConnection::resolveGhost(S32 id) {
unsigned int NetConnection::resolveGhost(S32 id) {
if (id == NULL) {
return NULL;
}
if (this->getGhostTo()) {
return NetObject((unsigned int)this->mLocalGhosts[id]);
if ((unsigned int)this->mLocalGhosts[id] == NULL) {
return NULL;
}
return (unsigned int)this->mLocalGhosts[id];
}
return NULL;
}