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

Updated GetTile for FrontLayer

Browse source 
Added dbg_msg check

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
This commit is contained in:
GreYFoXGTi 2010-08-21 19:25:10 +02:00
parent 444a35fe2c
commit 19e379afdf
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/game/collision.cpp
View file

@ -173,18 +173,23 @@ int CCollision::GetTile(int x, int y)
int nx = clamp(x/32, 0, m_Width-1); int nx = clamp(x/32, 0, m_Width-1);
int ny = clamp(y/32, 0, m_Height-1); int ny = clamp(y/32, 0, m_Height-1);
/*dbg_msg("GetTile","m_Index %d",m_pTiles[ny*m_Width+nx].m_Index);//Remove */ /*dbg_msg("GetTile","m_Index %d",m_pTiles[ny*m_Width+nx].m_Index);//Remove */
if(m_pTiles[ny*m_Width+nx].m_Index == COLFLAG_SOLID if(m_pTiles[ny*m_Width+nx].m_Index == COLFLAG_SOLID ||
|| m_pTiles[ny*m_Width+nx].m_Index == (COLFLAG_SOLID|COLFLAG_NOHOOK) m_pTiles[ny*m_Width+nx].m_Index == (COLFLAG_SOLID|COLFLAG_NOHOOK) ||
|| m_pTiles[ny*m_Width+nx].m_Index == COLFLAG_DEATH m_pTiles[ny*m_Width+nx].m_Index == COLFLAG_DEATH ||
|| m_pTiles[ny*m_Width+nx].m_Index == COLFLAG_NOLASER) m_pTiles[ny*m_Width+nx].m_Index == COLFLAG_NOLASER ||
(m_pFront && (m_pFront[ny*m_Width+nx].m_Index == COLFLAG_SOLID)) ||
(m_pFront && (m_pFront[ny*m_Width+nx].m_Index == (COLFLAG_SOLID|COLFLAG_NOHOOK))) ||
(m_pFront && (m_pFront[ny*m_Width+nx].m_Index == COLFLAG_DEATH)) ||
(m_pFront && (m_pFront[ny*m_Width+nx].m_Index == COLFLAG_NOLASER)))
return m_pTiles[ny*m_Width+nx].m_Index; return m_pTiles[ny*m_Width+nx].m_Index;
else else
return 0; return 0;
} }
int CCollision::Entity(int x, int y, bool Front) int CCollision::Entity(int x, int y, bool Front)
{ {
//if(0 < x || x >= m_Width) return 0; if(0 < x || x >= m_Width) return 0;
//if(0 < y || y >= m_Height) return 0; if(0 < y || y >= m_Height) return 0;
int Index = Front?m_pFront[y*m_Width+x].m_Index:m_pTiles[y*m_Width+x].m_Index; int Index = Front?m_pFront[y*m_Width+x].m_Index:m_pTiles[y*m_Width+x].m_Index;
return Index-ENTITY_OFFSET; return Index-ENTITY_OFFSET;
} }
@ -271,7 +276,7 @@ int CCollision::IntersectNoLaser(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2
{ {
float a = f/d; float a = f/d;
vec2 Pos = mix(Pos0, Pos1, a); vec2 Pos = mix(Pos0, Pos1, a);
if(IsSolid(round(Pos.x), round(Pos.y)) || IsNoLaser(round(Pos.x), round(Pos.y))) if(CheckPoint(Pos.x, Pos.y) || IsNoLaser(round(Pos.x), round(Pos.y)))
{ {
if(pOutCollision) if(pOutCollision)
*pOutCollision = Pos; *pOutCollision = Pos;

4
src/game/server/gamecontroller.cpp
View file

@ -121,12 +121,16 @@ bool IGameController::OnEntity(int Index, vec2 Pos, bool Front)
{ {
if (Index<0) if (Index<0)
return false; return false;
int temp1=Pos.x;
int temp2=Pos.y;
dbg_msg("OnEntity","Index=%d Front=%d",Index,Front);//Remove*/ dbg_msg("OnEntity","Index=%d Front=%d",Index,Front);//Remove*/
int Type = -1; int Type = -1;
int SubType = 0; int SubType = 0;
int x,y; int x,y;
x=(Pos.x-16.0f)/32.0f; x=(Pos.x-16.0f)/32.0f;
y=(Pos.y-16.0f)/32.0f; y=(Pos.y-16.0f)/32.0f;
dbg_msg("OnEntity","Pos %d %d, x%d y%d",temp1,temp2,x,y);//Remove*/
/*dbg_msg("OnEntity","Pos(%d,%d)",x,y);//Remove*/ /*dbg_msg("OnEntity","Pos(%d,%d)",x,y);//Remove*/
int sides[8]; int sides[8];
sides[0]=GameServer()->Collision()->Entity(x,y+1, Front); sides[0]=GameServer()->Collision()->Entity(x,y+1, Front);