Skip to content

Commit 24441a6

Browse files
committed
Sync with current ReClass.NET project.
1 parent 3f5d986 commit 24441a6

6 files changed

+22
-19
lines changed

FrostbitePlugin.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<DebugType>full</DebugType>
1919
<Optimize>false</Optimize>
2020
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>TRACE;DEBUG;WIN32</DefineConstants>
21+
<DefineConstants>TRACE;DEBUG;RECLASSNET32</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
2424
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
2828
<DebugType>pdbonly</DebugType>
2929
<Optimize>true</Optimize>
3030
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE;WIN32;RELEASE</DefineConstants>
31+
<DefineConstants>TRACE;RECLASSNET32;RELEASE</DefineConstants>
3232
<ErrorReport>prompt</ErrorReport>
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
@@ -38,7 +38,7 @@
3838
<DebugType>full</DebugType>
3939
<Optimize>false</Optimize>
4040
<OutputPath>bin\Debug\x64\</OutputPath>
41-
<DefineConstants>TRACE;DEBUG;WIN64</DefineConstants>
41+
<DefineConstants>TRACE;DEBUG;RECLASSNET64</DefineConstants>
4242
<ErrorReport>prompt</ErrorReport>
4343
<WarningLevel>4</WarningLevel>
4444
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -48,7 +48,7 @@
4848
<DebugType>pdbonly</DebugType>
4949
<Optimize>true</Optimize>
5050
<OutputPath>bin\Release\x64\</OutputPath>
51-
<DefineConstants>TRACE;WIN64;RELEASE</DefineConstants>
51+
<DefineConstants>TRACE;RECLASSNET64;RELEASE</DefineConstants>
5252
<ErrorReport>prompt</ErrorReport>
5353
<WarningLevel>4</WarningLevel>
5454
</PropertyGroup>
@@ -75,12 +75,6 @@
7575
<Compile Include="WeakPtrNode.cs" />
7676
<Compile Include="WeakPtrNodeConverter.cs" />
7777
</ItemGroup>
78-
<ItemGroup>
79-
<ProjectReference Include="..\ReClass.NET\ReClass.NET.csproj">
80-
<Project>{BFB8917D-E9B4-463F-A6E8-612C35728C78}</Project>
81-
<Name>ReClass.NET</Name>
82-
</ProjectReference>
83-
</ItemGroup>
8478
<ItemGroup>
8579
<EmbeddedResource Include="Properties\Resources.resx">
8680
<Generator>ResXFileCodeGenerator</Generator>
@@ -90,6 +84,12 @@
9084
<ItemGroup>
9185
<None Include="Resources\logo_frostbite.png" />
9286
</ItemGroup>
87+
<ItemGroup>
88+
<ProjectReference Include="..\ReClass.NET\ReClass.NET\ReClass.NET.csproj">
89+
<Project>{bfb8917d-e9b4-463f-a6e8-612c35728c78}</Project>
90+
<Name>ReClass.NET</Name>
91+
</ProjectReference>
92+
</ItemGroup>
9393
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9494
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9595
Other similar extension points exist, see Microsoft.Common.targets.

FrostbitePlugin.sln

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27004.2002
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FrostbitePlugin", "FrostbitePlugin.csproj", "{CA79BA0B-0D80-476A-B793-FC7EF6DCEAD7}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReClass.NET", "..\ReClass.NET\ReClass.NET.csproj", "{BFB8917D-E9B4-463F-A6E8-612C35728C78}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReClass.NET", "..\ReClass.NET\ReClass.NET\ReClass.NET.csproj", "{BFB8917D-E9B4-463F-A6E8-612C35728C78}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,4 +41,7 @@ Global
4141
GlobalSection(SolutionProperties) = preSolution
4242
HideSolutionNode = FALSE
4343
EndGlobalSection
44+
GlobalSection(ExtensibilityGlobals) = postSolution
45+
SolutionGuid = {395221D5-609F-474F-BC76-194DA6CE3FA7}
46+
EndGlobalSection
4447
EndGlobal

FrostbitePluginExt.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public override void Terminate()
5858

5959

6060
/// <summary>A custom node info reader which outputs Frostbite type infos.</summary>
61-
class FrostBiteNodeInfoReader : INodeInfoReader
61+
public class FrostBiteNodeInfoReader : INodeInfoReader
6262
{
6363
public string ReadNodeInfo(BaseNode node, IntPtr value, MemoryBuffer memory)
6464
{
@@ -103,7 +103,7 @@ private string ReadPtrInfo(IntPtr value, MemoryBuffer memory)
103103
var getTypeFnPtr = memory.Process.ReadRemoteObject<IntPtr>(value);
104104
if (getTypeFnPtr.MayBeValid())
105105
{
106-
#if WIN64
106+
#if RECLASSNET64
107107
var offset = memory.Process.ReadRemoteObject<int>(getTypeFnPtr + 3);
108108
var typeInfoPtr = getTypeFnPtr + offset + 7;
109109
#else

WeakPtrCodeGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace FrostbitePlugin
66
{
7-
class WeakPtrCodeGenerator : ICustomCodeGenerator
7+
public class WeakPtrCodeGenerator : ICustomCodeGenerator
88
{
99
/// <summary>Checks if the language is C++ and the node is a WeakPtrNode.</summary>
1010
/// <param name="node">The node to check.</param>

WeakPtrNode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace FrostbitePlugin
99
{
10-
class WeakPtrNode : BaseReferenceNode
10+
public class WeakPtrNode : BaseReferenceNode
1111
{
1212
private readonly MemoryBuffer memory = new MemoryBuffer();
1313

WeakPtrNodeConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace FrostbitePlugin
99
{
10-
class WeakPtrNodeConverter : ICustomNodeConverter
10+
public class WeakPtrNodeConverter : ICustomNodeConverter
1111
{
1212
/// <summary>Name of the type used in the XML data.</summary>
1313
private const string XmlType = "FrostBite::WeakPtr";
@@ -55,7 +55,7 @@ public bool TryCreateNodeFromElement(XElement element, ClassNode parent, IEnumer
5555
return true;
5656
}
5757

58-
/// <summary>Creates a xml element from the node. This method gets only called if <see cref="CanHandleNode(BaseNode node)"/> returned true.</summary>
58+
/// <summary>Creates a xml element from the node. This method gets only called if <see cref="CanHandleNode(BaseNode)"/> returned true.</summary>
5959
/// <param name="node">The node to create the xml element from.</param>
6060
/// <param name="logger">The logger used to output messages.</param>
6161
/// <returns>The xml element for the node.</returns>

0 commit comments

Comments
 (0)