Skip to content

Commit

Permalink
removed icon to remove even the slightest bit of legal trouble
Browse files Browse the repository at this point in the history
  • Loading branch information
Rubberduckycooly committed Jan 1, 2021
1 parent fe9edb2 commit 7ff9657
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 30 deletions.
14 changes: 8 additions & 6 deletions Sonic CD.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

/* Begin PBXBuildFile section */
C962193925898B0B00B47AB3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C962193625898B0A00B47AB3 /* Assets.xcassets */; };
C962193A25898B0B00B47AB3 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C962193725898B0A00B47AB3 /* Info.plist */; };
C962193E25898B6000B47AB3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C962193C25898B6000B47AB3 /* Main.storyboard */; };
C962196C25898BF600B47AB3 /* Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C962195625898BF500B47AB3 /* Audio.cpp */; };
C962196D25898BF600B47AB3 /* Debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C962195725898BF500B47AB3 /* Debug.cpp */; };
Expand Down Expand Up @@ -64,7 +63,6 @@
/* Begin PBXFileReference section */
C962191925898A9300B47AB3 /* Sonic CD.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Sonic CD.app"; sourceTree = BUILT_PRODUCTS_DIR; };
C962193625898B0A00B47AB3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = dependencies/mac/Assets.xcassets; sourceTree = SOURCE_ROOT; };
C962193725898B0A00B47AB3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = dependencies/mac/Info.plist; sourceTree = SOURCE_ROOT; };
C962193D25898B6000B47AB3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = dependencies/mac/Base.lproj/Main.storyboard; sourceTree = SOURCE_ROOT; };
C962194125898BCD00B47AB3 /* Text.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Text.hpp; path = SonicCDDecomp/Text.hpp; sourceTree = SOURCE_ROOT; };
C962194225898BCD00B47AB3 /* Script.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Script.hpp; path = SonicCDDecomp/Script.hpp; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -161,7 +159,6 @@
C962193F25898B6700B47AB3 /* Source Files */,
C962193C25898B6000B47AB3 /* Main.storyboard */,
C962193625898B0A00B47AB3 /* Assets.xcassets */,
C962193725898B0A00B47AB3 /* Info.plist */,
);
path = "Sonic CD";
sourceTree = "<group>";
Expand Down Expand Up @@ -332,7 +329,6 @@
buildActionMask = 2147483647;
files = (
C962193E25898B6000B47AB3 /* Main.storyboard in Resources */,
C962193A25898B0B00B47AB3 /* Info.plist in Resources */,
C962193925898B0B00B47AB3 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -501,8 +497,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "Sonic CD/Sonic_CD.entitlements";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/dependencies/mac",
Expand All @@ -517,8 +515,9 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "Rubberduckycooly.Sonic-CD";
PRODUCT_BUNDLE_IDENTIFIER = "RSDKv3.Sonic-CD";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
};
name = Debug;
};
Expand All @@ -527,8 +526,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "Sonic CD/Sonic_CD.entitlements";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/dependencies/mac",
Expand All @@ -543,8 +544,9 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "Rubberduckycooly.Sonic-CD";
PRODUCT_BUNDLE_IDENTIFIER = "RSDKv3.Sonic-CD";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
Expand Down
8 changes: 3 additions & 5 deletions SonicCDDecomp/Ini.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ IniParser::IniParser(const char *filename)

count = 0;

char pathBuffer[0x80];

char pathBuffer[0x200];
#if RETRO_PLATFORM == RETRO_OSX
if (!usingCWD)
sprintf(pathBuffer, "%s/%s",getResourcesPath(), filename);
sprintf(pathBuffer, "%s/%s",getResourcesPath(),filename);
else
sprintf(pathBuffer, "%s", filename);
#else
Expand Down Expand Up @@ -233,8 +232,7 @@ int IniParser::SetComment(const char *section, const char* key, const char *comm

void IniParser::Write(const char *filename)
{
char pathBuffer[0x80];

char pathBuffer[0x200];
#if RETRO_PLATFORM == RETRO_OSX
if (!usingCWD)
sprintf(pathBuffer, "%s/%s",getResourcesPath(),filename);
Expand Down
7 changes: 3 additions & 4 deletions SonicCDDecomp/Userdata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#if RETRO_PLATFORM == RETRO_WIN && _MSC_VER
#include <Windows.h>
#include <string>
#include <codecvt>
#include "../dependencies/windows/ValveFileVDF/vdf_parser.hpp"

Expand Down Expand Up @@ -125,7 +124,7 @@ void InitUserdata()
}
#endif

char buffer[0x100];
char buffer[0x200];
#if RETRO_PLATFORM == RETRO_OSX
if (!usingCWD)
sprintf(buffer, "%s/settings.ini", getResourcesPath());
Expand Down Expand Up @@ -357,7 +356,7 @@ void writeSettings() {

void ReadUserdata()
{
char buffer[0x100];
char buffer[0x200];
#if RETRO_PLATFORM == RETRO_OSX
if (!usingCWD)
sprintf(buffer, "%s/Udata.bin", getResourcesPath());
Expand Down Expand Up @@ -389,7 +388,7 @@ void ReadUserdata()

void WriteUserdata()
{
char buffer[0x100];
char buffer[0x200];
#if RETRO_PLATFORM == RETRO_OSX
if (!usingCWD)
sprintf(buffer, "%s/Udata.bin", getResourcesPath());
Expand Down
6 changes: 2 additions & 4 deletions SonicCDDecomp/Userdata.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ inline void SetGlobalVariableByName(const char *name, int value)

inline bool ReadSaveRAMData()
{
char buffer[0x100];
char buffer[0x200];
#if RETRO_PLATFORM == RETRO_OSX
if (!usingCWD)
sprintf(buffer, "%s/Sdata.bin",getResourcesPath());
Expand All @@ -63,7 +63,6 @@ inline bool ReadSaveRAMData()
#endif

// Temp(?)
saveRAM[32] = audioEnabled;
saveRAM[33] = bgmVolume;
saveRAM[34] = sfxVolume;

Expand All @@ -78,7 +77,7 @@ inline bool ReadSaveRAMData()

inline bool WriteSaveRAMData()
{
char buffer[0x100];
char buffer[0x200];
#if RETRO_PLATFORM == RETRO_OSX
if (!usingCWD)
sprintf(buffer, "%s/Sdata.bin",getResourcesPath());
Expand All @@ -93,7 +92,6 @@ inline bool WriteSaveRAMData()
return false;

//Temp
saveRAM[32] = audioEnabled;
saveRAM[33] = bgmVolume;
saveRAM[34] = sfxVolume;

Expand Down
Binary file removed SonicCDDecomp/win.ico
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 0 additions & 10 deletions dependencies/mac/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,61 +1,51 @@
{
"images" : [
{
"filename" : "CD2011Art-16.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "16x16"
},
{
"filename" : "CD2011Art-32.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
},
{
"filename" : "CD2011Art-33.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
},
{
"filename" : "CD2011Art-64.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
},
{
"filename" : "CD2011Art-128.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
},
{
"filename" : "CD2011Art-256.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
},
{
"filename" : "CD2011Art-257.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
},
{
"filename" : "CD2011Art-512.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
},
{
"filename" : "CD2011Art-513.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
},
{
"filename" : "CD2011Art-1024.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
Expand Down

0 comments on commit 7ff9657

Please sign in to comment.