Make power generator output not depend on the game difficulty setting…

…. Update ChangeLog.
Warzone2100 · Nov 6, 2010 · 6752476 · 6752476
1 parent 209e12b
commit 6752476
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-24: Version 2.3.6
+ * General:
+   * Fix: Fix zero armour in damage calculation bug (ticket:2273)
+   * Fix: Don't crash in the unit design screen when using unicode strings (ticket:2209)
+   * Fix: Do not activate a radar detector before it has been completely built (ticket:2202)
+ * Multiplayer:
+   * Fix: Make power generator output not depend on the game difficulty setting
+
 2010-09-24: Version 2.3.5
  * General:
    * Fix: Fix edit boxes so they correctly calculate the string's pixel borders. (r11668)

diff --git a/src/power.c b/src/power.c
@@ -142,11 +142,11 @@ static int32_t updateExtractedPower(STRUCTURE *psBuilding)
 	{
 		int overflowDiff;
 		// Add modifier according to difficulty level
-		if (getDifficultyLevel() == DL_EASY)
+		if (getDifficultyLevel() == DL_EASY && !bMultiPlayer)
 		{
 			powmodifier = EASY_POWER_MOD/10;
 		}
-		else if (getDifficultyLevel() == DL_HARD)
+		else if (getDifficultyLevel() == DL_HARD && !bMultiPlayer)
 		{
 			powmodifier = HARD_POWER_MOD/10;
 		}