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

remove comments and stuff that shouldn't be there

Browse source
This commit is contained in:
Ryozuki 2018-07-15 01:12:10 +02:00
parent c074fdd30f
commit 2bee4a9807
1 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/game/server/entity.cpp
View file

@ -63,7 +63,6 @@ bool CEntity::GetNearestAirPos(vec2 Pos, vec2 ColPos, vec2* pOutPos)
vec2 PosInBlock = vec2(round_to_int(Pos.x) % 32, round_to_int(Pos.y) % 32); vec2 PosInBlock = vec2(round_to_int(Pos.x) % 32, round_to_int(Pos.y) % 32);
vec2 BlockCenter = vec2(round_to_int(Pos.x), round_to_int(Pos.y)) - PosInBlock + vec2(16.0f, 16.0f); vec2 BlockCenter = vec2(round_to_int(Pos.x), round_to_int(Pos.y)) - PosInBlock + vec2(16.0f, 16.0f);
//GameServer()->CreateExplosion(BlockCenter, 0, WEAPON_GRENADE, true, -1, -1LL);
*pOutPos = vec2(BlockCenter.x + (PosInBlock.x < 16 ? -2.0f : 1.0f), Pos.y); *pOutPos = vec2(BlockCenter.x + (PosInBlock.x < 16 ? -2.0f : 1.0f), Pos.y);
if (!GameServer()->Collision()->TestBox(*pOutPos, vec2(28.0f, 28.0f))) if (!GameServer()->Collision()->TestBox(*pOutPos, vec2(28.0f, 28.0f)))
@ -78,29 +77,6 @@ bool CEntity::GetNearestAirPos(vec2 Pos, vec2 ColPos, vec2* pOutPos)
if (!GameServer()->Collision()->TestBox(*pOutPos, vec2(28.0f, 28.0f))) if (!GameServer()->Collision()->TestBox(*pOutPos, vec2(28.0f, 28.0f)))
return true; return true;
/* float Size = 31.0f; // A bit less than the tile size
*pOutPos = vec2(BlockCenter.x + (PosInBlock.x < 16 ? -Size : Size), Pos.y);
if (!GameServer()->Collision()->TestBox(*pOutPos, vec2(28.0f, 28.0f)))
return true;
*pOutPos = vec2(BlockCenter.x + (PosInBlock.x < 16 ? -Size : Size), BlockCenter.y);
if (!GameServer()->Collision()->TestBox(*pOutPos, vec2(28.0f, 28.0f)))
return true;
*pOutPos = vec2(Pos.x, BlockCenter.y + (PosInBlock.y < 16 ? -Size : Size));
if (!GameServer()->Collision()->TestBox(*pOutPos, vec2(28.0f, 28.0f)))
return true;
*pOutPos = vec2(BlockCenter.x, BlockCenter.y + (PosInBlock.y < 16 ? -Size : Size));
if (!GameServer()->Collision()->TestBox(*pOutPos, vec2(28.0f, 28.0f)))
return true;
*pOutPos = vec2(BlockCenter.x + (PosInBlock.x < 16 ? -Size : Size),
BlockCenter.y + (PosInBlock.y < 16 ? -Size : Size));
if (!GameServer()->Collision()->TestBox(*pOutPos, vec2(28.0f, 28.0f)))
return true;*/
return false; return false;
} }
@ -108,7 +84,6 @@ bool CEntity::GetNearestAirPosLaser(vec2 Pos, vec2* pOutPos)
{ {
vec2 PosInBlock = vec2(round_to_int(Pos.x) % 32, round_to_int(Pos.y) % 32); vec2 PosInBlock = vec2(round_to_int(Pos.x) % 32, round_to_int(Pos.y) % 32);
vec2 BlockCenter = vec2(round_to_int(Pos.x), round_to_int(Pos.y)) - PosInBlock + vec2(16.0f, 16.0f); vec2 BlockCenter = vec2(round_to_int(Pos.x), round_to_int(Pos.y)) - PosInBlock + vec2(16.0f, 16.0f);
GameServer()->CreateExplosion(BlockCenter, 0, WEAPON_GRENADE, true, -1, -1LL);
float Size = 31.0f; // A bit less than the tile size float Size = 31.0f; // A bit less than the tile size