fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.

Author: natural-law

cocos2dx/include/CCSpriteFrameCache.h

@@ -136,7 +136,7 @@ class CC_DLL CCSpriteFrameCache : public CCObject
 
 protected:
 	CCDictionary<std::string, CCSpriteFrame*> *m_pSpriteFrames;
-	CCDictionary<std::string, CCSpriteFrame*> *m_pSpriteFramesAliases;
+	CCDictionary<std::string, CCString*> *m_pSpriteFramesAliases;
 };
 }//namespace   cocos2d 
 

cocos2dx/platform/CCFileUtils.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 #include "CCFileUtils.h"
 
-#if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS && CC_TARGET_PLATFORM != CC_PLATFORM_AIRPLAY)
+#if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) && (CC_TARGET_PLATFORM != CC_PLATFORM_AIRPLAY)
 
 #include <stack>
 #include <libxml/parser.h>
@@ -55,12 +55,18 @@ class CCDictMaker : public CCSAXDelegator
     std::stack<CCDictionary<std::string, CCObject*>*> m_tDictStack;
     std::string m_sCurKey;///< parsed key
     CCSAXState m_tState;
+    bool    m_bInArray;
+    CCMutableArray<CCObject*> *m_pArray;
+
 public:
     CCDictMaker()
     {
         m_pRootDict = NULL;
         m_pCurDict = NULL;
         m_tState = SAX_NONE;
+
+        m_pArray = NULL;
+        m_bInArray = false;
     }
     ~CCDictMaker()
     {
@@ -119,6 +125,11 @@ class CCDictMaker : public CCSAXDelegator
         }
         else
         {
+            if (sName == "array")
+            {
+                m_bInArray = true;
+                m_pArray = new CCMutableArray<CCObject*>();
+            }
             m_tState = SAX_NONE;
         }
     }
@@ -134,6 +145,14 @@ class CCDictMaker : public CCSAXDelegator
                 m_pCurDict = (CCDictionary<std::string, CCObject*>*)(m_tDictStack.top());
             }
         }
+        else if (sName == "array")
+        {
+            CCAssert(m_bInArray, "The plist file is wrong!");
+            m_pCurDict->setObject(m_pArray, m_sCurKey);
+            m_pArray->release();
+            m_pArray = NULL;
+            m_bInArray = false;
+        }
         m_tState = SAX_NONE;
     }
 
@@ -156,7 +175,15 @@ class CCDictMaker : public CCSAXDelegator
         case SAX_STRING:
             {
                 CCAssert(!m_sCurKey.empty(), "not found key : <integet/real>");
-                m_pCurDict->setObject(pText, m_sCurKey);
+
+                if (m_bInArray)
+                {
+                    m_pArray->addObject(pText);
+                }
+                else
+                {
+                    m_pCurDict->setObject(pText, m_sCurKey);
+                }
                 break;
             }
         }

cocos2dx/sprite_nodes/CCSpriteFrameCache.cpp

@@ -58,7 +58,7 @@ void CCSpriteFrameCache::purgeSharedSpriteFrameCache(void)
 bool CCSpriteFrameCache::init(void)
 {
 	m_pSpriteFrames= new CCDictionary<std::string, CCSpriteFrame*>();
-	m_pSpriteFramesAliases = new CCDictionary<std::string, CCSpriteFrame*>();
+	m_pSpriteFramesAliases = new CCDictionary<std::string, CCString*>();
 	return true;
 }
 
@@ -155,10 +155,6 @@ void CCSpriteFrameCache::addSpriteFramesWithDictionary(CCDictionary<std::string,
 		} else
 		if (format == 3)
 		{
-			/// @todo what's the format look like?
-			assert(false);
-			return;
-			/*
 			// get values
 			CCSize spriteSize = CCSizeFromString(valueForKey("spriteSize", frameDict));
 			CCPoint spriteOffset = CCPointFromString(valueForKey("spriteOffset", frameDict));
@@ -167,19 +163,28 @@ void CCSpriteFrameCache::addSpriteFramesWithDictionary(CCDictionary<std::string,
 			bool textureRotated = atoi(valueForKey("textureRotated", frameDict)) == 0;
 
 			// get aliases
-			CCMutableArray<CCString*> *aliases = CCMutableArray<CCString*>dictionary->objectForKey(std::string("aliases"));
-
-			while( alias = (CCDictionary<std::string, CCObject*>*)aliases->next(&key) )
-			{
-				std::string value = ((CCString*)alias->objectForKey(key))->m_sString();
-				if (m_pSpriteFramesAliases->objectForKey(value))
-				{
-					CCLOG("cocos2d: WARNING: an alias with name %s already exists", value.c_str());
-				}
-
-				m_pSpriteFramesAliases->setObject(frameDict, value);
-			}
-			*/
+			CCMutableArray<CCString*> *aliases = (CCMutableArray<CCString*> *) (frameDict->objectForKey(std::string("aliases")));
+            CCMutableArray<CCString*>::CCMutableArrayIterator iter;
+
+            CCString * frameKey = new CCString(key.c_str());
+            for (iter = aliases->begin(); iter != aliases->end(); iter++)
+            {
+                std::string oneAlias = ((CCString*) (*iter))->m_sString;
+                if (m_pSpriteFramesAliases->objectForKey(oneAlias))
+                {
+                    CCLOG("cocos2d: WARNING: an alias with name %s already exists", oneAlias.c_str());
+                }
+
+                m_pSpriteFramesAliases->setObject(frameKey, oneAlias);
+            }
+            frameKey->release();
+            // create frame
+            spriteFrame = new CCSpriteFrame();
+            spriteFrame->initWithTexture(pobTexture,
+                            CCRectMake(textureRect.origin.x, textureRect.origin.y, spriteSize.width, spriteSize.height),
+                            textureRotated,
+                            spriteOffset,
+                            spriteSourceSize);
 		}
 
 		// add sprite frame

tests/tests/SpriteTest/SpriteTest.cpp.REMOVED.git-id

@@ -1 +1 @@
-1df0bf26583b2b3cfde43364d98d925393dddb51
+9e16647d99e1705b6436f4764cfacc6a478d3715