Revert "multi-upgrade bug fixed"

This reverts commit 395ee54.
Kalima-Entertainment · May 27, 2020 · 812885a · 812885a
1 parent d2f9fbf
commit 812885a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/FalloutStrategy/FalloutEngine/FalloutEngine.vcxproj b/FalloutStrategy/FalloutEngine/FalloutEngine.vcxproj
@@ -14,7 +14,7 @@
     <ProjectGuid>{2AF9969B-F202-497B-AF30-7BEF9CE8005E}</ProjectGuid>
     <RootNamespace>programacio_2</RootNamespace>
     <ProjectName>Fallout_Strategy</ProjectName>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/FalloutStrategy/FalloutEngine/StaticEntity.cpp b/FalloutStrategy/FalloutEngine/StaticEntity.cpp
@@ -604,7 +604,7 @@ void StaticEntity::UpgradeChrono() {
 		want_to_upgrade = false;
 	}
 	if (upgrading == true) {
-		LOG("time remaining %f ", 45 - chrono_upgrade.ReadSec());
+		//LOG("time remaining %f ", 45 - chrono_upgrade.ReadSec());
 		if (chrono_upgrade.ReadSec() > upgrade_stack.upgrade_seconds) {
 			if (upgrade_stack.building == BASE) {
 				ExecuteUpgrade(upgrade_stack.faction, RESOURCES_LIMIT);
@@ -617,9 +617,10 @@ void StaticEntity::UpgradeChrono() {
 			else if (upgrade_stack.building == LABORATORY) {
 				ExecuteUpgrade(upgrade_stack.faction, UNITS_HEALTH);
 				ExecuteUpgrade(upgrade_stack.faction, CREATION_TIME);
+
 			}
 
-			upgrading = false;
+			upgrading = true;
 		}
 	}
 }

diff --git a/FalloutStrategy/FalloutEngine/j1Player.cpp b/FalloutStrategy/FalloutEngine/j1Player.cpp
@@ -29,7 +29,7 @@ j1Player::j1Player() : GenericPlayer() {
 
 	base = barrack[0] = barrack[1] = laboratory = nullptr;
 
-	caps = 9990;
+	caps = 999;
 	food = 399;
 	water = 999;