Mercurial > mm7

diff Items.h @ 2369:bddcaf5d5db2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removing non-nullptr conditions before frees, chaning 0 and NULL assignmnets to pointers to nullptr assignments
author Grumpy7
date Mon, 12 May 2014 01:50:32 +0200
parents 5d263539bbec
children 2b10278bc7ac
line wrap: on
line diff
--- a/Items.h	Mon May 12 00:13:39 2014 +0200
+++ b/Items.h	Mon May 12 01:50:32 2014 +0200
@@ -196,7 +196,7 @@
 {
   unsigned __int16 Player::* statPtr;
   int statBonus;
-  CEnchantment(int bonus, unsigned __int16 Player::* skillPtr = NULL):
+  CEnchantment(int bonus, unsigned __int16 Player::* skillPtr = nullptr):
   statBonus(bonus),
   statPtr(skillPtr)
   {
@@ -216,7 +216,7 @@
     int enchId, 
     CHARACTER_ATTRIBUTE_TYPE attrId, 
     int bonusValue = 0, 
-    unsigned __int16 Player::* skillPtr = NULL);
+    unsigned __int16 Player::* skillPtr = nullptr);
 
   static std::map<int, std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* > regularBonusMap;
   static std::map<int, std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* > specialBonusMap;