Changeset 11493 for code/trunk/src/modules/hover/HoverOrigin.cc
- Timestamp:
- Oct 16, 2017, 4:07:37 PM (7 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/tgidronFS16 (added) merged: 11140,11151,11163,11168-11169,11171,11177,11182,11184,11192,11196,11198,11201
- Property svn:mergeinfo changed
-
code/trunk/src/modules/hover/HoverOrigin.cc
r11071 r11493 23 23 * Manuel Meier 24 24 * Co-authors: 25 * ...25 * Tomer Gidron 26 26 * 27 27 */ … … 45 45 RegisterObject(HoverOrigin); 46 46 checkGametype(); 47 48 //Initialization of variables (not really needed) 49 50 pickupTemplate_ = ""; 51 pickupRepresentationTemplate_ = ""; 52 53 pickupTemplateSpeed_ = ""; 54 pickupRepresentationTemplateSpeed_ = ""; 55 56 57 pickupTemplateShrink_ = ""; 58 pickupRepresentationTemplateShrink_ = ""; 47 59 } 48 60 … … 54 66 XMLPortParam(HoverOrigin, "cellSize", setCellSize, getCellSize, xmlelement, mode); 55 67 XMLPortParam(HoverOrigin, "cellHeight", setCellHeight, getCellHeight, xmlelement, mode); 68 XMLPortParam(HoverOrigin, "wallThickness", setWallThickness, getWallThickness, xmlelement, mode); 69 XMLPortParam(HoverOrigin, "pickuptemplate", setPickupTemplate, getPickupTemplate, xmlelement, mode); 70 XMLPortParam(HoverOrigin, "pickuprepresentationtemplate", setPickupRepresentationTemplate, getPickupRepresentationTemplate, xmlelement, mode); 71 XMLPortParam(HoverOrigin, "pickuptemplatespeed", setPickupTemplateSpeed, getPickupTemplateSpeed, xmlelement, mode); 72 XMLPortParam(HoverOrigin, "pickuprepresentationtemplatespeed", setPickupRepresentationTemplateSpeed, getPickupRepresentationTemplateSpeed, xmlelement, mode); 73 XMLPortParam(HoverOrigin, "obstacletemplate", setObstacleTemplate, getObstacleTemplate, xmlelement, mode); 74 XMLPortParam(HoverOrigin, "pickuptemplateshrink", setPickupTemplateShrink, getPickupTemplateShrink, xmlelement, mode); 75 XMLPortParam(HoverOrigin, "pickuprepresentationtemplateshrink", setPickupRepresentationTemplateShrink, getPickupRepresentationTemplateShrink, xmlelement, mode); 76 XMLPortParam(HoverOrigin, "groundtemplate", setGroundTemplate, getGroundTemplate, xmlelement, mode); 56 77 } 78 57 79 58 80 void HoverOrigin::checkGametype()
Note: See TracChangeset
for help on using the changeset viewer.