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

Removed Tiles that wouldn't work correctly

Browse source
This commit is contained in:
GreYFoXGTi 2010-08-22 01:15:20 +02:00
parent 2cdd2d4421
commit dc7d3f8275
5 changed files with 2 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/editor/entities.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 332 KiB

After

Width:  |  Height:  |  Size: 283 KiB

4
src/game/collision.cpp
View file

@ -60,7 +60,7 @@ void CCollision::Init(class CLayers *pLayers)
}
// DDRace tiles
if(Index >= 5 && Index <= 59 || Index>=TILE_STOPH && Index<=191)
if(Index >= 5 && Index<=191)
m_pFront[i].m_Index = Index;
}
}
@ -90,7 +90,7 @@ void CCollision::Init(class CLayers *pLayers)
}
// DDRace tiles
if(Index >= 5 && Index <= 59 || Index>=TILE_STOPH && Index<=191)
if(Index >= 5 && Index<=191)
m_pTiles[i].m_Index = Index;
}
}

9
src/game/mapitems.h
View file

@ -101,12 +101,6 @@ enum
TILE_THROUGHS,
TILE_FREEZE=9,
TILE_UNFREEZE=11,
TILE_BOOSTH,
TILE_BOOSTV,
TILE_BOOSTA,
TILE_BOOSTH2,
TILE_BOOSTV2,
TILE_BOOSTA2,
TILE_BOOST_L,
TILE_BOOST_R,
TILE_BOOST_D,
@ -124,9 +118,6 @@ enum
TILE_STOPT,
TILE_BEGIN,
TILE_END,
TILE_STOPH=60,
TILE_STOPV,
TILE_STOPA,
TILE_CP_D=64,
TILE_CP_U,
TILE_CP_R,

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

