Merge pull request #903 from walzer/gles20

add CCBReader_v2.cpp in vcproj & vcxproj
cocos2d · May 21, 2012 · 2266a04 · 2266a04
2 parents 5968945 + 3949a15
commit 2266a04
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/cocos2dx/extensions/CCBReader/CCBReader_v2.cpp b/cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
@@ -34,19 +34,19 @@ USING_NS_CC_EXT;
 int CCBReader::intValFromDict(CCDictionary* dict, const std::string key)
 {
 	CCString* valueString = (CCString*) dict->objectForKey(key.c_str());
-	return valueString->intValue();
+	return valueString? valueString->intValue() : 0;
 }
 
 float CCBReader::floatValFromDict(CCDictionary* dict, const std::string key)
 {
 	CCString* valueString = (CCString*) dict->objectForKey(key.c_str());
-    return valueString->floatValue();
+    return valueString? valueString->floatValue() : 0;
 }
 
 bool CCBReader::boolValFromDict(CCDictionary* dict, const std::string key)
 {
 	CCString* valueString = (CCString*) dict->objectForKey(key.c_str());
-    return (bool) valueString->intValue();
+    return valueString? ((bool)(valueString->intValue())) : false;
 }
 
 CCPoint CCBReader::pointValFromDict(CCDictionary* dict, const std::string key)

diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcproj b/cocos2dx/proj.win32/cocos2d-win32.vcproj
@@ -1231,6 +1231,26 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="CCBReader"
+				>
+				<File
+					RelativePath="..\extensions\CCBReader\CCBCustomClass.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\extensions\CCBReader\CCBCustomClass.h"
+					>
+				</File>
+				<File
+					RelativePath="..\extensions\CCBReader\CCBReader.h"
+					>
+				</File>
+				<File
+					RelativePath="..\extensions\CCBReader\CCBReader_v2.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="kazmath"

diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj b/cocos2dx/proj.win32/cocos2d-win32.vcxproj
@@ -161,7 +161,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
     <ClCompile Include="..\effects\CCGrabber.cpp" />
     <ClCompile Include="..\effects\CCGrid.cpp" />
     <ClCompile Include="..\extensions\CCBReader\CCBCustomClass.cpp" />
-    <ClCompile Include="..\extensions\CCBReader\CCBReader.cpp" />
+    <ClCompile Include="..\extensions\CCBReader\CCBReader_v2.cpp" />
     <ClCompile Include="..\extensions\CCControlExtension\CCControl.cpp" />
     <ClCompile Include="..\extensions\CCControlExtension\CCControlButton.cpp" />
     <ClCompile Include="..\extensions\CCControlExtension\CCControlColourPicker.cpp" />

diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
@@ -486,7 +486,7 @@
     <ClCompile Include="..\extensions\CCBReader\CCBCustomClass.cpp">
       <Filter>extensions\CCBReader</Filter>
     </ClCompile>
-    <ClCompile Include="..\extensions\CCBReader\CCBReader.cpp">
+    <ClCompile Include="..\extensions\CCBReader\CCBReader_v2.cpp">
       <Filter>extensions\CCBReader</Filter>
     </ClCompile>
   </ItemGroup>