Skip to content

Commit 2a0dd66

Browse files
Remove unneeded error check
1 parent 8a174ed commit 2a0dd66

File tree

3 files changed

+66
-19
lines changed

3 files changed

+66
-19
lines changed

.vscode/launch.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
// Use IntelliSense to find out which attributes exist for C# debugging
6+
// Use hover for the description of the existing attributes
7+
// For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
8+
"name": ".NET Core Launch (console)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "${workspaceFolder}/bin/Debug/net7.0/win-x64/Sharpii.dll",
14+
"args": [],
15+
"cwd": "${workspaceFolder}",
16+
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
17+
"console": "internalConsole",
18+
"stopAtEntry": false
19+
},
20+
{
21+
"name": ".NET Core Attach",
22+
"type": "coreclr",
23+
"request": "attach"
24+
}
25+
]
26+
}

.vscode/tasks.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,42 @@
9696
"${workspaceFolder}/Releases/Sharpii-OSX-ARM64"
9797
],
9898
"problemMatcher": "$msCompile"
99+
},
100+
{
101+
"label": "build",
102+
"command": "dotnet",
103+
"type": "process",
104+
"args": [
105+
"build",
106+
"${workspaceFolder}/Sharpii.sln",
107+
"/property:GenerateFullPaths=true",
108+
"/consoleloggerparameters:NoSummary"
109+
],
110+
"problemMatcher": "$msCompile"
111+
},
112+
{
113+
"label": "publish",
114+
"command": "dotnet",
115+
"type": "process",
116+
"args": [
117+
"publish",
118+
"${workspaceFolder}/Sharpii.sln",
119+
"/property:GenerateFullPaths=true",
120+
"/consoleloggerparameters:NoSummary"
121+
],
122+
"problemMatcher": "$msCompile"
123+
},
124+
{
125+
"label": "watch",
126+
"command": "dotnet",
127+
"type": "process",
128+
"args": [
129+
"watch",
130+
"run",
131+
"--project",
132+
"${workspaceFolder}/Sharpii.sln"
133+
],
134+
"problemMatcher": "$msCompile"
99135
}
100136
]
101137
}

Sharpii/HBC.cs

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -219,22 +219,6 @@ public static bool SendWad_Check(string[] args)
219219
return false;
220220
}
221221

222-
if (!File.Exists(Path.Combine(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory), "WadInstaller.dll")))
223-
{
224-
Console.WriteLine("ERROR: WadInstaller.dll not found");
225-
Console.WriteLine("This should not appear on the .Net Core port.");
226-
Console.WriteLine("If you see this, report how you got here on https://github.com/TheShadowEevee/Sharpii-NetCore/issues.");
227-
Console.WriteLine("Error: SHARPII_NET_CORE_HBC_MISSING_DLL_WADINSTALLER");
228-
if (OperatingSystem.Windows())
229-
{
230-
Environment.Exit(0x00003E85);
231-
}
232-
else
233-
{
234-
Environment.Exit(0x00000007);
235-
}
236-
}
237-
238222
return true;
239223
}
240224

@@ -439,14 +423,15 @@ private static void SendDol_help()
439423
Console.WriteLine("");
440424
Console.WriteLine(" Usage:");
441425
Console.WriteLine("");
442-
Console.WriteLine(" Sharpii.exe SendDol -ip ip_adress [-old] [-nocomp] [-saveip]");
443-
Console.WriteLine(" -dol file [args]");
426+
Console.WriteLine(" Sharpii.exe SendDol -ip ip_address [-old] [-nocomp] [-saveip]");
427+
Console.WriteLine(" [-dol/-wad] file [args]");
444428
Console.WriteLine("");
445429
Console.WriteLine("");
446430
Console.WriteLine(" Arguments:");
447431
Console.WriteLine("");
448432
Console.WriteLine(" -dol file The dol file to send");
449-
Console.WriteLine(" -ip ip_adress The IP address of your wii");
433+
Console.WriteLine(" -wad file The wad file to send");
434+
Console.WriteLine(" -ip ip_address The IP address of your wii");
450435
Console.WriteLine(" -saveip Save entered IP address for future use");
451436
Console.WriteLine(" -old Use for the old (1.0.4 and below) HBC");
452437
Console.WriteLine(" -nocomp Disable compression");

0 commit comments

Comments
 (0)