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

Made Necessary Changes to IsTeleport for it to to Benefit from GetMapIndex loops to avoid goig through at high speeds

Browse source
This commit is contained in:
GreYFoXGTi 2010-09-22 15:03:59 +03:00
parent 51d6670ad9
commit d7f5d85362
3 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/game/collision.cpp
View file

@ -509,43 +509,27 @@ int CCollision::IsFNoLaser(int x, int y)
return (CCollision::GetFTile(x,y) & COLFLAG_NOLASER);
}
int CCollision::IsTeleport(int x, int y)
int CCollision::IsTeleport(int Index)
{
if(!m_pTele)
return 0;
int nx = clamp(x/32, 0, m_pLayers->TeleLayer()->m_Width-1);
int ny = clamp(y/32, 0, m_pLayers->TeleLayer()->m_Height-1);
/*int z = m_pTiles[ny*m_Width+nx].m_Index-1;
if(z > 34 && z <= 34 + 50 && z&1)
return z;
return 0;*/
int Tele = 0;
if(m_pTele[ny*m_pLayers->TeleLayer()->m_Width+nx].m_Type == TILE_TELEIN)
Tele = m_pTele[ny*m_pLayers->TeleLayer()->m_Width+nx].m_Number;
if(m_pTele[Index].m_Type == TILE_TELEIN)
Tele = m_pTele[Index].m_Number;
return Tele;
}
int CCollision::IsEvilTeleport(int x, int y)
int CCollision::IsEvilTeleport(int Index)
{
if(!m_pTele)
return 0;
int nx = clamp(x/32, 0, m_pLayers->TeleLayer()->m_Width-1);
int ny = clamp(y/32, 0, m_pLayers->TeleLayer()->m_Height-1);
/*int z = m_pTiles[ny*m_Width+nx].m_Index-1;
if(z > 34 && z <= 34 + 50 && z&1)
return z;
return 0;*/
int Tele = 0;
if(m_pTele[ny*m_pLayers->TeleLayer()->m_Width+nx].m_Type == TILE_TELEINEVIL)
if(m_pTele[Index].m_Type == TILE_TELEINEVIL)
{
Tele = m_pTele[ny*m_pLayers->TeleLayer()->m_Width+nx].m_Number;
Tele = m_pTele[Index].m_Number;
dbg_msg("IsEvilTele","%d",Tele);
}
return Tele;

4
src/game/collision.h
View file

@ -47,8 +47,8 @@ public:
vec2 GetPos(int Index);
int GetCollisionDDRace(int Index);
int GetFCollisionDDRace(int Index);
int IsTeleport(int x, int y);
int IsEvilTeleport(int x, int y);
int IsTeleport(int Index);
int IsEvilTeleport(int Index);
//int IsCheckpoint(int Index);
int IsSpeedup(int x, int y);
void GetSpeedup(int x, int y, vec2 *Dir, int *Force);

19
src/game/server/entities/character.cpp
View file

@ -831,30 +831,39 @@ void CCharacter::Tick()
{
if((int)GameServer()->Collision()->GetPos(MapIndex).x)
if((int)GameServer()->Collision()->GetPos(MapIndex).x < (int)m_Core.m_Pos.x)
{
m_Core.m_Pos.x = m_PrevPos.x;
//dbg_msg("Resetting","%d",Server()->Tick());
}
m_Core.m_Vel.x = 0;
}
if((m_TileIndexR == TILE_STOPA || m_TileFIndexR == TILE_STOPA || m_TileIndex == TILE_STOPR || m_TileIndexR == TILE_STOPR || m_TileFIndex == TILE_STOPR || m_TileFIndexR == TILE_STOPR || m_TileIndexR == TILE_STOPH || m_TileFIndexR == TILE_STOPH) && m_Core.m_Vel.x < 0)
{
if((int)GameServer()->Collision()->GetPos(MapIndex).x)
if((int)GameServer()->Collision()->GetPos(MapIndex).x > (int)m_Core.m_Pos.x)
{
m_Core.m_Pos.x = m_PrevPos.x;
//dbg_msg("Resetting","%d",Server()->Tick());
}
m_Core.m_Vel.x = 0;
}
if((m_TileIndexB == TILE_STOPA || m_TileFIndexB == TILE_STOPA || m_TileIndex == TILE_STOPB || m_TileIndexB == TILE_STOPB || m_TileFIndex == TILE_STOPB || m_TileFIndexB == TILE_STOPB|| m_TileIndexB == TILE_STOPV || m_TileFIndexB == TILE_STOPV) && m_Core.m_Vel.y < 0)
{
if((int)GameServer()->Collision()->GetPos(MapIndex).y)
if((int)GameServer()->Collision()->GetPos(MapIndex).y > (int)m_Core.m_Pos.y)
{
m_Core.m_Pos.y = m_PrevPos.y;
//dbg_msg("Resetting","%d",Server()->Tick());
}
m_Core.m_Vel.y = 0;
}
if((m_TileIndexT == TILE_STOPA || m_TileFIndexT == TILE_STOPA || m_TileIndex == TILE_STOPT || m_TileIndexT == TILE_STOPT || m_TileFIndex == TILE_STOPT || m_TileFIndexT == TILE_STOPT || m_TileIndexT == TILE_STOPV || m_TileFIndexT == TILE_STOPV) && m_Core.m_Vel.y > 0)
{
//dbg_msg("","%f %f",GameServer()->Collision()->GetPos(MapIndex).y,m_Core.m_Pos.y);
dbg_msg("","%f %f",GameServer()->Collision()->GetPos(MapIndex).y,m_Core.m_Pos.y);
if((int)GameServer()->Collision()->GetPos(MapIndex).y)
if((int)GameServer()->Collision()->GetPos(MapIndex).y < (int)m_Core.m_Pos.y)
{
//dbg_msg("Resetting","");
//dbg_msg("Resetting","%d",Server()->Tick());
m_Core.m_Pos.y = m_PrevPos.y;
}
m_Core.m_Vel.y = 0;
@ -938,7 +947,7 @@ void CCharacter::Tick()
dbg_msg("Direction","%f %f %f %f %f %f",Direction.x,Direction.y,(Direction*Force).x,(Direction*Force).y,m_Core.m_Vel.x,m_Core.m_Vel.y);
}
m_LastBooster = MapIndex;
int z = GameServer()->Collision()->IsTeleport(m_Pos.x, m_Pos.y);
int z = GameServer()->Collision()->IsTeleport(MapIndex);
if(z)
{
m_Core.m_HookedPlayer = -1;
@ -948,7 +957,7 @@ void CCharacter::Tick()
m_Core.m_Pos = ((CGameControllerDDRace*)GameServer()->m_pController)->m_pTeleporter[z-1];
m_Core.m_HookPos = m_Core.m_Pos;
}
int evilz = GameServer()->Collision()->IsEvilTeleport(m_Pos.x, m_Pos.y);
int evilz = GameServer()->Collision()->IsEvilTeleport(MapIndex);
if(evilz && !m_Super)
{
m_Core.m_HookedPlayer = -1;
@ -978,7 +987,7 @@ void CCharacter::Tick()
if((int)m_Pos.x/32 < -200 || (int)m_Pos.x/32 > GameServer()->Collision()->GetWidth()+200 ||
(int)m_Pos.y/32 < -200 || (int)m_Pos.y/32 > GameServer()->Collision()->GetHeight()+200)
{
Die(m_pPlayer->GetCID(), WEAPON_WORLD);
;//Die(m_pPlayer->GetCID(), WEAPON_WORLD);
}
// handle Weapons