From 8826b6bdc4b83bd53e72a76bf57bcb73d461fdba Mon Sep 17 00:00:00 2001
From: Jannis Froese <s9jafroe@stud.uni-saarland.de>
Date: Mon, 2 Jun 2014 21:31:23 +0200
Subject: Make rewards in regtest mode less random

This allows sane testing. Regtest mode is primarily intended for automated
testing, so this simplification makes sense
---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 072675fdf..809fc759a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1196,11 +1196,11 @@ int64_t GetBlockValue(int nHeight, int64_t nFees, uint256 prevHash)
     int rand = generateMTRandom(seed, 999999);
     int rand1 = 0;
 
-    if(nHeight < 100000)
+    if(nHeight < 100000 && !Params().SimplifiedRewards())
     {
         nSubsidy = (1 + rand) * COIN;
     }
-    else if(nHeight < 145000)
+    else if(nHeight < 145000 && !Params().SimplifiedRewards())
     {
         cseed_str = prevHash.ToString().substr(7,7);
         cseed = cseed_str.c_str();
-- 
cgit v1.2.3