Merge pull request #281 from FuzzyHobbit/patch-6

Use largest finite value for MAX_MONEY

diff --combined src/main.h
index da8d602,a36f328..c9e3fd5
--- 1/src/main.h
--- 2/src/main.h
+++ b/src/main.h
@@@ -14,6 -14,7 +14,7 @@@
  #include "script.h"
  #include "scrypt.h"
  
+ #include <limits>
  #include <list>
  #include <map>
  
@@@ -42,7 -43,7 +43,7 @@@ static const unsigned int MAX_INV_SZ = 
  static const int64_t MIN_TX_FEE = CENT/10;
  static const int64_t MIN_RELAY_TX_FEE = CENT/50;
  
- static const int64_t MAX_MONEY = 2000000000 * COIN;
+ static const int64_t MAX_MONEY = std::numeric_limits<int64_t>::max();
  static const int64_t MAX_MINT_PROOF_OF_WORK = 100 * COIN;
  static const int64_t MAX_MINT_PROOF_OF_STAKE = 1 * COIN;
  static const int64_t MIN_TXOUT_AMOUNT = CENT/100;
@@@ -962,7 -963,7 +963,7 @@@ public
          if (nHeight >= 9689 || fTestNet)
          {
              // Take last bit of block hash as entropy bit
 -            unsigned int nEntropyBit = ((GetHash().Get64()) & 1ULL);
 +            unsigned int nEntropyBit = (GetHash().Get64()) & (uint64_t)1;
              if (fDebug && GetBoolArg("-printstakemodifier"))
                  printf("GetStakeEntropyBit: nTime=%u hashBlock=%s nEntropyBit=%u\n", nTime, GetHash().ToString().c_str(), nEntropyBit);
              return nEntropyBit;