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

added Tunelayer function to return the tunetilenumber and merged Tunelayer into CCollision

Browse source
This commit is contained in:
HMH 2014-03-12 23:12:50 +01:00 committed by def
parent b869a67c76
commit ae12a2b04d
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/game/collision.cpp
View file

@ -27,6 +27,7 @@ CCollision::CCollision()
m_pSwitch = 0; m_pSwitch = 0;
m_pDoor = 0; m_pDoor = 0;
m_pSwitchers = 0; m_pSwitchers = 0;
m_pTune = 0;
} }
void CCollision::Init(class CLayers *pLayers) void CCollision::Init(class CLayers *pLayers)
@ -68,6 +69,13 @@ void CCollision::Init(class CLayers *pLayers)
m_pSwitchers = 0; m_pSwitchers = 0;
} }
if(m_pLayers->TuneLayer())
{
unsigned int Size = m_pLayers->Map()->GetUncompressedDataSize(m_pLayers->TuneLayer()->m_Tune);
if (Size >= m_Width*m_Height*sizeof(CTuneTile))
m_pTune = static_cast<CTuneTile *>(m_pLayers->Map()->GetData(m_pLayers->TuneLayer()->m_Tune));
}
if(m_pLayers->FrontLayer()) if(m_pLayers->FrontLayer())
{ {
unsigned int Size = m_pLayers->Map()->GetUncompressedDataSize(m_pLayers->FrontLayer()->m_Front); unsigned int Size = m_pLayers->Map()->GetUncompressedDataSize(m_pLayers->FrontLayer()->m_Front);
@ -455,6 +463,7 @@ void CCollision::Dest()
m_pSpeedup = 0; m_pSpeedup = 0;
m_pFront = 0; m_pFront = 0;
m_pSwitch = 0; m_pSwitch = 0;
m_pTune = 0;
m_pDoor = 0; m_pDoor = 0;
m_pSwitchers = 0; m_pSwitchers = 0;
} }
@ -587,6 +596,17 @@ int CCollision::IsSpeedup(int Index)
return 0; return 0;
} }
int CCollision::IsTune(int Index)
{
if(Index < 0 || !m_pTune)
return -1;
if(m_pTune[Index].m_Type)
return m_pTune[Index].m_Number;
return -1;
}
void CCollision::GetSpeedup(int Index, vec2 *Dir, int *Force, int *MaxSpeed) void CCollision::GetSpeedup(int Index, vec2 *Dir, int *Force, int *MaxSpeed)
{ {
if(Index < 0 || !m_pSpeedup) if(Index < 0 || !m_pSpeedup)
@ -705,6 +725,8 @@ bool CCollision::TileExists(int Index)
return true; return true;
if(m_pSwitch && m_pSwitch[Index].m_Type) if(m_pSwitch && m_pSwitch[Index].m_Type)
return true; return true;
if(m_pTune && m_pTune[Index].m_Type)
return true;
return TileExistsNext(Index); return TileExistsNext(Index);
} }
@ -953,6 +975,9 @@ int CCollision::Entity(int x, int y, int Layer)
case LAYER_SPEEDUP: case LAYER_SPEEDUP:
str_format(aBuf,sizeof(aBuf), "Speedup"); str_format(aBuf,sizeof(aBuf), "Speedup");
break; break;
case LAYER_TUNE:
str_format(aBuf,sizeof(aBuf), "Tune");
break;
default: default:
str_format(aBuf,sizeof(aBuf), "Unknown"); str_format(aBuf,sizeof(aBuf), "Unknown");
} }
@ -971,6 +996,8 @@ int CCollision::Entity(int x, int y, int Layer)
return m_pTele[y*m_Width+x].m_Type - ENTITY_OFFSET; return m_pTele[y*m_Width+x].m_Type - ENTITY_OFFSET;
case LAYER_SPEEDUP: case LAYER_SPEEDUP:
return m_pSpeedup[y*m_Width+x].m_Type - ENTITY_OFFSET; return m_pSpeedup[y*m_Width+x].m_Type - ENTITY_OFFSET;
case LAYER_TUNE:
return m_pTune[y*m_Width+x].m_Type - ENTITY_OFFSET;
default: default:
return 0; return 0;
break; break;

3
src/game/collision.h
View file

@ -84,6 +84,7 @@ public:
int IsTCheckpoint(int Index); int IsTCheckpoint(int Index);
//int IsCheckpoint(int Index); //int IsCheckpoint(int Index);
int IsSpeedup(int Index); int IsSpeedup(int Index);
int IsTune(int Index);
void GetSpeedup(int Index, vec2 *Dir, int *Force, int *MaxSpeed); void GetSpeedup(int Index, vec2 *Dir, int *Force, int *MaxSpeed);
int IsSwitch(int Index); int IsSwitch(int Index);
int GetSwitchNumber(int Index); int GetSwitchNumber(int Index);
@ -103,6 +104,7 @@ public:
class CTeleTile *TeleLayer() { return m_pTele; } class CTeleTile *TeleLayer() { return m_pTele; }
class CSwitchTile *SwitchLayer() { return m_pSwitch; } class CSwitchTile *SwitchLayer() { return m_pSwitch; }
class CTuneTile *TuneLayer() { return m_pTune; }
class CLayers *Layers() { return m_pLayers; } class CLayers *Layers() { return m_pLayers; }
int m_NumSwitchers; int m_NumSwitchers;
@ -112,6 +114,7 @@ private:
class CSpeedupTile *m_pSpeedup; class CSpeedupTile *m_pSpeedup;
class CTile *m_pFront; class CTile *m_pFront;
class CSwitchTile *m_pSwitch; class CSwitchTile *m_pSwitch;
class CTuneTile *m_pTune;
class CDoorTile *m_pDoor; class CDoorTile *m_pDoor;
struct SSwitchers struct SSwitchers
{ {