Skip to content

Fixes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,7 @@ UpgradeLog*.XML
# Temp Data
*.orig
*temp.cs

.vs/Terraria/FileContentIndex/2bc66ed1-5c39-4797-9178-9006448fb9c9.vsidx

.vs/Terraria/FileContentIndex/read.lock
Binary file added .vs/Terraria/FileContentIndex/83ba434c-98ec-4cca-a90c-127204bad16d.vsidx
View file
Open in desktop
Binary file not shown.
19 changes: 15 additions & 4 deletions Terraria.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>916B1896-36A0-41DC-9D70-87D6E8DD2179</ProjectGuid>
<ProjectGuid>{916B1896-36A0-41DC-9D70-87D6E8DD2179}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<OutputType>WinExe</OutputType>
<AssemblyName>Terraria</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<WarningLevel>4</WarningLevel>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
<PlatformTarget>x86</PlatformTarget>
Expand All @@ -24,6 +25,13 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<Prefer32Bit>false</Prefer32Bit>
<DefineConstants>DEBUG</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Xna.Framework.Game" />
<Reference Include="System.Windows.Forms" />
Expand Down Expand Up @@ -69,5 +77,8 @@
<ItemGroup>
<EmbeddedResource Include="Microsoft.Xna.Framework.RuntimeProfile" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
20 changes: 12 additions & 8 deletions Terraria.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 4.3
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Terraria", "Terraria.csproj", "916B1896-36A0-41DC-9D70-87D6E8DD2179"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.33424.131
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Terraria", "Terraria.csproj", "{916B1896-36A0-41DC-9D70-87D6E8DD2179}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
916B1896-36A0-41DC-9D70-87D6E8DD2179.Debug|x86.Build.0 = Debug|x86
916B1896-36A0-41DC-9D70-87D6E8DD2179.Debug|x86.ActiveCfg = Debug|x86
916B1896-36A0-41DC-9D70-87D6E8DD2179.Release|x86.Build.0 = Release|x86
916B1896-36A0-41DC-9D70-87D6E8DD2179.Release|x86.ActiveCfg = Release|x86
{916B1896-36A0-41DC-9D70-87D6E8DD2179}.Debug|x86.ActiveCfg = Debug|x86
{916B1896-36A0-41DC-9D70-87D6E8DD2179}.Debug|x86.Build.0 = Debug|x86
{916B1896-36A0-41DC-9D70-87D6E8DD2179}.Release|x86.ActiveCfg = Release|x86
{916B1896-36A0-41DC-9D70-87D6E8DD2179}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
4,566 changes: 2,286 additions & 2,280 deletions Terraria/Main.cs
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions Terraria/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Windows.Forms;
namespace Terraria
{
internal static class Program
internal static class Program
{
private static void Main(string[] args)
{
Expand Down Expand Up @@ -67,13 +67,16 @@ private static void Main(string[] args)
{
try
{
using (StreamWriter streamWriter = new StreamWriter("client-crashlog.txt", true))
using (var streamWriter = new StreamWriter("client-crashlog.txt", true))
{
streamWriter.WriteLine(DateTime.Now);
streamWriter.WriteLine(ex);
streamWriter.WriteLine("/n");
}
#if DEBUG
throw;
#else
MessageBox.Show(ex.ToString(), "Terraria: Error");
#endif
}
catch
{
Expand Down
Loading