reNX: Fix small issue where nodes are parsed multiple times. Target .…

…NET 4. CLR 4 shows large improvements in.. basically everything. No point not targetting it. The code will still support .NET 3.5. In fact, the code can run on .NET 2.0, if NXFile.ResolvePath is rewritten without LINQ. Signed-off-by: angelsl <[email protected]>
angelsl · Jun 24, 2013 · ecb8d40 · ecb8d40
1 parent 8af6382
commit ecb8d40
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/NXProperties/NXNode.cs b/NXProperties/NXNode.cs
@@ -187,7 +187,7 @@ private unsafe void CheckChild(bool parse = true, bool map = false) {
 
             switch ((parse ? 1 : 0) | (map ? 2 : 0)) {
                 case 1:
-                    for (uint i = _nodeData->FirstChildID; i < end; ++i, ++start) _file._nodes[i] = ParseNode(start, this, _file);
+                    for (uint i = _nodeData->FirstChildID; i < end; ++i, ++start) if(_file._nodes[i] == null) _file._nodes[i] = ParseNode(start, this, _file);
                     _childinit = true;
                     break;
                 case 2:
@@ -196,7 +196,9 @@ private unsafe void CheckChild(bool parse = true, bool map = false) {
                     break;
                 case 3:
                     _children = new Dictionary<string, NXNode>(_nodeData->ChildCount);
-                    for (uint i = _nodeData->FirstChildID; i < end; ++i, ++start) AddChild(_file._nodes[i] = ParseNode(start, this, _file));
+                    for (uint i = _nodeData->FirstChildID; i < end; ++i, ++start)
+                        if (_file._nodes[i] == null) AddChild(_file._nodes[i] = ParseNode(start, this, _file));
+                        else AddChild(_file._nodes[i]);
                     _childinit = true;
                     break;
                 default:

diff --git a/reNX.csproj b/reNX.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>reNX</RootNamespace>
     <AssemblyName>reNX</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -32,6 +32,7 @@
     <CodeAnalysisRuleDirectories>;D:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules;D:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <NoWarn>1584</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <OutputPath>bin\Release\</OutputPath>
@@ -52,6 +53,7 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <DocumentationFile>bin\Release\reNX.XML</DocumentationFile>
     <NoWarn>1584</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />