Skip to content

Commit

Permalink
Improve editor labels and tooltips
Browse files Browse the repository at this point in the history 
- Use English sentence case for all tooltips and labels, i.e. only capitalize the first word of every sentence.
- End all tooltips with a period.
- Consistently format hotkey descriptions in square brackets at the beginning of tooltips with title case capitalization.
- Change verb form of tooltips to fit the sentence "Clicking this button will [tooltip]", e.g. use "Rotate X" instead of "Rotates X".
- Improve clarity, consistency and readability of various tooltips.
- Remove unnecessary `grabbing` debug message when grabbing a brush.
- Remove unnecessary temporary variable `m_aMenuBackgroundTooltip`.
  • Loading branch information
@Robyt3
Robyt3 committed Jan 12, 2025
1 parent 92013a0 commit 8a13b07
Show file tree
Hide file tree
Showing 10 changed files with 220 additions and 222 deletions.
125 changes: 60 additions & 65 deletions src/game/editor/editor.cpp
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/game/editor/editor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,6 @@ class CEditor : public IEditor
bool m_ShowMousePointer;
bool m_GuiActive;

char m_aMenuBackgroundTooltip[256];
bool m_PreviewZoom;
float m_MouseWorldScale = 1.0f; // Mouse (i.e. UI) scale relative to the World (selected Group)
vec2 m_MouseWorldPos = vec2(0.0f, 0.0f);
Expand Down
26 changes: 13 additions & 13 deletions src/game/editor/editor_props.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
Shifter.VSplitRight(10.0f, &Shifter, &Inc);
Shifter.VSplitLeft(10.0f, &Dec, &Shifter);
str_format(aBuf, sizeof(aBuf), "%d", pProps[i].m_Value);
auto NewValueRes = UiDoValueSelector((char *)&pIds[i], &Shifter, "", pProps[i].m_Value, pProps[i].m_Min, pProps[i].m_Max, 1, 1.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Rightclick to edit as text.", false, false, 0, pColor);
auto NewValueRes = UiDoValueSelector((char *)&pIds[i], &Shifter, "", pProps[i].m_Value, pProps[i].m_Min, pProps[i].m_Max, 1, 1.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Right click to edit as text.", false, false, 0, pColor);
int NewValue = NewValueRes.m_Value;
if(NewValue != pProps[i].m_Value || (NewValueRes.m_State != EEditState::NONE && NewValueRes.m_State != EEditState::EDITING))
{
*pNewVal = NewValue;
Change = i;
State = NewValueRes.m_State;
}
if(DoButton_FontIcon((char *)&pIds[i] + 1, FONT_ICON_MINUS, 0, &Dec, 0, "Decrease", IGraphics::CORNER_L, 7.0f))
if(DoButton_FontIcon((char *)&pIds[i] + 1, FONT_ICON_MINUS, 0, &Dec, 0, "Decrease value.", IGraphics::CORNER_L, 7.0f))
{
*pNewVal = clamp(pProps[i].m_Value - 1, pProps[i].m_Min, pProps[i].m_Max);
Change = i;
State = EEditState::ONE_GO;
}
if(DoButton_FontIcon(((char *)&pIds[i]) + 2, FONT_ICON_PLUS, 0, &Inc, 0, "Increase", IGraphics::CORNER_R, 7.0f))
if(DoButton_FontIcon(((char *)&pIds[i]) + 2, FONT_ICON_PLUS, 0, &Inc, 0, "Increase value.", IGraphics::CORNER_R, 7.0f))
{
*pNewVal = clamp(pProps[i].m_Value + 1, pProps[i].m_Min, pProps[i].m_Max);
Change = i;
Expand Down Expand Up @@ -87,16 +87,16 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
int Step = Shift ? 1 : 45;
int Value = pProps[i].m_Value;

auto NewValueRes = UiDoValueSelector(&pIds[i], &Shifter, "", Value, pProps[i].m_Min, pProps[i].m_Max, Shift ? 1 : 45, Shift ? 1.0f : 10.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Rightclick to edit as text.", false, false, 0);
auto NewValueRes = UiDoValueSelector(&pIds[i], &Shifter, "", Value, pProps[i].m_Min, pProps[i].m_Max, Shift ? 1 : 45, Shift ? 1.0f : 10.0f, "Use left mouse button to drag and change the value. Hold shift to be more precise. Right click to edit as text.", false, false, 0);
int NewValue = NewValueRes.m_Value;
if(DoButton_FontIcon(&pIds[i] + 1, FONT_ICON_MINUS, 0, &Dec, 0, "Decrease", IGraphics::CORNER_L, 7.0f))
if(DoButton_FontIcon(&pIds[i] + 1, FONT_ICON_MINUS, 0, &Dec, 0, "Decrease value.", IGraphics::CORNER_L, 7.0f))
{
NewValue = (std::ceil((pProps[i].m_Value / (float)Step)) - 1) * Step;
if(NewValue < 0)
NewValue += 360;
State = EEditState::ONE_GO;
}
if(DoButton_FontIcon(&pIds[i] + 2, FONT_ICON_PLUS, 0, &Inc, 0, "Increase", IGraphics::CORNER_R, 7.0f))
if(DoButton_FontIcon(&pIds[i] + 2, FONT_ICON_PLUS, 0, &Inc, 0, "Increase value.", IGraphics::CORNER_R, 7.0f))
{
NewValue = (pProps[i].m_Value + Step) / Step * Step;
State = EEditState::ONE_GO;
Expand Down Expand Up @@ -153,25 +153,25 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
Shifter.VSplitRight(10.0f, &Shifter, &Down);
Shifter.Draw(ColorRGBA(1, 1, 1, 0.5f), IGraphics::CORNER_NONE, 0.0f);
Ui()->DoLabel(&Shifter, "Y", 10.0f, TEXTALIGN_MC);
if(DoButton_FontIcon(&pIds[i], FONT_ICON_MINUS, 0, &Left, 0, "Left", IGraphics::CORNER_L, 7.0f))
if(DoButton_FontIcon(&pIds[i], FONT_ICON_MINUS, 0, &Left, 0, "Shift left.", IGraphics::CORNER_L, 7.0f))
{
*pNewVal = DIRECTION_LEFT;
Change = i;
State = EEditState::ONE_GO;
}
if(DoButton_FontIcon(((char *)&pIds[i]) + 3, FONT_ICON_PLUS, 0, &Right, 0, "Right", IGraphics::CORNER_R, 7.0f))
if(DoButton_FontIcon(((char *)&pIds[i]) + 3, FONT_ICON_PLUS, 0, &Right, 0, "Shift right.", IGraphics::CORNER_R, 7.0f))
{
*pNewVal = DIRECTION_RIGHT;
Change = i;
State = EEditState::ONE_GO;
}
if(DoButton_FontIcon(((char *)&pIds[i]) + 1, FONT_ICON_MINUS, 0, &Up, 0, "Up", IGraphics::CORNER_L, 7.0f))
if(DoButton_FontIcon(((char *)&pIds[i]) + 1, FONT_ICON_MINUS, 0, &Up, 0, "Shift up.", IGraphics::CORNER_L, 7.0f))
{
*pNewVal = DIRECTION_UP;
Change = i;
State = EEditState::ONE_GO;
}
if(DoButton_FontIcon(((char *)&pIds[i]) + 2, FONT_ICON_PLUS, 0, &Down, 0, "Down", IGraphics::CORNER_R, 7.0f))
if(DoButton_FontIcon(((char *)&pIds[i]) + 2, FONT_ICON_PLUS, 0, &Down, 0, "Shift down.", IGraphics::CORNER_R, 7.0f))
{
*pNewVal = DIRECTION_DOWN;
Change = i;
Expand Down Expand Up @@ -239,7 +239,7 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
else
aBuf[0] = '\0';

auto NewValueRes = UiDoValueSelector((char *)&pIds[i], &Shifter, aBuf, CurValue, 0, m_Map.m_vpEnvelopes.size(), 1, 1.0f, "Set Envelope", false, false, IGraphics::CORNER_NONE);
auto NewValueRes = UiDoValueSelector((char *)&pIds[i], &Shifter, aBuf, CurValue, 0, m_Map.m_vpEnvelopes.size(), 1, 1.0f, "Select envelope.", false, false, IGraphics::CORNER_NONE);
int NewVal = NewValueRes.m_Value;
if(NewVal != CurValue || (NewValueRes.m_State != EEditState::NONE && NewValueRes.m_State != EEditState::EDITING))
{
Expand All @@ -248,13 +248,13 @@ SEditResult<E> CEditor::DoPropertiesWithState(CUIRect *pToolBox, CProperty *pPro
State = NewValueRes.m_State;
}

if(DoButton_FontIcon((char *)&pIds[i] + 1, FONT_ICON_MINUS, 0, &Dec, 0, "Previous Envelope", IGraphics::CORNER_L, 7.0f))
if(DoButton_FontIcon((char *)&pIds[i] + 1, FONT_ICON_MINUS, 0, &Dec, 0, "Select previous envelope.", IGraphics::CORNER_L, 7.0f))
{
*pNewVal = pProps[i].m_Value - 1;
Change = i;
State = EEditState::ONE_GO;
}
if(DoButton_FontIcon(((char *)&pIds[i]) + 2, FONT_ICON_PLUS, 0, &Inc, 0, "Next Envelope", IGraphics::CORNER_R, 7.0f))
if(DoButton_FontIcon(((char *)&pIds[i]) + 2, FONT_ICON_PLUS, 0, &Inc, 0, "Select next envelope.", IGraphics::CORNER_R, 7.0f))
{
*pNewVal = pProps[i].m_Value + 1;
Change = i;
Expand Down
33 changes: 18 additions & 15 deletions src/game/editor/editor_server_settings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ void CEditor::RenderServerSettingsEditor(CUIRect View, bool ShowServerSettingsEd
// redo button
ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
static int s_RedoButton = 0;
if(DoButton_FontIcon(&s_RedoButton, FONT_ICON_REDO, m_ServerSettingsHistory.CanRedo() ? 0 : -1, &Button, 0, "[Ctrl+Y] Redo command edit", IGraphics::CORNER_R, 11.0f) == 1 || (CanMoveDown && Input()->AltIsPressed() && Ui()->ConsumeHotkey(CUi::HOTKEY_DOWN)))
if(DoButton_FontIcon(&s_RedoButton, FONT_ICON_REDO, m_ServerSettingsHistory.CanRedo() ? 0 : -1, &Button, 0, "[Ctrl+Y] Redo the last command edit.", IGraphics::CORNER_R, 11.0f) == 1 || (CanMoveDown && Input()->AltIsPressed() && Ui()->ConsumeHotkey(CUi::HOTKEY_DOWN)))
{
m_ServerSettingsHistory.Redo();
}
Expand All @@ -132,7 +132,7 @@ void CEditor::RenderServerSettingsEditor(CUIRect View, bool ShowServerSettingsEd
ToolBar.VSplitRight(25.0f, &ToolBar, &Button);
ToolBar.VSplitRight(5.0f, &ToolBar, nullptr);
static int s_UndoButton = 0;
if(DoButton_FontIcon(&s_UndoButton, FONT_ICON_UNDO, m_ServerSettingsHistory.CanUndo() ? 0 : -1, &Button, 0, "[Ctrl+Z] Undo command edit", IGraphics::CORNER_L, 11.0f) == 1 || (CanMoveUp && Input()->AltIsPressed() && Ui()->ConsumeHotkey(CUi::HOTKEY_UP)))
if(DoButton_FontIcon(&s_UndoButton, FONT_ICON_UNDO, m_ServerSettingsHistory.CanUndo() ? 0 : -1, &Button, 0, "[Ctrl+Z] Undo the last command edit.", IGraphics::CORNER_L, 11.0f) == 1 || (CanMoveUp && Input()->AltIsPressed() && Ui()->ConsumeHotkey(CUi::HOTKEY_UP)))
{
m_ServerSettingsHistory.Undo();
}
Expand Down Expand Up @@ -318,14 +318,17 @@ void CEditor::DoMapSettingsEditBox(CMapSettingsBackend::CContext *pContext, cons

// If we have a valid command, display the help in the tooltip
if(Context.CommandIsValid() && pLineInput->IsActive() && Ui()->HotItem() == nullptr)
{
Context.GetCommandHelpText(m_aTooltip, sizeof(m_aTooltip));
str_append(m_aTooltip, ".");
}

CUIRect ToolBar = *pRect;
CUIRect Button;
ToolBar.VSplitRight(ToolBar.h, &ToolBar, &Button);

// Do the unknown command toggle button
if(DoButton_FontIcon(&Context.m_AllowUnknownCommands, FONT_ICON_QUESTION, Context.m_AllowUnknownCommands, &Button, 0, "Disallow/allow unknown or invalid commands", IGraphics::CORNER_R))
if(DoButton_FontIcon(&Context.m_AllowUnknownCommands, FONT_ICON_QUESTION, Context.m_AllowUnknownCommands, &Button, 0, "Disallow/allow unknown or invalid commands.", IGraphics::CORNER_R))
{
Context.m_AllowUnknownCommands = !Context.m_AllowUnknownCommands;
Context.Update();
Expand All @@ -336,7 +339,7 @@ void CEditor::DoMapSettingsEditBox(CMapSettingsBackend::CContext *pContext, cons
Context.ColorArguments(vColorSplits);

// Do and render clearable edit box with the colors
if(DoClearableEditBox(pLineInput, &ToolBar, FontSize, IGraphics::CORNER_L, "Enter a server setting.", vColorSplits))
if(DoClearableEditBox(pLineInput, &ToolBar, FontSize, IGraphics::CORNER_L, "Enter a server setting. Press ctrl+space to show available settings.", vColorSplits))
{
Context.Update(); // Update the context when contents change
Context.m_DropdownContext.m_ShouldHide = false;
Expand Down Expand Up @@ -645,11 +648,11 @@ void CEditor::RenderMapSettingsErrorDialog()
FixBtn.HMargin(1.0f, &FixBtn);

// Delete button
if(DoButton_FontIcon(&pInvalidSetting->m_Context.m_Deleted, FONT_ICON_TRASH, pInvalidSetting->m_Context.m_Deleted, &DelBtn, 0, "Delete this command", IGraphics::CORNER_ALL, 10.0f))
if(DoButton_FontIcon(&pInvalidSetting->m_Context.m_Deleted, FONT_ICON_TRASH, pInvalidSetting->m_Context.m_Deleted, &DelBtn, 0, "Delete this command.", IGraphics::CORNER_ALL, 10.0f))
pInvalidSetting->m_Context.m_Deleted = !pInvalidSetting->m_Context.m_Deleted;

// Fix button
if(DoButton_Editor(&pInvalidSetting->m_Context.m_Fixed, "Fix", !pInvalidSetting->m_Context.m_Deleted ? (s_FixingCommandIndex == -1 ? 0 : (IsFixing ? 1 : -1)) : -1, &FixBtn, 0, "Fix this command"))
if(DoButton_Editor(&pInvalidSetting->m_Context.m_Fixed, "Fix", !pInvalidSetting->m_Context.m_Deleted ? (s_FixingCommandIndex == -1 ? 0 : (IsFixing ? 1 : -1)) : -1, &FixBtn, 0, "Fix this command."))
{
s_FixingCommandIndex = i;
SetInput(pInvalidSetting->m_aSetting);
Expand All @@ -669,7 +672,7 @@ void CEditor::RenderMapSettingsErrorDialog()

// Buttons
static int s_Cancel = 0, s_Ok = 0;
if(DoButton_Editor(&s_Cancel, "Cancel", 0, &CancelBtn, 0, "Cancel fixing this command") || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
if(DoButton_Editor(&s_Cancel, "Cancel", 0, &CancelBtn, 0, "Cancel fixing this command.") || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
{
s_FixingCommandIndex = -1;
s_Input.Clear();
Expand All @@ -682,7 +685,7 @@ void CEditor::RenderMapSettingsErrorDialog()
s_Context.CheckCollision(vSettingsValid, Res);
bool Valid = s_Context.Valid() && Res == ECollisionCheckResult::ADD;

if(DoButton_Editor(&s_Ok, "Done", Valid ? 0 : -1, &OkBtn, 0, "Confirm editing of this command") || (s_Input.IsActive() && Valid && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
if(DoButton_Editor(&s_Ok, "Done", Valid ? 0 : -1, &OkBtn, 0, "Confirm editing of this command.") || (s_Input.IsActive() && Valid && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
{
// Mark the setting is being fixed
pInvalidSetting->m_Context.m_Fixed = true;
Expand Down Expand Up @@ -768,7 +771,7 @@ void CEditor::RenderMapSettingsErrorDialog()
Label.VSplitRight(50.0f, &Label, &ChooseBtn);
Label.VSplitRight(5.0f, &Label, nullptr);
ChooseBtn.HMargin(1.0f, &ChooseBtn);
if(DoButton_Editor(&vDuplicates, "Choose", Chosen == -1, &ChooseBtn, 0, "Choose this command"))
if(DoButton_Editor(&vDuplicates, "Choose", Chosen == -1, &ChooseBtn, 0, "Choose this command."))
{
if(Chosen != -1)
vSettingsInvalid[vDuplicates[Chosen]].m_Context.m_Chosen = false;
Expand Down Expand Up @@ -803,7 +806,7 @@ void CEditor::RenderMapSettingsErrorDialog()
SubSlot.VSplitRight(50.0f, &SubSlot, &ChooseBtn);
SubSlot.VSplitRight(5.0f, &SubSlot, nullptr);
ChooseBtn.HMargin(1.0f, &ChooseBtn);
if(DoButton_Editor(&Duplicate.m_Context.m_Chosen, "Choose", IsInvalid && !Duplicate.m_Context.m_Fixed ? -1 : Duplicate.m_Context.m_Chosen, &ChooseBtn, 0, "Override with this command"))
if(DoButton_Editor(&Duplicate.m_Context.m_Chosen, "Choose", IsInvalid && !Duplicate.m_Context.m_Fixed ? -1 : Duplicate.m_Context.m_Chosen, &ChooseBtn, 0, "Override with this command."))
{
Duplicate.m_Context.m_Chosen = !Duplicate.m_Context.m_Chosen;
if(Chosen != -1 && Chosen != DuplicateIndex)
Expand All @@ -820,7 +823,7 @@ void CEditor::RenderMapSettingsErrorDialog()
SubSlot.VSplitRight(30.0f, &SubSlot, &FixBtn);
SubSlot.VSplitRight(10.0f, &SubSlot, nullptr);
FixBtn.HMargin(1.0f, &FixBtn);
if(DoButton_Editor(&Duplicate.m_Context.m_Fixed, "Fix", s_FixingCommandIndex == -1 ? 0 : (IsFixing ? 1 : -1), &FixBtn, 0, "Fix this command (needed before it can be chosen)"))
if(DoButton_Editor(&Duplicate.m_Context.m_Fixed, "Fix", s_FixingCommandIndex == -1 ? 0 : (IsFixing ? 1 : -1), &FixBtn, 0, "Fix this command (needed before it can be chosen)."))
{
s_FixingCommandIndex = Duplicate.m_Index;
SetInput(Duplicate.m_aSetting);
Expand All @@ -845,7 +848,7 @@ void CEditor::RenderMapSettingsErrorDialog()
OkBtn.HMargin(1.0f, &OkBtn);

static int s_Cancel = 0, s_Ok = 0;
if(DoButton_Editor(&s_Cancel, "Cancel", 0, &CancelBtn, 0, "Cancel fixing this command") || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
if(DoButton_Editor(&s_Cancel, "Cancel", 0, &CancelBtn, 0, "Cancel fixing this command.") || Ui()->ConsumeHotkey(CUi::HOTKEY_ESCAPE))
{
s_FixingCommandIndex = -1;
s_Input.Clear();
Expand All @@ -862,7 +865,7 @@ void CEditor::RenderMapSettingsErrorDialog()
s_Context.CheckCollision({m_Map.m_vSettings[i]}, Res);
bool Valid = s_Context.Valid() && Res == ECollisionCheckResult::REPLACE;

if(DoButton_Editor(&s_Ok, "Done", Valid ? 0 : -1, &OkBtn, 0, "Confirm editing of this command") || (s_Input.IsActive() && Valid && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
if(DoButton_Editor(&s_Ok, "Done", Valid ? 0 : -1, &OkBtn, 0, "Confirm editing of this command.") || (s_Input.IsActive() && Valid && Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER)))
{
if(Valid) // Just to make sure
{
Expand Down Expand Up @@ -1088,8 +1091,8 @@ void CMapSettingsBackend::LoadAllMapSettings()
// Load list of commands
LoadCommand("tune", "s[tuning] f[value]", "Tune variable to value or show current value");
LoadCommand("tune_zone", "i[zone] s[tuning] f[value]", "Tune in zone a variable to value");
LoadCommand("tune_zone_enter", "i[zone] r[message]", "which message to display on zone enter; use 0 for normal area");
LoadCommand("tune_zone_leave", "i[zone] r[message]", "which message to display on zone leave; use 0 for normal area");
LoadCommand("tune_zone_enter", "i[zone] r[message]", "Which message to display on zone enter; use 0 for normal area");
LoadCommand("tune_zone_leave", "i[zone] r[message]", "Which message to display on zone leave; use 0 for normal area");
LoadCommand("mapbug", "s[mapbug]", "Enable map compatibility mode using the specified bug (example: [email protected])");
LoadCommand("switch_open", "i[switch]", "Whether a switch is deactivated by default (otherwise activated)");
}
Expand Down
16 changes: 8 additions & 8 deletions src/game/editor/explanations.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,35 +508,35 @@ const char *CEditor::ExplainFNG(int Tile, int Layer)
break;
case TILE_FNG_SPIKE_GOLD:
if(Layer == LAYER_GAME)
return "GOLDEN SPIKE: Kills the tee and gives points to the killer. (Amount of points given is set inside the server)";
return "GOLDEN SPIKE: Kills the tee and gives points to the killer. Amount of points given is set inside the server.";
break;
case TILE_FNG_SPIKE_NORMAL:
if(Layer == LAYER_GAME)
return "NORMAL SPIKE: Kills the tee and gives points to the killer. (Amount of points given is set inside the server)";
return "NORMAL SPIKE: Kills the tee and gives points to the killer. Amount of points given is set inside the server.";
break;
case TILE_FNG_SPIKE_RED:
if(Layer == LAYER_GAME)
return "RED SPIKE: Red team spikes. Gives negative points when killer is in blue team (Amount of points given is set inside the server)";
return "RED SPIKE: Red team spikes. Gives negative points when killer is in blue team. Amount of points given is set inside the server.";
break;
case TILE_FNG_SPIKE_BLUE:
if(Layer == LAYER_GAME)
return "BLUE SPIKE: Blue team spikes. Gives negative points when killer is in red team (Amount of points given is set inside the server)";
return "BLUE SPIKE: Blue team spikes. Gives negative points when killer is in red team. Amount of points given is set inside the server.";
break;
case TILE_FNG_SCORE_RED:
if(Layer == LAYER_GAME)
return "SCORE: Old tile used for showing red team score using laser text. No longer usable in FNG2";
return "SCORE: Old tile used for showing red team score using laser text. No longer usable in FNG2.";
break;
case TILE_FNG_SCORE_BLUE:
if(Layer == LAYER_GAME)
return "SCORE: Old tile used for showing blue team score using laser text. No longer usable in FNG2";
return "SCORE: Old tile used for showing blue team score using laser text. No longer usable in FNG2.";
break;
case TILE_FNG_SPIKE_GREEN:
if(Layer == LAYER_GAME)
return "GREEN SPIKE: Kills the tee and gives points to the killer. (Amount of points given is set inside the server)";
return "GREEN SPIKE: Kills the tee and gives points to the killer. Amount of points given is set inside the server.";
break;
case TILE_FNG_SPIKE_PURPLE:
if(Layer == LAYER_GAME)
return "PURPLE SPIKE: Kills the tee and gives points to the killer. (Amount of points given is set inside the server)";
return "PURPLE SPIKE: Kills the tee and gives points to the killer. Amount of points given is set inside the server.";
break;
case TILE_FNG_SPAWN:
if(Layer == LAYER_GAME)
Expand Down
2 changes: 1 addition & 1 deletion src/game/editor/layer_selector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ void CLayerSelector::OnInit(CEditor *pEditor)

bool CLayerSelector::SelectByTile()
{
// ctrl+rightclick a map index to select the layer that has a tile there
// ctrl+right click a map index to select the layer that has a tile there
if(Ui()->HotItem() != &Editor()->m_MapEditorId)
return false;
if(!Input()->ModifierIsPressed() || !Ui()->MouseButtonClicked(1))
Expand Down
2 changes: 1 addition & 1 deletion src/game/editor/map_grid.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ CUi::EPopupMenuFunctionResult CMapGrid::PopupGridSettings(void *pContext, CUIRec
View.HSplitBottom(12.0f, &View, &Button);

static char s_DefaultButton;
if(pMapGrid->Editor()->DoButton_Ex(&s_DefaultButton, "Default", 0, &Button, 0, "Normal grid size", IGraphics::CORNER_ALL))
if(pMapGrid->Editor()->DoButton_Ex(&s_DefaultButton, "Default", 0, &Button, 0, "Reset to normal grid size.", IGraphics::CORNER_ALL))
{
pMapGrid->SetFactor(1);
}
Expand Down
Loading

0 comments on commit 8a13b07

Please sign in to comment.