Merge pull request #1339 from charliewilliams/master

Fix loading files from full paths

Author: Birkemose

cocos2d/Support/CCFileUtils.m

@@ -549,7 +549,7 @@ - (void)loadFileNameLookupsInAllSearchPathsWithName:(NSString *)filename
 
 -(NSString*) fullPathForFilename:(NSString*)filename
 {
-	return [self fullPathForFilename:filename contentScale:NULL];
+	return [self fullPathForFilenameIgnoringResolutions:filename];
 }
 
 -(NSString*) fullPathForFilename:(NSString*)filename contentScale:(CGFloat *)contentScale
@@ -558,12 +558,10 @@ -(NSString*) fullPathForFilename:(NSString*)filename contentScale:(CGFloat *)con
 	if(!contentScale) contentScale = &_contentScale;
 
 	// fullpath? return it
-//	if ([filename isAbsolutePath]) {
-//		CCLOGWARN(@"cocos2d: WARNING fullPathForFilename:resolutionType: should not be called with absolute path. Instead call fullPathForFilenameIgnoringResolutions:");
-//		*contentScale = 1.0;
-//		NSLog(@"filename:%@, fullPath:%@, contentScale:%f", filename, filename, *contentScale);
-//		return filename;
-//	}
+	if ([filename isAbsolutePath]) {
+		CCLOGWARN(@"cocos2d: WARNING fullPathForFilename:resolutionType: should not be called with absolute path. Instead call fullPathForFilenameIgnoringResolutions:");
+        return filename;
+	}
 
 	// Already Cached ?
 	CCCacheValue *value = [_fullPathCache objectForKey:filename];