Revert "fix same bug again......"

This reverts commit 038d0f7.
Kalima-Entertainment · Apr 23, 2020 · 1e741d7 · 1e741d7
1 parent 038d0f7
commit 1e741d7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/FalloutStrategy/Motor2D/Motor2D.vcxproj b/FalloutStrategy/Motor2D/Motor2D.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/Motor2D/StaticEntity.cpp b/FalloutStrategy/Motor2D/StaticEntity.cpp
@@ -400,6 +400,8 @@ void StaticEntity::ExecuteUpgrade(Faction faction, Upgrades upgrade_name) {
 
 				App->player->UpdateResourceData(Resource::CAPS, -cost);
 				LOG("Resource Limit Upgraded. New limit is: %i", storage_capacity);
+
+				base_resource_limit[faction].upgrade_num++;
 			}
 		}
 	}
@@ -415,6 +417,8 @@ void StaticEntity::ExecuteUpgrade(Faction faction, Upgrades upgrade_name) {
 			//Pay the price
 			App->player->UpdateResourceData(Resource::CAPS, -cost);
 			LOG("Gatherer Resource Limit Upgraded");
+
+			gatherer_resource_limit[faction].upgrade_num++;
 		}
 	}
 	else if (upgrade_name == UNITS_DAMAGE) {
@@ -429,6 +433,8 @@ void StaticEntity::ExecuteUpgrade(Faction faction, Upgrades upgrade_name) {
 			//Pay the price
 			App->player->UpdateResourceData(Resource::CAPS, -cost);
 			LOG("Units Damage Upgraded");
+
+			units_damage[faction].upgrade_num++;
 		}
 	}
 	else if (upgrade_name == UNITS_SPEED) {
@@ -444,6 +450,8 @@ void StaticEntity::ExecuteUpgrade(Faction faction, Upgrades upgrade_name) {
 			//Pay the price
 			App->player->UpdateResourceData(Resource::CAPS, -cost);
 			LOG("Units Speed Upgraded");
+
+			units_speed[faction].upgrade_num++;
 		}
 	}
 	else if (upgrade_name == UNITS_HEALTH) {
@@ -457,6 +465,7 @@ void StaticEntity::ExecuteUpgrade(Faction faction, Upgrades upgrade_name) {
 						App->entities->entities[i]->current_health += (int)(App->entities->entities[i]->max_health * 0.15);
 					}
 			}
+			units_health[faction].upgrade_num++;
 		}
 	}
 	else if (upgrade_name == CREATION_TIME) {
@@ -469,6 +478,7 @@ void StaticEntity::ExecuteUpgrade(Faction faction, Upgrades upgrade_name) {
 					App->entities->unit_data[i][j].spawn_seconds -= App->entities->unit_data[i][j].spawn_seconds * 0.05;
 				}
 			}
+			units_creation_time[faction].upgrade_num++;
 		}
 	}
 }