AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 11:35:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't show 'place yes' and 'delete yes' for selected block description in inventory.

Browse Source 
But still show 'place no' and 'delete no'
This commit is contained in:
UnknownShadow200 2018-05-24 11:02:32 +10:00
parent 91a88ce049
commit 21d96f1de1
3 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ClassicalSharp/2D/Widgets/TableWidget.cs
View File

@ -187,13 +187,10 @@ namespace ClassicalSharp.Gui.Widgets {
buffer.Append(BlockInfo.Name[block]); buffer.Append(BlockInfo.Name[block]);
if (game.ClassicMode) return; if (game.ClassicMode) return;
buffer.Append(" (ID "); buffer.Append(" (ID ").AppendNum(block).Append("&f");
buffer.AppendNum(block); if (!BlockInfo.CanPlace[block]) { buffer.Append( ", place &cNo&f"); }
buffer.Append("&f, place "); if (!BlockInfo.CanDelete[block]) { buffer.Append(", delete &cNo&f"); }
buffer.Append(BlockInfo.CanPlace[block] ? "&aYes" : "&cNo"); buffer.Append(')');
buffer.Append("&f, delete ");
buffer.Append(BlockInfo.CanDelete[block] ? "&aYes" : "&cNo");
buffer.Append("&f)");
} }
int lastCreatedIndex = -1000; int lastCreatedIndex = -1000;

56
src/ClassicalSharp.sln
View File

@ -1,28 +1,28 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.25420.1 VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Client", "Client\Client.vcxproj", "{8A7D82BD-178A-4785-B41B-70EDE998920A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Client", "Client\Client.vcxproj", "{8A7D82BD-178A-4785-B41B-70EDE998920A}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64 Debug|x64 = Debug|x64
Debug|x86 = Debug|x86 Debug|x86 = Debug|x86
Release|x64 = Release|x64 Release|x64 = Release|x64
Release|x86 = Release|x86 Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8A7D82BD-178A-4785-B41B-70EDE998920A}.Debug|x64.ActiveCfg = Debug|x64 {8A7D82BD-178A-4785-B41B-70EDE998920A}.Debug|x64.ActiveCfg = Debug|x64
{8A7D82BD-178A-4785-B41B-70EDE998920A}.Debug|x64.Build.0 = Debug|x64 {8A7D82BD-178A-4785-B41B-70EDE998920A}.Debug|x64.Build.0 = Debug|x64
{8A7D82BD-178A-4785-B41B-70EDE998920A}.Debug|x86.ActiveCfg = Debug|Win32 {8A7D82BD-178A-4785-B41B-70EDE998920A}.Debug|x86.ActiveCfg = Debug|Win32
{8A7D82BD-178A-4785-B41B-70EDE998920A}.Debug|x86.Build.0 = Debug|Win32 {8A7D82BD-178A-4785-B41B-70EDE998920A}.Debug|x86.Build.0 = Debug|Win32
{8A7D82BD-178A-4785-B41B-70EDE998920A}.Release|x64.ActiveCfg = Release|x64 {8A7D82BD-178A-4785-B41B-70EDE998920A}.Release|x64.ActiveCfg = Release|x64
{8A7D82BD-178A-4785-B41B-70EDE998920A}.Release|x64.Build.0 = Release|x64 {8A7D82BD-178A-4785-B41B-70EDE998920A}.Release|x64.Build.0 = Release|x64
{8A7D82BD-178A-4785-B41B-70EDE998920A}.Release|x86.ActiveCfg = Release|Win32 {8A7D82BD-178A-4785-B41B-70EDE998920A}.Release|x86.ActiveCfg = Release|Win32
{8A7D82BD-178A-4785-B41B-70EDE998920A}.Release|x86.Build.0 = Release|Win32 {8A7D82BD-178A-4785-B41B-70EDE998920A}.Release|x86.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

7
src/Client/Widgets.c
View File

@ -558,9 +558,10 @@ static void TableWidget_MakeBlockDesc(STRING_TRANSIENT String* desc, BlockID blo
String_AppendString(desc, &name); String_AppendString(desc, &name);
if (Game_ClassicMode) return; if (Game_ClassicMode) return;
const UInt8* place = Block_CanPlace[block] ? "&aYes" : "&cNo"; String_Format1(desc, " (ID %b&f", &block);
const UInt8* del = Block_CanDelete[block] ? "&aYes" : "&cNo"; if (!Block_CanPlace[block]) { String_AppendConst(desc, ", place &cNo&f"); }
String_Format3(desc, " (ID %b&f, place %c&f, delete %c&f)", &block, place, del); if (!Block_CanDelete[block]) { String_AppendConst(desc, ", delete &cNo&f"); }
String_Append(desc, ')');
} }
static void TableWidget_UpdateDescTexPos(TableWidget* widget) { static void TableWidget_UpdateDescTexPos(TableWidget* widget) {