Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

works on win32 

std::iterators weren't used correctly
This commit is contained in:
Ricardo Quesada 2014-10-02 15:46:47 -07:00
parent 1db29f07bd
commit cc3df75d1f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/base/CCConfiguration.cpp
View File

@ -334,19 +334,19 @@ void Configuration::loadConfigFile(const std::string& filename)
//light info //light info
std::string name = "cocos2d.x.3d.max_dir_light_in_shader"; std::string name = "cocos2d.x.3d.max_dir_light_in_shader";
if (_valueDict.find(name) != dataMap.end()) if (_valueDict.find(name) != _valueDict.end())
_maxDirLightInShader = _valueDict[name].asInt(); _maxDirLightInShader = _valueDict[name].asInt();
else else
_valueDict[name] = Value(_maxDirLightInShader); _valueDict[name] = Value(_maxDirLightInShader);
name = "cocos2d.x.3d.max_point_light_in_shader"; name = "cocos2d.x.3d.max_point_light_in_shader";
if (_valueDict.find(name) != dataMap.end()) if (_valueDict.find(name) != _valueDict.end())
_maxPointLightInShader = _valueDict[name].asInt(); _maxPointLightInShader = _valueDict[name].asInt();
else else
_valueDict[name] = Value(_maxPointLightInShader); _valueDict[name] = Value(_maxPointLightInShader);
name = "cocos2d.x.3d.max_spot_light_in_shader"; name = "cocos2d.x.3d.max_spot_light_in_shader";
if (_valueDict.find(name) != dataMap.end()) if (_valueDict.find(name) != _valueDict.end())
_maxSpotLightInShader = _valueDict[name].asInt(); _maxSpotLightInShader = _valueDict[name].asInt();
else else
_valueDict[name] = Value(_maxSpotLightInShader); _valueDict[name] = Value(_maxSpotLightInShader);