mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-20 15:11:23 +02:00
Code Issues Projects Releases Wiki Activity

Add back "Name already taken" message

Browse Source
This commit is contained in:
jacob1
2021-08-28 00:02:19 -04:00
parent 44590d82e9
commit 4f36ab10c1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/game/GOLTool.cpp
View File

@@ -158,7 +158,11 @@ void GOLWindow::Validate()
auto color1 = (((highColour.Red << 8) | highColour.Green) << 8) | highColour.Blue; auto color1 = (((highColour.Red << 8) | highColour.Green) << 8) | highColour.Blue;
auto color2 = (((lowColour.Red << 8) | lowColour.Green) << 8) | lowColour.Blue; auto color2 = (((lowColour.Red << 8) | lowColour.Green) << 8) | lowColour.Blue;
AddCustomGol(ruleString, nameString, color1, color2); if (!AddCustomGol(ruleString, nameString, color1, color2))
{
new ErrorMessage("Could not add GOL type", "Name already taken");
return;
}
tool->gameModel->SelectNextIdentifier = "DEFAULT_PT_LIFECUST_" + nameString.ToAscii(); tool->gameModel->SelectNextIdentifier = "DEFAULT_PT_LIFECUST_" + nameString.ToAscii();
tool->gameModel->SelectNextTool = toolSelection; tool->gameModel->SelectNextTool = toolSelection;