Browse Source

"and" and "or" keywords aren't valid C++

rdb 14 years ago
parent
commit
81513a83cd
1 changed files with 1 additions and 1 deletions
  1. 1 1
      panda/src/rocket/rocketInputHandler.cxx

+ 1 - 1
panda/src/rocket/rocketInputHandler.cxx

@@ -242,7 +242,7 @@ do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input,
 
 
       case ButtonEvent::T_keystroke:
       case ButtonEvent::T_keystroke:
         // Ignore control characters; otherwise, they actually get added to strings in the UI.
         // Ignore control characters; otherwise, they actually get added to strings in the UI.
-        if (be._keycode > 0x1F and (be._keycode < 0x7F or be._keycode > 0x9F)) {
+        if (be._keycode > 0x1F && (be._keycode < 0x7F || be._keycode > 0x9F)) {
           _text_input.push_back(be._keycode);
           _text_input.push_back(be._keycode);
         }
         }
         break;
         break;