From 9ac0b68981f46052c518cf0c30c4f6f8561008ef Mon Sep 17 00:00:00 2001
From: Walzer <wangzhe@cocos2d-x.org>
Date: Mon, 21 May 2012 17:56:09 +0800
Subject: [PATCH] modify CCBReader.cpp to CCBReader_v2.cpp in vcproj/vcxproj.

---
 .../extensions/CCBReader/CCBReader_v2.cpp     |  6 +++---
 cocos2dx/proj.win32/cocos2d-win32.vcproj      | 20 +++++++++++++++++++
 cocos2dx/proj.win32/cocos2d-win32.vcxproj     |  2 +-
 .../proj.win32/cocos2d-win32.vcxproj.filters  |  2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 cocos2dx/proj.win32/cocos2d-win32.vcproj
 mode change 100644 => 100755 cocos2dx/proj.win32/cocos2d-win32.vcxproj
 mode change 100644 => 100755 cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters

diff --git a/cocos2dx/extensions/CCBReader/CCBReader_v2.cpp b/cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
index 74a1446b9d..f82b7dbbd9 100644
--- 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
old mode 100644
new mode 100755
index 125b6d13da..901aef7562
--- 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
old mode 100644
new mode 100755
index f87cf9cf7f..f81dfd595c
--- 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
old mode 100644
new mode 100755
index 5826d5ec70..4b8b744c77
--- 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>