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

Hex Values in the editor's info feature

Browse source 
Clang format before squash
This commit is contained in:
VoxelDoesCode 2022-10-11 18:23:11 -04:00
parent b7da20826d
commit 484cb82872
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game/editor/editor.cpp
View file

@ -910,7 +910,7 @@ void CEditor::DoToolbar(CUIRect ToolBar)
TB_Top.VSplitLeft(40.0f, &Button, &TB_Top); TB_Top.VSplitLeft(40.0f, &Button, &TB_Top);
static int s_TileInfoButton = 0; static int s_TileInfoButton = 0;
if(DoButton_Editor(&s_TileInfoButton, "Info", m_ShowTileInfo, &Button, 0, "[ctrl+i] Show tile information") || if(DoButton_Editor(&s_TileInfoButton, "Info", m_ShowTileInfo, &Button, 0, "[ctrl+i] Show tile information") ||
(Input()->KeyPress(KEY_I) && ModPressed)) (Input()->KeyPress(KEY_I) && ModPressed && !ShiftPressed))
{ {
m_ShowTileInfo = !m_ShowTileInfo; m_ShowTileInfo = !m_ShowTileInfo;
m_ShowEnvelopePreview = SHOWENV_NONE; m_ShowEnvelopePreview = SHOWENV_NONE;
@ -1250,6 +1250,16 @@ void CEditor::DoToolbar(CUIRect ToolBar)
m_BrushDrawDestructive = !m_BrushDrawDestructive; m_BrushDrawDestructive = !m_BrushDrawDestructive;
TB_Bottom.VSplitLeft(5.0f, &Button, &TB_Bottom); TB_Bottom.VSplitLeft(5.0f, &Button, &TB_Bottom);
} }
// Hex values button
if(m_ShowTileInfo)
{
TB_Bottom.VSplitLeft(65.0f, &Button, &TB_Bottom);
static int s_TileInfoHexButton = 0;
if(DoButton_Editor(&s_TileInfoHexButton, "Hex Values", m_ShowTileHexInfo, &Button, 0, "[ctrl+shift+i] Show a tile's hex value") ||
(Input()->KeyPress(KEY_I) && ModPressed && ShiftPressed))
m_ShowTileHexInfo = !m_ShowTileHexInfo;
}
} }
} }

2
src/game/editor/editor.h
View file

@ -835,6 +835,7 @@ public:
m_PreventUnusedTilesWasWarned = false; m_PreventUnusedTilesWasWarned = false;
m_AllowPlaceUnusedTiles = 0; m_AllowPlaceUnusedTiles = 0;
m_BrushDrawDestructive = true; m_BrushDrawDestructive = true;
m_ShowTileHexInfo = false;
m_GotoX = 0; m_GotoX = 0;
m_GotoY = 0; m_GotoY = 0;
@ -914,6 +915,7 @@ public:
bool m_PreventUnusedTilesWasWarned; bool m_PreventUnusedTilesWasWarned;
int m_AllowPlaceUnusedTiles; int m_AllowPlaceUnusedTiles;
bool m_BrushDrawDestructive; bool m_BrushDrawDestructive;
bool m_ShowTileHexInfo;
int m_Mentions; int m_Mentions;

2
src/game/editor/layer_tiles.cpp
View file

@ -663,7 +663,7 @@ void CLayerTiles::ShowInfo()
if(m_pTiles[c].m_Index) if(m_pTiles[c].m_Index)
{ {
char aBuf[64]; char aBuf[64];
str_format(aBuf, sizeof(aBuf), "%i", m_pTiles[c].m_Index); str_format(aBuf, sizeof(aBuf), m_pEditor->m_ShowTileHexInfo ? "%02X" : "%i", m_pTiles[c].m_Index);
m_pEditor->Graphics()->QuadsText(x * 32, y * 32, 16.0f, aBuf); m_pEditor->Graphics()->QuadsText(x * 32, y * 32, 16.0f, aBuf);
char aFlags[4] = {m_pTiles[c].m_Flags & TILEFLAG_VFLIP ? 'V' : ' ', char aFlags[4] = {m_pTiles[c].m_Flags & TILEFLAG_VFLIP ? 'V' : ' ',