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

tele-activator: make delay be able to specify a weapon

Browse source
This commit is contained in:
Ryozuki 2018-10-26 17:05:21 +02:00
parent ddf2e6af36
commit 3d202883c9
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/server/entities/laser.cpp
View file

@ -200,6 +200,15 @@ void CLaser::DoBounce()
int TileFIndex = GameServer()->Collision()->GetFTileIndex(MapIndex);
bool IsSwitchTeleGun = GameServer()->Collision()->IsSwitch(MapIndex) == TILE_ALLOW_TELE_GUN;
if(IsSwitchTeleGun) {
// Delay specifies which weapon the tile should work for.
// Delay = 0 means all.
int delay = GameServer()->Collision()->GetSwitchDelay(MapIndex);
if((delay != 3 && delay != 0) && m_Type == WEAPON_RIFLE)
IsSwitchTeleGun = false;
}
// Teleport is canceled if the last bounce tile is not a TILE_ALLOW_TELE_GUN.
// Teleport also works if laser didn't bounce.
m_TeleportCancelled =

13
src/game/server/entities/projectile.cpp
View file

@ -179,6 +179,19 @@ void CProjectile::Tick()
int TileFIndex = GameServer()->Collision()->GetFTileIndex(MapIndex);
bool IsSwitchTeleGun = GameServer()->Collision()->IsSwitch(MapIndex) == TILE_ALLOW_TELE_GUN;
if(IsSwitchTeleGun) {
// Delay specifies which weapon the tile should work for.
// Delay = 0 means all.
int delay = GameServer()->Collision()->GetSwitchDelay(MapIndex);
if(delay == 1 && m_Type != WEAPON_GUN)
IsSwitchTeleGun = false;
if(delay == 2 && m_Type != WEAPON_GRENADE)
IsSwitchTeleGun = false;
if(delay == 3 && m_Type != WEAPON_RIFLE)
IsSwitchTeleGun = false;
}
if (TileIndex == TILE_ALLOW_TELE_GUN
|| TileFIndex == TILE_ALLOW_TELE_GUN
|| IsSwitchTeleGun