Skip to content

Commit

Permalink
Updated to 1.7.2 - Fixed a bug that would prevent you from changing a…
Browse files Browse the repository at this point in the history
… wad type

                  - Wad info now also displays the full, 16-character Title ID
  • Loading branch information
[email protected] committed Feb 16, 2013
1 parent a4f73b4 commit 827d778
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 50 deletions.
2 changes: 1 addition & 1 deletion Sharpii/BNS.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This file is part of Sharpii.
* Copyright (C) 2011 Person66
* Copyright (C) 2013 Person66
*
* Sharpii is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion Sharpii/HBC.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This file is part of Sharpii.
* Copyright (C) 2011 Person66
* Copyright (C) 2013 Person66
*
* Sharpii is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion Sharpii/IOS.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This file is part of Sharpii.
* Copyright (C) 2011 Person66
* Copyright (C) 2013 Person66
*
* Sharpii is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion Sharpii/NUSD.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This file is part of Sharpii.
* Copyright (C) 2011 Person66
* Copyright (C) 2013 Person66
*
* Sharpii is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions Sharpii/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This file is part of Sharpii.
* Copyright (C) 2011 Person66
* Copyright (C) 2013 Person66
*
* Sharpii is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -321,5 +321,5 @@ public class Quiet {
}
public class Version
{
public static string version = "1.7.1";
public static string version = "1.7.2";
}
6 changes: 3 additions & 3 deletions Sharpii/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Sharpii")]
[assembly: AssemblyCopyright("2011 person66")]
[assembly: AssemblyCopyright("2013 person66")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.6")]
[assembly: AssemblyFileVersion("1.6")]
[assembly: AssemblyVersion("1.7.2")]
[assembly: AssemblyFileVersion("1.7.2")]
8 changes: 6 additions & 2 deletions Sharpii/README.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/------------------------------------------------------------------------------>
Sharpii 1.7.1
Sharpii 1.7.2
<---------------------------------------------------------------->
An app by person66
libWiiSharp.dll by leathl (mod by scooby74029)
Expand Down Expand Up @@ -145,6 +145,10 @@ See "LICENSE.txt" for more information.
/----CHANGELOG
/------------------------------>

1.7.2
- I am not dead! Yay!
- Fixed a bug that would prevent you from changing a wad type
- Wad info now also displays the full, 16-character Title ID
1.7.1
- Fixed a bug that prevented Sharpii from checking for SharpiiIP
in the system variables
Expand All @@ -157,7 +161,7 @@ See "LICENSE.txt" for more information.
- SendWad now supports AHBPROT (use '-ahb')
- IP can now be saved in an environmental variable (SharpiiIP)
for both SendWad and SendDol (manually or with '-saveip')
- Pointless aster eggs are fun!
- Pointless easter eggs are fun!
- Code cleanup/bug fixes
1.5
- Added the ability to send WADs to the HBC using SendWad
Expand Down
25 changes: 0 additions & 25 deletions Sharpii/Sharpii.csproj.user

This file was deleted.

2 changes: 1 addition & 1 deletion Sharpii/TPL.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This file is part of Sharpii.
* Copyright (C) 2011 Person66
* Copyright (C) 2013 Person66
*
* Sharpii is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion Sharpii/U8.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This file is part of Sharpii.
* Copyright (C) 2011 Person66
* Copyright (C) 2013 Person66
*
* Sharpii is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
33 changes: 21 additions & 12 deletions Sharpii/WAD.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This file is part of Sharpii.
* Copyright (C) 2011 Person66
* Copyright (C) 2013 Person66
*
* Sharpii is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -153,6 +153,7 @@ private static void Info(string[] args)
Console.WriteLine(" Korean: {0}\n", wad.ChannelTitles[7]);
}
Console.WriteLine("Title ID: {0}", wad.UpperTitleID);
Console.WriteLine("Full Title ID: {0}", wad.TitleID.ToString("X16").Substring(0, 8) + "-" + wad.TitleID.ToString("X16").Substring(8));
Console.WriteLine("IOS: {0}", ((int)wad.StartupIOS).ToString());
Console.WriteLine("Region: {0}", wad.Region);
Console.WriteLine("Version: {0}", wad.TitleVersion);
Expand Down Expand Up @@ -184,6 +185,7 @@ private static void Info(string[] args)
txt.WriteLine(" Korean: {0}", wad.ChannelTitles[7]);
}
txt.WriteLine("Title ID: {0}", wad.UpperTitleID);
txt.WriteLine("Full Title ID: {0}", wad.TitleID.ToString("X16").Substring(0, 8) + "-" + wad.TitleID.ToString("X16").Substring(8));
txt.WriteLine("IOS: {0}", ((int)wad.StartupIOS).ToString());
txt.WriteLine("Region: {0}", wad.Region);
txt.WriteLine("Version: {0}", wad.TitleVersion);
Expand Down Expand Up @@ -262,8 +264,8 @@ private static void Editor(string[] args, bool edit)
Console.WriteLine("ERROR: No type set");
return;
}
lwrid = args[i + 1];
if (args[i + 1].ToUpper() != "CHANNEL" && args[i + 1].ToUpper() != "DLC" && args[i + 1].ToUpper() != "GAMECHANNEL" && args[i + 1].ToUpper() != "HIDDENCHANNELS" && args[i + 1].ToUpper() != "SYSTEMCHANNELS" && args[i + 1].ToUpper() != "SYSTEMTITLES")
lwrid = args[i + 1].ToUpper();
if (lwrid != "CHANNEL" && lwrid != "DLC" && lwrid != "GAMECHANNEL" && lwrid != "HIDDENCHANNELS" && lwrid != "SYSTEMCHANNELS" && lwrid != "SYSTEMTITLES")
{
Console.WriteLine("ERROR: Unknown WAD type: {0}", args[i + 1]);
return;
Expand Down Expand Up @@ -467,10 +469,17 @@ private static void Editor(string[] args, bool edit)
Console.WriteLine("FakeSigning WAD");
wad.FakeSign = fake;

if (id != "")
if (id != "" || lwrid != "")
{
if (Quiet.quiet > 2)
Console.WriteLine("Changing channel ID to: {0}", id);
if (id != "")
{
if (Quiet.quiet > 2)
Console.WriteLine("Changing channel ID to: {0}", id);
}
else
{
id = wad.UpperTitleID;
}

if (lwrid != "")
{
Expand All @@ -484,15 +493,15 @@ private static void Editor(string[] args, bool edit)

if (lwrid == "CHANNEL")
wad.ChangeTitleID(LowerTitleID.Channel, id);
if (lwrid == "DLC")
else if (lwrid == "DLC")
wad.ChangeTitleID(LowerTitleID.DLC, id);
if (lwrid == "GAMECHANNEL")
else if (lwrid == "GAMECHANNEL")
wad.ChangeTitleID(LowerTitleID.GameChannel, id);
if (lwrid == "HIDDENCHANNELS")
else if (lwrid == "HIDDENCHANNELS")
wad.ChangeTitleID(LowerTitleID.HiddenChannels, id);
if (lwrid == "SYSTEMCHANNELS")
else if (lwrid == "SYSTEMCHANNELS")
wad.ChangeTitleID(LowerTitleID.SystemChannels, id);
if (lwrid == "SYSTEMTITLES")
else if (lwrid == "SYSTEMTITLES")
wad.ChangeTitleID(LowerTitleID.SystemTitles, id);
}
if (ios > -1)
Expand Down Expand Up @@ -615,7 +624,7 @@ public static void WAD_help()
Console.WriteLine("");
Console.WriteLine(" Arguments for info:");
Console.WriteLine("");
Console.WriteLine(" -o output Output info to text file");
Console.WriteLine(" -o [output] Output info to text file");
Console.WriteLine(" -titles Display titles in all languages");
Console.WriteLine("");
Console.WriteLine(" Arguments for packing/editing:");
Expand Down

0 comments on commit 827d778

Please sign in to comment.