mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 01:58:19 +00:00
Add UNLOCK_TEAM tile (someone draw a tile please)
This commit is contained in:
parent
e39829ef7c
commit
ce7eb0aac1
Binary file not shown.
Before Width: | Height: | Size: 288 KiB After Width: | Height: | Size: 288 KiB |
Binary file not shown.
Before Width: | Height: | Size: 293 KiB After Width: | Height: | Size: 293 KiB |
Binary file not shown.
Before Width: | Height: | Size: 277 KiB After Width: | Height: | Size: 276 KiB |
|
@ -131,7 +131,7 @@ void CCollision::Init(class CLayers *pLayers)
|
||||||
}
|
}
|
||||||
|
|
||||||
// DDRace tiles
|
// DDRace tiles
|
||||||
if(Index == TILE_THROUGH || Index == TILE_FREEZE || (Index >= TILE_UNFREEZE && Index <= TILE_DUNFREEZE) || (Index >= TILE_WALLJUMP && Index <= TILE_SOLO_END) || (Index >= TILE_REFILL_JUMPS && Index <= TILE_STOPA) || Index == TILE_CP || Index == TILE_CP_F || (Index >= TILE_OLDLASER && Index <= TILE_NPH) || (Index >= TILE_NPC_END && Index <= TILE_NPH_END) || (Index >= TILE_NPC_START && Index <= TILE_NPH_START))
|
if(Index == TILE_THROUGH || Index == TILE_FREEZE || (Index >= TILE_UNFREEZE && Index <= TILE_DUNFREEZE) || (Index >= TILE_WALLJUMP && Index <= TILE_SOLO_END) || (Index >= TILE_REFILL_JUMPS && Index <= TILE_STOPA) || Index == TILE_CP || Index == TILE_CP_F || (Index >= TILE_OLDLASER && Index <= TILE_UNLOCK_TEAM) || (Index >= TILE_NPC_END && Index <= TILE_NPH_END) || (Index >= TILE_NPC_START && Index <= TILE_NPH_START))
|
||||||
m_pFront[i].m_Index = Index;
|
m_pFront[i].m_Index = Index;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -157,7 +157,7 @@ void CCollision::Init(class CLayers *pLayers)
|
||||||
}
|
}
|
||||||
|
|
||||||
// DDRace tiles
|
// DDRace tiles
|
||||||
if(Index == TILE_THROUGH || Index == TILE_FREEZE || (Index >= TILE_UNFREEZE && Index <= TILE_DUNFREEZE) || (Index >= TILE_WALLJUMP && Index <= TILE_SOLO_END) || (Index >= TILE_REFILL_JUMPS && Index <= TILE_STOPA) || Index == TILE_CP || Index == TILE_CP_F || (Index >= TILE_OLDLASER && Index <= TILE_NPH) || (Index >= TILE_NPC_END && Index <= TILE_NPH_END) || (Index >= TILE_NPC_START && Index <= TILE_NPH_START))
|
if(Index == TILE_THROUGH || Index == TILE_FREEZE || (Index >= TILE_UNFREEZE && Index <= TILE_DUNFREEZE) || (Index >= TILE_WALLJUMP && Index <= TILE_SOLO_END) || (Index >= TILE_REFILL_JUMPS && Index <= TILE_STOPA) || Index == TILE_CP || Index == TILE_CP_F || (Index >= TILE_OLDLASER && Index <= TILE_UNLOCK_TEAM) || (Index >= TILE_NPC_END && Index <= TILE_NPH_END) || (Index >= TILE_NPC_START && Index <= TILE_NPH_START))
|
||||||
m_pTiles[i].m_Index = Index;
|
m_pTiles[i].m_Index = Index;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -139,6 +139,7 @@ enum
|
||||||
TILE_EHOOK,
|
TILE_EHOOK,
|
||||||
TILE_NOHIT,
|
TILE_NOHIT,
|
||||||
TILE_NPH,
|
TILE_NPH,
|
||||||
|
TILE_UNLOCK_TEAM,
|
||||||
TILE_PENALTY = 79,
|
TILE_PENALTY = 79,
|
||||||
TILE_NPC_END = 88,
|
TILE_NPC_END = 88,
|
||||||
TILE_SUPER_END,
|
TILE_SUPER_END,
|
||||||
|
|
|
@ -1599,6 +1599,12 @@ void CCharacter::HandleTiles(int Index)
|
||||||
m_Jetpack = false;
|
m_Jetpack = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// unlock team
|
||||||
|
else if((m_TileIndex == TILE_UNLOCK_TEAM) || (m_TileFIndex == TILE_UNLOCK_TEAM))
|
||||||
|
{
|
||||||
|
Teams()->SetTeamLock(Team(), false);
|
||||||
|
}
|
||||||
|
|
||||||
// solo part
|
// solo part
|
||||||
if(((m_TileIndex == TILE_SOLO_START) || (m_TileFIndex == TILE_SOLO_START)) && !Teams()->m_Core.GetSolo(m_pPlayer->GetCID()))
|
if(((m_TileIndex == TILE_SOLO_START) || (m_TileFIndex == TILE_SOLO_START)) && !Teams()->m_Core.GetSolo(m_pPlayer->GetCID()))
|
||||||
{
|
{
|
||||||
|
|
|
@ -645,6 +645,7 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
|
||||||
|
|
||||||
void CGameTeams::SetTeamLock(int Team, bool Lock)
|
void CGameTeams::SetTeamLock(int Team, bool Lock)
|
||||||
{
|
{
|
||||||
|
if(Team > TEAM_FLOCK && Team < TEAM_SUPER)
|
||||||
m_TeamLocked[Team] = Lock;
|
m_TeamLocked[Team] = Lock;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue