Changeset 9988 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/collision_filter.cc
- Timestamp:
- Dec 3, 2006, 4:55:19 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/coll_rect/src/lib/collision_reaction/collision_filter.cc
r9980 r9988 21 21 #include "collision.h" 22 22 #include "collision_event.h" 23 #include "collision_reaction.h"24 23 25 #include "cr_object_damage.h"26 #include "cr_physics_ground_walk.h"27 #include "cr_physics_full_walk.h"28 24 29 25 #include "debug.h" … … 112 108 if( likely(this->validCRType( type))) 113 109 this->_filters[type].clear(); 110 111 for( int i = 0; i < CREngine::CR_NUMBER; i++) 112 { 113 if( this->_filters[i].size() > 0) 114 { 115 this->_bReactive = true; 116 break; 117 } 118 } 119 114 120 } 115 121 … … 121 127 for(int i = 0; i < CREngine::CR_NUMBER; i++) 122 128 this->_filters[i].clear(); 129 130 this->_bReactive = false; 123 131 } 124 132 … … 135 143 { 136 144 // if there are no installed criterions just ommit and 137 if( this-> bReactive())145 if( this->isReactive()) 138 146 return false; 139 147 … … 142 150 { 143 151 TargetIterator it = this->_filters[i].begin(); 144 for(; it != this->_filters[i].end(); i++ ) 145 if( unlikely(entity.isA(*it))) 146 return true; 152 153 154 // for(; it != this->_filters[i].end(); i++ ) 155 // if( unlikely(entity.isA(*it) ) ) 156 // return true; 147 157 } 148 158 … … 161 171 { 162 172 // if there are no installed criterions just omit and return 163 if( !this-> bReactive())173 if( !this->isReactive()) 164 174 return false; 165 175
Note: See TracChangeset
for help on using the changeset viewer.