Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 336 vs 337 for /trunk/Source Code/Dynamics/WeaponSystem/Weapons/Weapon.cpp

Diff revisions: vs.
  @@ -4,8 +4,8 @@
4 4
5 5 Weapon::Weapon(WeaponType type) : _type(type)
6 6 {
7 - /// no placeholders please
8 - assert(_type != WEAPON_TYPE_PLACEHOLDER);
7 + /// no placeholders please
8 + assert(_type != WEAPON_TYPE_PLACEHOLDER);
9 9 }
10 10
11 11 Weapon::~Weapon()
  @@ -13,9 +13,9 @@
13 13 }
14 14
15 15 bool Weapon::addProperties(U8 propertyMask){
16 - assert((propertyMask & ~(WEAPON_PROPERTY_PLACEHOLDER-1)) == 0);
17 - _properyMask |= static_cast<WeaponType>(propertyMask);
18 - return true;
16 + assert((propertyMask & ~(WEAPON_PROPERTY_PLACEHOLDER-1)) == 0);
17 + _properyMask |= static_cast<WeaponType>(propertyMask);
18 + return true;
19 19 }
20 20
21 21 };