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

Some Fixes

Browse source
This commit is contained in:
GreYFoXGTi 2010-11-14 13:14:18 +02:00
parent ca54f1d7c7
commit bb0d4a5671
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1018,9 +1018,9 @@ void CCharacter::HandleTiles(int Index)
m_Core.m_Jumped = 0; m_Core.m_Jumped = 0;
} }
// handle switch tiles // handle switch tiles
if(GameServer()->Collision()->IsSwitch(MapIndex) == TILE_SWITCHOPEN) if(GameServer()->Collision()->IsSwitch(MapIndex) == TILE_SWITCHOPEN && Team() != TEAM_SUPER)
GameServer()->Collision()->m_pSwitchers[GameServer()->Collision()->GetSWitchNumber(MapIndex)].m_Status[Team()] = true; GameServer()->Collision()->m_pSwitchers[GameServer()->Collision()->GetSWitchNumber(MapIndex)].m_Status[Team()] = true;
if(GameServer()->Collision()->IsSwitch(MapIndex) == TILE_SWITCHCLOSE) if(GameServer()->Collision()->IsSwitch(MapIndex) == TILE_SWITCHCLOSE && Team() != TEAM_SUPER)
GameServer()->Collision()->m_pSwitchers[GameServer()->Collision()->GetSWitchNumber(MapIndex)].m_Status[Team()] = false; GameServer()->Collision()->m_pSwitchers[GameServer()->Collision()->GetSWitchNumber(MapIndex)].m_Status[Team()] = false;
// handle speedup tiles // handle speedup tiles
if(GameServer()->Collision()->IsSpeedup(MapIndex) == TILE_BOOST) if(GameServer()->Collision()->IsSpeedup(MapIndex) == TILE_BOOST)
@ -1318,7 +1318,7 @@ bool CCharacter::UnFreeze()
m_ActiveWeapon = WEAPON_GUN; m_ActiveWeapon = WEAPON_GUN;
m_FreezeTime = 0; m_FreezeTime = 0;
m_FreezeTick = 0; m_FreezeTick = 0;
m_ReloadTimer = 0; if (m_ActiveWeapon==WEAPON_HAMMER) m_ReloadTimer = 0;
return true; return true;
} }
return false; return false;

2
src/game/server/entities/dragger.cpp
View file

@ -125,7 +125,7 @@ void CDragger::Snap(int SnappingClient)
CCharacter * Char = GameServer()->GetPlayerChar(SnappingClient); CCharacter * Char = GameServer()->GetPlayerChar(SnappingClient);
int Tick = (Server()->Tick()%Server()->TickSpeed())%11; int Tick = (Server()->Tick()%Server()->TickSpeed())%11;
if (Char && Char->m_Alive && !GameServer()->Collision()->m_pSwitchers[m_Number].m_Status[Char->Team()] && (!Tick)) return; if (Char && Char->m_Alive && !GameServer()->Collision()->m_pSwitchers[m_Number].m_Status[Char->Team()] && (!Tick)) return;
if(Char && Char->m_Alive && m_Target && Char->Team() != m_Target->Team()) return; if(Char && Char->m_Alive && m_Target && m_Target->m_Alive && Char->Team() != m_Target->Team()) return;
CNetObj_Laser *obj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(NETOBJTYPE_LASER, m_Id, sizeof(CNetObj_Laser))); CNetObj_Laser *obj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(NETOBJTYPE_LASER, m_Id, sizeof(CNetObj_Laser)));

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

@ -126,7 +126,7 @@ void CLaser::Snap(int SnappingClient)
if(NetworkClipped(SnappingClient)) if(NetworkClipped(SnappingClient))
return; return;
CCharacter * Char = GameServer()->GetPlayerChar(SnappingClient); CCharacter * Char = GameServer()->GetPlayerChar(SnappingClient);
if(Char && m_Owner != -1 && Char->Team() != GameServer()->GetPlayerChar(m_Owner)->Team()) return; if(Char && Char->m_Alive && m_Owner != -1 && Char->Team() != GameServer()->GetPlayerChar(m_Owner)->Team()) return;
CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(NETOBJTYPE_LASER, m_Id, sizeof(CNetObj_Laser))); CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(NETOBJTYPE_LASER, m_Id, sizeof(CNetObj_Laser)));
pObj->m_X = (int)m_Pos.x; pObj->m_X = (int)m_Pos.x;
pObj->m_Y = (int)m_Pos.y; pObj->m_Y = (int)m_Pos.y;