mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-14 12:08:20 +00:00
a69dc599a9
Fix pointer and pointer array variable naming
Huge renaming to match our rules
Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[
(?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[
Further format static variables
Format almost all pointer names accordingly
Used regex: (?!(return)\b)\b\w+
\*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p]
clang-format
Fix CI fail
Fix misnamed non pointer as pointer and non array as array
Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b
(?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[]
clang-format
Revert to SCREAMING_SNAKE_CASE and reinstate dead code
94 lines
2.9 KiB
C++
94 lines
2.9 KiB
C++
/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
|
|
#include "door.h"
|
|
#include "character.h"
|
|
|
|
#include <game/generated/protocol.h>
|
|
#include <game/mapitems.h>
|
|
#include <game/teamscore.h>
|
|
#include <game/version.h>
|
|
|
|
#include <game/server/gamecontext.h>
|
|
#include <game/server/player.h>
|
|
|
|
CDoor::CDoor(CGameWorld *pGameWorld, vec2 Pos, float Rotation, int Length,
|
|
int Number) :
|
|
CEntity(pGameWorld, CGameWorld::ENTTYPE_LASER)
|
|
{
|
|
m_Number = Number;
|
|
m_Pos = Pos;
|
|
m_Length = Length;
|
|
m_Direction = vec2(sin(Rotation), cos(Rotation));
|
|
vec2 To = Pos + normalize(m_Direction) * m_Length;
|
|
|
|
GameServer()->Collision()->IntersectNoLaser(Pos, To, &this->m_To, 0);
|
|
ResetCollision();
|
|
GameWorld()->InsertEntity(this);
|
|
}
|
|
|
|
void CDoor::ResetCollision()
|
|
{
|
|
for(int i = 0; i < m_Length - 1; i++)
|
|
{
|
|
vec2 CurrentPos(m_Pos.x + (m_Direction.x * i),
|
|
m_Pos.y + (m_Direction.y * i));
|
|
if(GameServer()->Collision()->CheckPoint(CurrentPos) || GameServer()->Collision()->GetTile(m_Pos.x, m_Pos.y) || GameServer()->Collision()->GetFTile(m_Pos.x, m_Pos.y))
|
|
break;
|
|
else
|
|
GameServer()->Collision()->SetDCollisionAt(
|
|
m_Pos.x + (m_Direction.x * i),
|
|
m_Pos.y + (m_Direction.y * i), TILE_STOPA, 0 /*Flags*/,
|
|
m_Number);
|
|
}
|
|
}
|
|
|
|
void CDoor::Snap(int SnappingClient)
|
|
{
|
|
if(NetworkClipped(SnappingClient, m_Pos) && NetworkClipped(SnappingClient, m_To))
|
|
return;
|
|
|
|
CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(
|
|
NETOBJTYPE_LASER, GetID(), sizeof(CNetObj_Laser)));
|
|
|
|
if(!pObj)
|
|
return;
|
|
|
|
pObj->m_X = (int)m_Pos.x;
|
|
pObj->m_Y = (int)m_Pos.y;
|
|
|
|
int SnappingClientVersion = SnappingClient != SERVER_DEMO_CLIENT ? GameServer()->GetClientVersion(SnappingClient) : CLIENT_VERSIONNR;
|
|
|
|
CNetObj_EntityEx *pEntData = 0;
|
|
if(SnappingClientVersion >= VERSION_DDNET_SWITCH)
|
|
pEntData = static_cast<CNetObj_EntityEx *>(Server()->SnapNewItem(NETOBJTYPE_ENTITYEX, GetID(), sizeof(CNetObj_EntityEx)));
|
|
|
|
if(pEntData)
|
|
{
|
|
pEntData->m_SwitchNumber = m_Number;
|
|
pEntData->m_Layer = m_Layer;
|
|
pEntData->m_EntityClass = ENTITYCLASS_DOOR;
|
|
|
|
pObj->m_FromX = (int)m_To.x;
|
|
pObj->m_FromY = (int)m_To.y;
|
|
pObj->m_StartTick = 0;
|
|
}
|
|
else
|
|
{
|
|
CCharacter *pChr = GameServer()->GetPlayerChar(SnappingClient);
|
|
|
|
if(SnappingClient != SERVER_DEMO_CLIENT && (GameServer()->m_apPlayers[SnappingClient]->GetTeam() == TEAM_SPECTATORS || GameServer()->m_apPlayers[SnappingClient]->IsPaused()) && GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID != SPEC_FREEVIEW)
|
|
pChr = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
|
|
|
|
if(pChr && pChr->Team() != TEAM_SUPER && pChr->IsAlive() && !Switchers().empty() && Switchers()[m_Number].m_aStatus[pChr->Team()])
|
|
{
|
|
pObj->m_FromX = (int)m_To.x;
|
|
pObj->m_FromY = (int)m_To.y;
|
|
}
|
|
else
|
|
{
|
|
pObj->m_FromX = (int)m_Pos.x;
|
|
pObj->m_FromY = (int)m_Pos.y;
|
|
}
|
|
pObj->m_StartTick = Server()->Tick();
|
|
}
|
|
}
|