From: Oliver O. <fr...@us...> - 2007-06-17 10:58:13
|
Update of /cvsroot/simspark/simspark/spark/kerosin/inputserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31344 Modified Files: Tag: projectx inputserver.cpp Log Message: - added debug code (not compiled by default) Index: inputserver.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputserver.cpp,v retrieving revision 1.2.2.1.2.1 retrieving revision 1.2.2.1.2.2 diff -C2 -d -r1.2.2.1.2.1 -r1.2.2.1.2.2 *** inputserver.cpp 1 Jun 2007 12:45:06 -0000 1.2.2.1.2.1 --- inputserver.cpp 17 Jun 2007 10:58:05 -0000 1.2.2.1.2.2 *************** *** 312,315 **** --- 312,316 ---- if (bind.modifier == mModifierState) { + #if 0 if (input.mType == Input::eButton) { *************** *** 318,326 **** (bind.event == eKeyDown && input.mData.l == 1) ) ! { ! input.mId = bind.cmd; ! return true; ! } ! } else if (input.mType == Input::eAxis) { --- 319,335 ---- (bind.event == eKeyDown && input.mData.l == 1) ) ! #else ! const Bind& bind = (*bindIter); ! ! //printf("Looking at: %d %d %d", (*bind).mCode, (*bind).cmd, (*bind).modifier); ! if ( ! (bind.modifier == 0 && mModifierState == 0) || ! (bind.modifier & mModifierState) ! ) ! #endif ! { ! input.mId = bind.cmd; ! return true; ! } else if (input.mType == Input::eAxis) { |