Changeset 893 for code/branches/input/src/orxonox/core/ClassTreeMask.cc

Timestamp:

Mar 13, 2008, 4:15:41 PM (16 years ago)

Author:

rgrieder

Message:

• merged trunk into input

File:

• code/branches/input/src/orxonox/core/ClassTreeMask.cc (modified) (6 diffs)

code/branches/input/src/orxonox/core/ClassTreeMask.cc

@@ -592 +592 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) or other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) || other.isIncluded(subclass), false, false);
         }
 
@@ -599 +599 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) or other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) || other.isIncluded(subclass), false, false);
         }
 
@@ -623 +623 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) and other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) && other.isIncluded(subclass), false, false);
         }
 
@@ -630 +630 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) and other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) && other.isIncluded(subclass), false, false);
         }
 
@@ -737 +737 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) xor other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) XOR other.isIncluded(subclass), false, false);
         }
 
@@ -744 +744 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) xor other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) XOR other.isIncluded(subclass), false, false);
         }