tidy project layout

Blu3wolf · Dec 15, 2017 · 2e911cf · 2e911cf
1 parent 5f70cff
commit 2e911cf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/3DDBBuilderGUI/3DDBBuilderGUI.csproj b/3DDBBuilderGUI/3DDBBuilderGUI.csproj
@@ -103,7 +103,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="bin\Debug\B.BMP" />
+    <Content Include="3ddb_builder.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/3DDBBuilderGUI/3ddb_builder.exe b/3DDBBuilderGUI/3ddb_builder.exe
diff --git a/3DDBBuilderGUI/MainWindow.xaml.cs b/3DDBBuilderGUI/MainWindow.xaml.cs
@@ -575,9 +575,11 @@ private void SetTextureNumberButton_Click(object sender, RoutedEventArgs e)
                 string path = dir + @"\" + TextureNumber.ToString() + ".BMP";
                 WriteTexture(path);
             }
-            else // a texture file already exists
+            else // a texture file already exists - likely case is that a single texture file already exists
             {
                 // rename it to a new name I guess
+                string message = "A texture file already exists in the source /Textures folder. Please delete it and try again.";
+                MessageBox.Show(message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
     }

diff --git a/3DDBBuilderGUI/Properties/Resources.Designer.cs b/3DDBBuilderGUI/Properties/Resources.Designer.cs