Skip to content

Commit 63a04a3

Browse files
committed
fix: change nullptr to 0 for UnsignedInt return type in ternary operator
1 parent 7f9ab83 commit 63a04a3

File tree

1 file changed

+1
-1
lines changed
  • GeneralsMD/Code/GameEngine/Include/GameLogic

1 file changed

+1
-1
lines changed

GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class WeaponSet : public Snapshot
232232
const Weapon* findAmmoPipShowingWeapon() const;
233233
void weaponSetOnWeaponBonusChange(const Object *source);
234234
UnsignedInt getMostPercentReadyToFireAnyWeapon() const;
235-
inline UnsignedInt getNthCommandSourceMask( WeaponSlotType n ) const { return m_curWeaponTemplateSet ? m_curWeaponTemplateSet->getNthCommandSourceMask( n ) : nullptr; }
235+
inline UnsignedInt getNthCommandSourceMask( WeaponSlotType n ) const { return m_curWeaponTemplateSet ? m_curWeaponTemplateSet->getNthCommandSourceMask( n ) : 0; }
236236

237237
Bool setWeaponLock( WeaponSlotType weaponSlot, WeaponLockType lockType );
238238
void releaseWeaponLock(WeaponLockType lockType);

0 commit comments

Comments
 (0)