From b7a628d6fa475bc184715699f06a5a2efa0af2eb Mon Sep 17 00:00:00 2001 From: Nick Loose Date: Sat, 20 Nov 2010 13:50:07 +0100 Subject: [PATCH] Added image for unrecognized items --- Classes/IJInventoryItem.m | 14 +++++++++++--- Images/blockNotFound.png | Bin 0 -> 4802 bytes InsideJob.xcodeproj/project.pbxproj | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 Images/blockNotFound.png diff --git a/Classes/IJInventoryItem.m b/Classes/IJInventoryItem.m index 9966ea3..98ea1ac 100644 --- a/Classes/IJInventoryItem.m +++ b/Classes/IJInventoryItem.m @@ -62,6 +62,8 @@ NSUInteger itemsPerRow = 9; NSUInteger pixelsPerColumn = 36; NSUInteger pixelsPerRow = 56; + NSImage *atlas; + BOOL notFound = FALSE; int index = 0; @@ -93,7 +95,9 @@ else { NSLog(@"%s error: unrecognized item id %d", __PRETTY_FUNCTION__, itemId); - return nil; + index = 0; + atlasOffset = NSMakePoint(1, 30); + notFound = TRUE; } atlasOffset.x += pixelsPerColumn * (index % itemsPerRow); @@ -101,8 +105,12 @@ NSRect atlasRect = NSMakeRect(atlasOffset.x, atlasOffset.y, itemImageSize.width, itemImageSize.height); - - NSImage *atlas = [NSImage imageNamed:@"DataValuesV110Transparent.png"]; + if (notFound != TRUE) { + atlas = [NSImage imageNamed:@"DataValuesV110Transparent.png"]; + }else { + atlas = [NSImage imageNamed:@"blockNotFound.png"]; + } + NSImage *output = [[NSImage alloc] initWithSize:itemImageSize]; atlasRect.origin.y = atlas.size.height - atlasRect.origin.y; diff --git a/Images/blockNotFound.png b/Images/blockNotFound.png new file mode 100644 index 0000000000000000000000000000000000000000..b535f50b4945cf267f50b6e30811bbb3e2424019 GIT binary patch literal 4802 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 literal 0 HcmV?d00001 diff --git a/InsideJob.xcodeproj/project.pbxproj b/InsideJob.xcodeproj/project.pbxproj index 24e10a7..df3f747 100644 --- a/InsideJob.xcodeproj/project.pbxproj +++ b/InsideJob.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; + BA24598B1297428900F8B9C2 /* blockNotFound.png in Resources */ = {isa = PBXBuildFile; fileRef = BA24598A1297428900F8B9C2 /* blockNotFound.png */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -68,6 +69,7 @@ 66BCFE61125FCEC6005A23F4 /* DataValuesV110Transparent.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DataValuesV110Transparent.png; sourceTree = ""; }; 8D1107310486CEB800E47090 /* InsideJob-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "InsideJob-Info.plist"; sourceTree = ""; }; 8D1107320486CEB800E47090 /* Inside Job.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Inside Job.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + BA24598A1297428900F8B9C2 /* blockNotFound.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = blockNotFound.png; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -218,6 +220,7 @@ 66BC07711262823E005A23F4 /* Images */ = { isa = PBXGroup; children = ( + BA24598A1297428900F8B9C2 /* blockNotFound.png */, 66BCFE61125FCEC6005A23F4 /* DataValuesV110Transparent.png */, 66BCFC35125EA53E005A23F4 /* InsideJob.icns */, ); @@ -284,6 +287,7 @@ 66BCFC36125EA53E005A23F4 /* InsideJob.icns in Resources */, 66BCFE62125FCEC6005A23F4 /* DataValuesV110Transparent.png in Resources */, 66BC077312628257005A23F4 /* ItemPropertiesView.xib in Resources */, + BA24598B1297428900F8B9C2 /* blockNotFound.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };