mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-13 03:28:19 +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
73 lines
2.1 KiB
C++
73 lines
2.1 KiB
C++
/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
|
|
/* If you are missing that file, acquire a complete release at teeworlds.com. */
|
|
#include "editor.h"
|
|
|
|
CLayerGame::CLayerGame(int w, int h) :
|
|
CLayerTiles(w, h)
|
|
{
|
|
str_copy(m_aName, "Game", sizeof(m_aName));
|
|
m_Game = 1;
|
|
}
|
|
|
|
CLayerGame::~CLayerGame() = default;
|
|
|
|
CTile CLayerGame::GetTile(int x, int y)
|
|
{
|
|
if(m_pEditor->m_Map.m_pFrontLayer && m_pEditor->m_Map.m_pFrontLayer->GetTile(x, y).m_Index == TILE_THROUGH_CUT)
|
|
{
|
|
CTile through_cut = {TILE_THROUGH_CUT};
|
|
return through_cut;
|
|
}
|
|
else
|
|
{
|
|
return CLayerTiles::GetTile(x, y);
|
|
}
|
|
}
|
|
|
|
void CLayerGame::SetTile(int x, int y, CTile tile)
|
|
{
|
|
if(tile.m_Index == TILE_THROUGH_CUT && m_pEditor->m_SelectEntitiesImage == "DDNet")
|
|
{
|
|
if(!m_pEditor->m_Map.m_pFrontLayer)
|
|
{
|
|
CLayer *pLayerFront = new CLayerFront(m_Width, m_Height);
|
|
m_pEditor->m_Map.MakeFrontLayer(pLayerFront);
|
|
m_pEditor->m_Map.m_pGameGroup->AddLayer(pLayerFront);
|
|
}
|
|
CTile nohook = {TILE_NOHOOK};
|
|
CLayerTiles::SetTile(x, y, nohook);
|
|
CTile through_cut = {TILE_THROUGH_CUT};
|
|
m_pEditor->m_Map.m_pFrontLayer->CLayerTiles::SetTile(x, y, through_cut); // NOLINT(bugprone-parent-virtual-call)
|
|
}
|
|
else
|
|
{
|
|
if(m_pEditor->m_SelectEntitiesImage == "DDNet" && m_pEditor->m_Map.m_pFrontLayer && m_pEditor->m_Map.m_pFrontLayer->GetTile(x, y).m_Index == TILE_THROUGH_CUT)
|
|
{
|
|
CTile air = {TILE_AIR};
|
|
m_pEditor->m_Map.m_pFrontLayer->CLayerTiles::SetTile(x, y, air); // NOLINT(bugprone-parent-virtual-call)
|
|
}
|
|
if(m_pEditor->m_AllowPlaceUnusedTiles || IsValidGameTile(tile.m_Index))
|
|
{
|
|
CLayerTiles::SetTile(x, y, tile);
|
|
}
|
|
else
|
|
{
|
|
CTile air = {TILE_AIR};
|
|
CLayerTiles::SetTile(x, y, air);
|
|
if(!m_pEditor->m_PreventUnusedTilesWasWarned)
|
|
{
|
|
m_pEditor->m_PopupEventType = m_pEditor->POPEVENT_PREVENTUNUSEDTILES;
|
|
m_pEditor->m_PopupEventActivated = true;
|
|
m_pEditor->m_PreventUnusedTilesWasWarned = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
int CLayerGame::RenderProperties(CUIRect *pToolbox)
|
|
{
|
|
int r = CLayerTiles::RenderProperties(pToolbox);
|
|
m_Image = -1;
|
|
return r;
|
|
}
|