Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode

extensions/AssetsManager/AssetsManager.cpp

@@ -205,7 +205,11 @@ void AssetsManager::update()
     }
     
     // Check if there is a new version.
-    if (! checkUpdate()) return;
+    if (! checkUpdate())
+    {
+        _isDownloading = false;
+        return;
+    }
     
     // Is package already downloaded?
     _downloadedVersion = UserDefault::getInstance()->getStringForKey(KEY_OF_DOWNLOADED_VERSION);

extensions/CCBReader/CCBValue.cpp

@@ -1,7 +1,5 @@
 #include "CCBValue.h"
 
-using namespace cocos2d;
-
 NS_CC_EXT_BEGIN
 
 // Implementation of Color3BWapper
@@ -14,10 +12,10 @@ Color3BWapper* Color3BWapper::create(const Color3B& color)
         ret->color.r = color.r;
         ret->color.g = color.g;
         ret->color.b = color.b;
-        
+
         ret->autorelease();
     }
-    
+
     return ret;
 }
 
@@ -34,10 +32,10 @@ CCBValue* CCBValue::create(int nValue)
     if (ret)
     {
         ret->_value.intValue = nValue;
-        ret->_type = TYPE_INT;
+        ret->_type = Type::INT;
         ret->autorelease();
     }
-    
+
     return ret;
 }
 
@@ -47,10 +45,10 @@ CCBValue* CCBValue::create(float fValue)
     if (ret)
     {
         ret->_value.floatValue = fValue;
-        ret->_type = TYPE_FLOAT;
+        ret->_type = Type::FLOAT;
         ret->autorelease();
     }
-    
+
     return ret;
 }
 
@@ -60,10 +58,10 @@ CCBValue* CCBValue::create(bool vValue)
     if (ret)
     {
         ret->_value.intValue = vValue ? 1 : 0;
-        ret->_type = TYPE_BOOL;
+        ret->_type = Type::BOOL;
         ret->autorelease();
     }
-    
+
     return ret;
 }
 
@@ -73,10 +71,10 @@ CCBValue* CCBValue::create(unsigned char byte)
     if (ret)
     {
         ret->_value.intValue = byte;
-        ret->_type = TYPE_UNSIGNED_CHAR;
+        ret->_type = Type::UNSIGNED_CHAR;
         ret->autorelease();
     }
-    
+
     return ret;
 }
 
@@ -86,10 +84,10 @@ CCBValue* CCBValue::create(const char *pStringValue)
     if (ret)
     {
         ret->_strValue = pStringValue;
-        ret->_type = TYPE_STRING;
+        ret->_type = Type::STRING;
         ret->autorelease();
     }
-    
+
     return ret;
 }
 
@@ -100,54 +98,54 @@ CCBValue* CCBValue::create(Array *pArrValue)
     if (ret)
     {
         ret->_arrValue = pArrValue;
-        ret->_type = TYPE_ARRAY;
+        ret->_type = Type::ARRAY;
         ret->autorelease();
     }
-    
+
     return ret;
 }
 
 
 int CCBValue::getIntValue()
 {
-    CCASSERT(_type == TYPE_INT, "The type of CCBValue isn't integer.");
-    
+    CCASSERT(_type == Type::INT, "The type of CCBValue isn't integer.");
+
     return _value.intValue;
 }
 
 float CCBValue::getFloatValue()
 {
-    CCASSERT(_type == TYPE_FLOAT, "The type of CCBValue isn't float.");
-    
+    CCASSERT(_type == Type::FLOAT, "The type of CCBValue isn't float.");
+
     return _value.floatValue;
 }
 
 bool CCBValue::getBoolValue()
 {
-    CCASSERT(_type == TYPE_BOOL, "The type of CCBValue isn't boolean.");
-    
+    CCASSERT(_type == Type::BOOL, "The type of CCBValue isn't boolean.");
+
     return _value.intValue == 1 ? true : false;
 }
 
 unsigned char CCBValue::getByteValue()
 {
-    CCASSERT(_type == TYPE_UNSIGNED_CHAR, "The type of CCBValue isn't unsigned char.");
-    
+    CCASSERT(_type == Type::UNSIGNED_CHAR, "The type of CCBValue isn't unsigned char.");
+
     return (unsigned char)(_value.intValue);
 }
 
 Array* CCBValue::getArrayValue()
 {
-    CCASSERT(_type == TYPE_ARRAY, "The type of CCBValue isn't array.");
-    
+    CCASSERT(_type == Type::ARRAY, "The type of CCBValue isn't array.");
+
     return _arrValue;
 }
 
 
 const char* CCBValue::getStringValue()
 {
-    CCASSERT(_type == TYPE_STRING, "The type of CCBValue isn't string.");
-    
+    CCASSERT(_type == Type::STRING, "The type of CCBValue isn't string.");
+
     return _strValue.c_str();
 }
 

extensions/CCBReader/CCBValue.h

@@ -27,14 +27,14 @@ class CCBValue : public Object
 {
 public:
     
-    enum Type
+    enum class Type
     {
-        TYPE_INT,
-        TYPE_FLOAT,
-        TYPE_BOOL,
-        TYPE_UNSIGNED_CHAR,
-        TYPE_STRING,
-        TYPE_ARRAY
+        INT,
+        FLOAT,
+        BOOL,
+        UNSIGNED_CHAR,
+        STRING,
+        ARRAY
     };
     
     static CCBValue* create(int nValue);

extensions/CCDeprecated-ext.h

@@ -188,12 +188,12 @@ CC_DEPRECATED_ATTRIBUTE typedef Control::Handler SEL_CCControlHandler;
 
 // For CCBReader
 
-CC_DEPRECATED_ATTRIBUTE const int kIntValue = CCBValue::TYPE_INT;
-CC_DEPRECATED_ATTRIBUTE const int kFloatValue = CCBValue::TYPE_FLOAT;
-CC_DEPRECATED_ATTRIBUTE const int kBoolValue = CCBValue::TYPE_BOOL;
-CC_DEPRECATED_ATTRIBUTE const int kUnsignedCharValue = CCBValue::TYPE_UNSIGNED_CHAR;
-CC_DEPRECATED_ATTRIBUTE const int kStringValue = CCBValue::TYPE_STRING;
-CC_DEPRECATED_ATTRIBUTE const int kArrayValue = CCBValue::TYPE_ARRAY;
+CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kIntValue = CCBValue::Type::INT;
+CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kFloatValue = CCBValue::Type::FLOAT;
+CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kBoolValue = CCBValue::Type::BOOL;
+CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kUnsignedCharValue = CCBValue::Type::UNSIGNED_CHAR;
+CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kStringValue = CCBValue::Type::STRING;
+CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kArrayValue = CCBValue::Type::ARRAY;
 
 
 CC_DEPRECATED_ATTRIBUTE const CCBReader::PropertyType    kCCBPropTypePosition        = CCBReader::PropertyType::POSITION;

samples/Cpp/TestCpp/Classes/FileUtilsTest/FileUtilsTest.cpp

@@ -181,9 +181,9 @@ void TestSearchPath::onEnter()
     if (fp)
     {
         size_t ret = fwrite(szBuf, 1, strlen(szBuf), fp);
-        CCASSERT(ret == 0, "fwrite function returned nonzero value");
+        CCASSERT(ret != 0, "fwrite function returned zero value");
         fclose(fp);
-        if (ret == 0)
+        if (ret != 0)
             log("Writing file to writable path succeed.");
     }