Changeset 1755 for code/trunk/src/core/Loader.cc
- Timestamp:
- Sep 10, 2008, 1:37:36 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/gui (added) merged: 1636,1638,1640-1647,1649-1654,1656,1659-1665,1670,1672-1674,1686,1688-1692,1694-1697,1704 /code/branches/input (added) merged: 1629-1630
- Property svn:mergeinfo changed
-
code/trunk/src/core/Loader.cc
r1747 r1755 65 65 void Loader::add(const Level* level, const ClassTreeMask& mask) 66 66 { 67 if (!level) 68 return; 67 69 Loader::levels_s.insert(Loader::levels_s.end(), std::pair<const Level*, ClassTreeMask>(level, mask)); 68 70 } … … 70 72 void Loader::remove(const Level* level) 71 73 { 74 if (!level) 75 return; 72 76 for (std::vector<std::pair<const Level*, ClassTreeMask> >::iterator it = Loader::levels_s.begin(); it != Loader::levels_s.end(); ++it) 73 77 { … … 109 113 bool Loader::load(const Level* level, const ClassTreeMask& mask) 110 114 { 115 if (!level) 116 return false; 117 111 118 Loader::currentMask_s = level->getMask() * mask; 112 119 … … 166 173 void Loader::unload(const Level* level, const ClassTreeMask& mask) 167 174 { 175 if (!level) 176 return; 168 177 for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; ) 169 178 {
Note: See TracChangeset
for help on using the changeset viewer.