edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix indentation

Browse source
This commit is contained in:
Learath2 2017-06-06 10:11:42 +02:00
parent 608acd7029
commit b04876361d
1 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
src/game/extrainfo.cpp
View file

@ -8,65 +8,65 @@
bool UseExtraInfo(const CNetObj_Projectile *pProj) bool UseExtraInfo(const CNetObj_Projectile *pProj)
{ {
bool ExtraInfoFlag = ((abs(pProj->m_VelY) & (1<<9)) != 0); bool ExtraInfoFlag = ((abs(pProj->m_VelY) & (1<<9)) != 0);
return ExtraInfoFlag; return ExtraInfoFlag;
} }
void ExtractInfo(const CNetObj_Projectile *pProj, vec2 *StartPos, vec2 *StartVel, bool IsDDNet) void ExtractInfo(const CNetObj_Projectile *pProj, vec2 *StartPos, vec2 *StartVel, bool IsDDNet)
{ {
if(!UseExtraInfo(pProj) || !IsDDNet) if(!UseExtraInfo(pProj) || !IsDDNet)
{ {
StartPos->x = pProj->m_X; StartPos->x = pProj->m_X;
StartPos->y = pProj->m_Y; StartPos->y = pProj->m_Y;
StartVel->x = pProj->m_VelX/100.0f; StartVel->x = pProj->m_VelX/100.0f;
StartVel->y = pProj->m_VelY/100.0f; StartVel->y = pProj->m_VelY/100.0f;
} }
else else
{ {
StartPos->x = pProj->m_X/100.0f; StartPos->x = pProj->m_X/100.0f;
StartPos->y = pProj->m_Y/100.0f; StartPos->y = pProj->m_Y/100.0f;
float Angle = pProj->m_VelX/1000000.0f; float Angle = pProj->m_VelX/1000000.0f;
StartVel->x = sin(-Angle); StartVel->x = sin(-Angle);
StartVel->y = cos(-Angle); StartVel->y = cos(-Angle);
} }
} }
void ExtractExtraInfo(const CNetObj_Projectile *pProj, int *Owner, bool *Explosive, int *Bouncing, bool *Freeze) void ExtractExtraInfo(const CNetObj_Projectile *pProj, int *Owner, bool *Explosive, int *Bouncing, bool *Freeze)
{ {
int Data = pProj->m_VelY; int Data = pProj->m_VelY;
if(Owner) if(Owner)
{ {
*Owner = Data & 255; *Owner = Data & 255;
if((Data>>8) & 1) if((Data>>8) & 1)
*Owner = -(*Owner); *Owner = -(*Owner);
} }
if(Bouncing) if(Bouncing)
*Bouncing = (Data>>10) & 3; *Bouncing = (Data>>10) & 3;
if(Explosive) if(Explosive)
*Explosive = (Data>>12) & 1; *Explosive = (Data>>12) & 1;
if(Freeze) if(Freeze)
*Freeze = (Data>>13) & 1; *Freeze = (Data>>13) & 1;
} }
void SnapshotRemoveExtraInfo(unsigned char *pData) void SnapshotRemoveExtraInfo(unsigned char *pData)
{ {
CSnapshot *pSnap = (CSnapshot*) pData; CSnapshot *pSnap = (CSnapshot*) pData;
for(int Index = 0; Index < pSnap->NumItems(); Index++) for(int Index = 0; Index < pSnap->NumItems(); Index++)
{ {
CSnapshotItem *pItem = pSnap->GetItem(Index); CSnapshotItem *pItem = pSnap->GetItem(Index);
if(pItem->Type() == NETOBJTYPE_PROJECTILE) if(pItem->Type() == NETOBJTYPE_PROJECTILE)
{ {
CNetObj_Projectile *pProj = (CNetObj_Projectile*) ((void*)pItem->Data()); CNetObj_Projectile *pProj = (CNetObj_Projectile*) ((void*)pItem->Data());
if(UseExtraInfo(pProj)) if(UseExtraInfo(pProj))
{ {
vec2 Pos; vec2 Pos;
vec2 Vel; vec2 Vel;
ExtractInfo(pProj, &Pos, &Vel, 1); ExtractInfo(pProj, &Pos, &Vel, 1);
pProj->m_X = Pos.x; pProj->m_X = Pos.x;
pProj->m_Y = Pos.y; pProj->m_Y = Pos.y;
pProj->m_VelX = (int)(Vel.x*100.0f); pProj->m_VelX = (int)(Vel.x*100.0f);
pProj->m_VelY = (int)(Vel.y*100.0f); pProj->m_VelY = (int)(Vel.y*100.0f);
} }
} }
} }
} }