@ -734,128 +734,6 @@ void CCharacter::Tick()
m_Core.m_Vel.y = 0;
}
}
/*if(TileIndex1 == TILE_STOPH)// Itries and failed
{
if(m_Core.m_Vel.x > 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex1).x < (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPrevPos.x;
m_Core.m_Vel.x = 0;
}
if(m_Core.m_Vel.x < 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex1).x > (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPrevPos.x;
m_Core.m_Vel.x = 0;
}
}
if(TileIndex2 == TILE_STOPH)
{
if(m_Core.m_Vel.x > 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex2).x < (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPrevPos.x;
m_Core.m_Vel.x = 0;
}
if(m_Core.m_Vel.x < 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex2).x > (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPrevPos.x;
m_Core.m_Vel.x = 0;
}
}
if(TileIndex1 == TILE_STOPV)
{
if(m_Core.m_Vel.y < 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex1).y > (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPrevPos.y;
m_Core.m_Vel.y = 0;
}
if(m_Core.m_Vel.y > 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex1).y < (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPrevPos.y;
if(m_Jumped&3 && m_Core.m_Jumped != m_Jumped) // check double jump
m_Core.m_Jumped = m_Jumped;
m_Core.m_Vel.y = 0;
}
}
if(TileIndex2 == TILE_STOPV)
{
if(m_Core.m_Vel.y < 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex2).y > (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPrevPos.y;
m_Core.m_Vel.y = 0;
}
if(m_Core.m_Vel.y > 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex2).y < (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPrevPos.y;
if(m_Jumped&3 && m_Core.m_Jumped != m_Jumped) // check double jump
m_Core.m_Jumped = m_Jumped;
m_Core.m_Vel.y = 0;
}
}
if(TileIndex1 == TILE_STOPA)
{
if(m_Core.m_Vel.x > 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex1).x < (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPrevPos.x;
m_Core.m_Vel.x = 0;
}
if(m_Core.m_Vel.x < 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex1).x > (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPrevPos.x;
m_Core.m_Vel.x = 0;
}
if(m_Core.m_Vel.y < 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex1).y > (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPrevPos.y;
m_Core.m_Vel.y = 0;
}
if(m_Core.m_Vel.y > 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex1).y < (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPrevPos.y;
if(m_Jumped&3 && m_Core.m_Jumped != m_Jumped) // check double jump
m_Core.m_Jumped = m_Jumped;
m_Core.m_Vel.y = 0;
}
}
if(TileIndex2 == TILE_STOPA)
{
if(m_Core.m_Vel.x > 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex2).x < (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPrevPos.x;
m_Core.m_Vel.x = 0;
}
if(m_Core.m_Vel.x < 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex2).x > (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPrevPos.x;
m_Core.m_Vel.x = 0;
}
if(m_Core.m_Vel.y < 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex2).y > (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPrevPos.y;
m_Core.m_Vel.y = 0;
}
if(m_Core.m_Vel.y > 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex2).y < (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPrevPos.y;
if(m_Jumped&3 && m_Core.m_Jumped != m_Jumped) // check double jump
m_Core.m_Jumped = m_Jumped;
m_Core.m_Vel.y = 0;
}
}*/
if (TileIndex1 == TILE_BOOST_L || TileIndex2 == TILE_BOOST_L)
{
if(m_PrevPos.x-m_Pos.x<0)
@ -884,19 +762,6 @@ void CCharacter::Tick()
else
m_Core.m_Vel.y += m_Core.m_Vel.y*0.5;
}
if(TileIndex1 == TILE_BOOSTH || TileIndex2 == TILE_BOOSTH)
{
m_Core.m_Vel.x += m_Core.m_Vel.x *-0.5;
}
if(TileIndex1 == TILE_BOOSTV || TileIndex2 == TILE_BOOSTV)
{
m_Core.m_Vel.y += m_Core.m_Vel.y *-0.5;
}
if(TileIndex1 == TILE_BOOSTA || TileIndex2 == TILE_BOOSTA)
{
m_Core.m_Vel.y += m_Core.m_Vel.y *-0.5;
m_Core.m_Vel.x += m_Core.m_Vel.x *-0.5;
}
if (TileIndex1 == TILE_BOOST_L2 || TileIndex2 == TILE_BOOST_L2)
{
if(m_PrevPos.x-m_Pos.x<0)
@ -925,35 +790,6 @@ void CCharacter::Tick()
else
m_Core.m_Vel.y += m_Core.m_Vel.y*1.1;
}
if(TileIndex1 == TILE_BOOSTH2 || TileIndex2 == TILE_BOOSTH2)
{
if(m_PrevPos.x-m_Pos.x>0)
m_Core.m_Pos.x = m_PrevPrevPos.x;
else if(m_PrevPos.x-m_Pos.x<0)
m_Core.m_Pos.x = m_PrevPrevPos.x;
m_Core.m_Vel.x = m_Core.m_Vel.x *-1.1;
}
if(TileIndex1 == TILE_BOOSTV2 || TileIndex2 == TILE_BOOSTV2)
{
if(m_PrevPos.y-m_Pos.y>0)
m_Core.m_Pos.y = m_PrevPrevPos.y;
else if(m_PrevPos.y-m_Pos.y<0)
m_Core.m_Pos.y = m_PrevPrevPos.y;
m_Core.m_Vel.y = m_Core.m_Vel.y *-1.1;
}
if(TileIndex1 == TILE_BOOSTA2 || TileIndex2 == TILE_BOOSTA2)
{
if(m_PrevPos.y-m_Pos.y>0)
m_Core.m_Pos.y = m_PrevPrevPos.y;
else if(m_PrevPos.y-m_Pos.y<0)
m_Core.m_Pos.y = m_PrevPos.y;
if(m_PrevPos.x-m_Pos.x>0)
m_Core.m_Pos.x = m_PrevPrevPos.x;
else if(m_PrevPos.x-m_Pos.x<0)
m_Core.m_Pos.x = m_PrevPrevPos.x;
m_Core.m_Vel.y = m_Core.m_Vel.y *-1.1;
m_Core.m_Vel.x = m_Core.m_Vel.x *-1.1;
}
if(GameServer()->Collision()->IsSpeedup((int)m_Core.m_Pos.x, (int)m_Core.m_Pos.y))
{
vec2 Direction;
@ -1005,7 +841,6 @@ void CCharacter::Tick()
m_OlderPos = m_OldPos;
m_OldPos = m_Core.m_Pos;
}
m_PrevPrevPos = m_PrevPos;
m_PrevPos = m_Core.m_Pos;
return;
}

1
src/game/server/entities/character.h
View file

@ -163,7 +163,6 @@ public:
int m_LastSpeedup;
vec2 m_PrevPos;
vec2 m_PrevPrevPos;
// checkpoints
int m_CpTick;