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

Changed the client icon to an icon i designed from the logos Landil made //Thanks Landil again :)

Browse source 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
This commit is contained in:
GreYFoXGTi 2010-08-30 04:37:46 +02:00
parent f3d1c123a4
commit c7b05e97a1
3 changed files with 61 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
other/icons/DDRace.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 19 KiB

2
other/icons/teeworlds.rc
View file

@ -1 +1 @@
50h ICON "teeworlds.ico"
50h ICON "DDRace.ico"

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

@ -859,6 +859,66 @@ void CCharacter::Tick()
m_Core.m_Vel.y = 0;
}
}
if(TileIndex == TILE_STOPH || TileIndexR == TILE_STOPH || TileIndexL == TILE_STOPH)
{
if(m_Core.m_Pos.x - GameServer()->Collision()->GetPos(TileIndex).x < 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex).x > (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPos.x;
m_Core.m_Vel.x = (m_Core.m_Vel.x < 0)?m_Core.m_Vel.x:0;
}
else
{
if((int)GameServer()->Collision()->GetPos(TileIndex).x < (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPos.x;
m_Core.m_Vel.x = (m_Core.m_Vel.x > 0)?m_Core.m_Vel.x:0;
}
}
if(TileFIndex == TILE_STOPH || TileFIndexR == TILE_STOPH || TileFIndexL == TILE_STOPH)
{
if(m_Core.m_Pos.x - GameServer()->Collision()->GetPos(TileFIndex).x < 0)
{
if((int)GameServer()->Collision()->GetPos(TileFIndex).x > (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPos.x;
m_Core.m_Vel.x = (m_Core.m_Vel.x < 0)?m_Core.m_Vel.x:0;
}
else
{
if((int)GameServer()->Collision()->GetPos(TileFIndex).x < (int)m_Core.m_Pos.x)
m_Core.m_Pos.x = m_PrevPos.x;
m_Core.m_Vel.x = (m_Core.m_Vel.x > 0)?m_Core.m_Vel.x:0;
}
}
if(TileIndex == TILE_STOPV || TileIndexT == TILE_STOPV || TileIndexB == TILE_STOPV)
{
if(m_Core.m_Pos.y - GameServer()->Collision()->GetPos(TileIndex).y < 0)
{
if((int)GameServer()->Collision()->GetPos(TileIndex).y > (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPos.y;
m_Core.m_Vel.y = (m_Core.m_Vel.y < 0)?m_Core.m_Vel.y:0;
}
else
{
if((int)GameServer()->Collision()->GetPos(TileIndex).x < (int)m_Core.m_Pos.x)
m_Core.m_Pos.y = m_PrevPos.y;
m_Core.m_Vel.y = (m_Core.m_Vel.y > 0)?m_Core.m_Vel.y:0;
}
}
if(TileFIndex == TILE_STOPV || TileFIndexT == TILE_STOPV || TileFIndexB == TILE_STOPV)
{
if(m_Core.m_Pos.y - GameServer()->Collision()->GetPos(TileFIndex).y < 0)
{
if((int)GameServer()->Collision()->GetPos(TileFIndex).y > (int)m_Core.m_Pos.y)
m_Core.m_Pos.y = m_PrevPos.y;
m_Core.m_Vel.y = (m_Core.m_Vel.y < 0)?m_Core.m_Vel.y:0;
}
else
{
if((int)GameServer()->Collision()->GetPos(TileFIndex).x < (int)m_Core.m_Pos.x)
m_Core.m_Pos.y = m_PrevPos.y;
m_Core.m_Vel.y = (m_Core.m_Vel.y > 0)?m_Core.m_Vel.y:0;
}
}
if (TileIndex == TILE_BOOST_L || TileFIndex == TILE_BOOST_L)
{
if(m_PrevPos.x-m_Pos.x<0)