- Timestamp:
- May 26, 2016, 4:53:34 PM (8 years ago)
- Location:
- code/branches/presentationFS16
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationFS16
- Property svn:mergeinfo changed
/code/branches/sagerjFS16 (added) merged: 11138,11142,11153,11164,11166,11170,11174-11175,11185,11189,11205
- Property svn:mergeinfo changed
-
code/branches/presentationFS16/src/orxonox/weaponsystem/WeaponSet.cc
r11071 r11208 60 60 } 61 61 62 void WeaponSet:: fire()62 void WeaponSet::push() 63 63 { 64 64 // Fire all WeaponPacks with their defined weaponmode 65 65 for (const auto& mapEntry : this->weaponpacks_) 66 66 if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED) 67 mapEntry.first->fire(mapEntry.second); 67 mapEntry.first->push(mapEntry.second); 68 } 69 70 void WeaponSet::release() 71 { 72 // Fire all WeaponPacks with their defined weaponmode 73 for (const auto& mapEntry : this->weaponpacks_) 74 if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED) 75 mapEntry.first->release(mapEntry.second); 68 76 } 69 77
Note: See TracChangeset
for help on using the changeset viewer.