Laserlicht 1 år sedan
förälder
incheckning
fa7153b577
3 ändrade filer med 1 tillägg och 3 borttagningar
  1. 0 1
      client/CServerHandler.h
  2. 1 1
      server/CGameHandler.cpp
  3. 0 1
      server/CVCMIServer.h

+ 0 - 1
client/CServerHandler.h

@@ -13,7 +13,6 @@
 
 #include "../lib/network/NetworkInterface.h"
 #include "../lib/StartInfo.h"
-#include "../lib/ResourceSet.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

+ 1 - 1
server/CGameHandler.cpp

@@ -1431,7 +1431,7 @@ void CGameHandler::giveResource(PlayerColor player, GameResID which, int val) //
 	auto * playerSettings = gs->scenarioOps->getPlayersSettings(player);
 
 	TResources resources;
-	resources[which] = val * (playerSettings->handicap.percentIncome[which] == 0 ? 1 : playerSettings->handicap.percentIncome[which] / 100);
+	resources[which] = val * (playerSettings->handicap.percentIncome[which] == 0 ? 100 : playerSettings->handicap.percentIncome[which]) / 100;
 	giveResources(player, resources);
 }
 

+ 0 - 1
server/CVCMIServer.h

@@ -11,7 +11,6 @@
 
 #include "../lib/network/NetworkInterface.h"
 #include "../lib/StartInfo.h"
-#include "../lib/ResourceSet.h"
 
 VCMI_LIB_NAMESPACE_BEGIN