Changeset 1455
- Timestamp:
- May 28, 2008, 7:06:19 PM (17 years ago)
- Location:
- code/branches/network/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network/src/core/InputManager.cc
r1446 r1455 662 662 ConfigValueContainer* cont = getIdentifier()->getConfigValueContainer("CoeffPos"); 663 663 assert(cont); 664 cont->set(getConvertedValue<int, std::string>(i) + " " 665 + getConvertedValue<float, std::string>(joySticksCalibration_[0].positiveCoeff[i])); 664 cont->set(i, joySticksCalibration_[0].positiveCoeff[i]); 666 665 667 666 // negative coefficient … … 676 675 cont = getIdentifier()->getConfigValueContainer("CoeffNeg"); 677 676 assert(cont); 678 cont->set(getConvertedValue<int, std::string>(i) + " " 679 + getConvertedValue<float, std::string>(joySticksCalibration_[0].negativeCoeff[i])); 677 cont->set(i, joySticksCalibration_[0].negativeCoeff[i]); 680 678 681 679 // zero states … … 697 695 cont = getIdentifier()->getConfigValueContainer("Zero"); 698 696 assert(cont); 699 cont->set(getConvertedValue<int, std::string>(i) + " " 700 + getConvertedValue<int, std::string>(joySticksCalibration_[0].zeroStates[i])); 697 cont->set(i, joySticksCalibration_[0].zeroStates[i]); 701 698 } 702 699 } -
code/branches/network/src/cpptcl/CppTcl.cc
r1446 r1455 953 953 954 954 { 955 if (callbacks.size() == 0) 956 return; 955 957 callback_map::iterator it = callbacks.find(interp); 956 958 if (it == callbacks.end()) -
code/branches/network/src/orxonox/console/InGameConsole.cc
r1446 r1455 86 86 InGameConsole::~InGameConsole(void) 87 87 { 88 for (int i = 0; i < LINES; i++)88 /*for (int i = 0; i < LINES; i++) 89 89 if (this->consoleOverlayTextAreas_[i]) 90 delete this->consoleOverlayTextAreas_[i];90 om_->destroyOverlayElement(this->consoleOverlayTextAreas_[i]); 91 91 92 92 if (this->consoleOverlayTextAreas_) 93 delete this->consoleOverlayTextAreas_;93 delete[] this->consoleOverlayTextAreas_;*/ 94 94 } 95 95
Note: See TracChangeset
for help on using the changeset viewer.