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

Revert "Add mapbug "stoppers-passthrough@ddnet.tw""

Browse source 
This reverts commit 25e86851d3.
This commit is contained in:
Dennis Felsing 2018-08-22 08:33:21 +02:00
parent 46bdc7af3e
commit d60b0db632
5 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/game/client/gameclient.cpp
View file

@ -612,7 +612,7 @@ static void Evolve(CNetObj_Character *pCharacter, int Tick)
{
pCharacter->m_Tick++;
TempCore.Tick(false, true);
TempCore.Move(false);
TempCore.Move();
TempCore.Quantize();
}
@ -1708,7 +1708,7 @@ void CGameClient::OnPredict()
{
if(c != m_Snap.m_LocalClientID && World.m_apCharacters[c] && IsWeaker[g_Config.m_ClDummy][c])
{
World.m_apCharacters[c]->Move(false);
World.m_apCharacters[c]->Move();
World.m_apCharacters[c]->Quantize();
}
}
@ -1716,7 +1716,7 @@ void CGameClient::OnPredict()
// Us
if(World.m_apCharacters[m_Snap.m_LocalClientID])
{
World.m_apCharacters[m_Snap.m_LocalClientID]->Move(false);
World.m_apCharacters[m_Snap.m_LocalClientID]->Move();
World.m_apCharacters[m_Snap.m_LocalClientID]->Quantize();
}
@ -1725,7 +1725,7 @@ void CGameClient::OnPredict()
{
if(c != m_Snap.m_LocalClientID && World.m_apCharacters[c] && !IsWeaker[g_Config.m_ClDummy][c])
{
World.m_apCharacters[c]->Move(false);
World.m_apCharacters[c]->Move();
World.m_apCharacters[c]->Quantize();
}
}
@ -1736,7 +1736,7 @@ void CGameClient::OnPredict()
{
if(!World.m_apCharacters[c])
continue;
World.m_apCharacters[c]->Move(false);
World.m_apCharacters[c]->Move();
World.m_apCharacters[c]->Quantize();
}
}
@ -2307,9 +2307,9 @@ void CGameClient::FindWeaker(bool IsWeaker[2][MAX_CLIENTS])
OtherChar.Tick(false, true);
LocalChar.Tick(false, true);
}
LocalChar.Move(false);
LocalChar.Move();
LocalChar.Quantize();
OtherChar.Move(false);
OtherChar.Move();
OtherChar.Quantize();
}
PredictErr[dir] = distance(OtherChar.m_Vel, OtherCharCur.m_Vel);

4
src/game/gamecore.cpp
View file

@ -497,7 +497,7 @@ void CCharacterCore::Tick(bool UseInput, bool IsClient)
m_Vel = normalize(m_Vel) * 6000;
}
void CCharacterCore::Move(bool BugStoppersPassthrough)
void CCharacterCore::Move()
{
float RampValue = VelocityRamp(length(m_Vel)*50, m_pWorld->m_Tuning[g_Config.m_ClDummy].m_VelrampStart, m_pWorld->m_Tuning[g_Config.m_ClDummy].m_VelrampRange, m_pWorld->m_Tuning[g_Config.m_ClDummy].m_VelrampCurvature);
@ -506,7 +506,7 @@ void CCharacterCore::Move(bool BugStoppersPassthrough)
vec2 NewPos = m_Pos;
vec2 OldVel = m_Vel;
m_pCollision->MoveBox(IsSwitchActiveCb, this, &NewPos, &m_Vel, vec2(28.0f, 28.0f), 0.0f, !BugStoppersPassthrough);
m_pCollision->MoveBox(IsSwitchActiveCb, this, &NewPos, &m_Vel, vec2(28.0f, 28.0f), 0.0f, true);
m_Colliding = 0;
if(m_Vel.x < 0.001 && m_Vel.x > -0.001)

2
src/game/gamecore.h
View file

@ -215,7 +215,7 @@ public:
void Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams, std::map<int, std::vector<vec2> > *pTeleOuts);
void Reset();
void Tick(bool UseInput, bool IsClient);
void Move(bool BugStoppersPassthrough);
void Move();
void Read(const CNetObj_CharacterCore *pObjCore);
void Write(CNetObj_CharacterCore *pObjCore);

1
src/game/mapbugs_list.h
View file

@ -1,4 +1,3 @@
// This file can be included several times.
MAPBUG(BUG_GRENADE_DOUBLEEXPLOSION, "grenade-doubleexplosion@ddnet.tw")
MAPBUG(BUG_STOPPERS_PASSTHROUGH, "stoppers-passthrough@ddnet.tw")

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

@ -755,7 +755,7 @@ void CCharacter::TickDefered()
m_ReckoningCore.Init(&TempWorld, GameServer()->Collision(), &((CGameControllerDDRace*)GameServer()->m_pController)->m_Teams.m_Core, &((CGameControllerDDRace*)GameServer()->m_pController)->m_TeleOuts);
m_ReckoningCore.m_Id = m_pPlayer->GetCID();
m_ReckoningCore.Tick(false, false);
m_ReckoningCore.Move(false);
m_ReckoningCore.Move();
m_ReckoningCore.Quantize();
}
@ -765,7 +765,7 @@ void CCharacter::TickDefered()
bool StuckBefore = GameServer()->Collision()->TestBox(m_Core.m_Pos, vec2(28.0f, 28.0f));
m_Core.m_Id = m_pPlayer->GetCID();
m_Core.Move(GameServer()->EmulateBug(BUG_STOPPERS_PASSTHROUGH));
m_Core.Move();
bool StuckAfterMove = GameServer()->Collision()->TestBox(m_Core.m_Pos, vec2(28.0f, 28.0f));
m_Core.Quantize();
bool StuckAfterQuant = GameServer()->Collision()->TestBox(m_Core.m_Pos, vec2(28.0f, 28.0f));