BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed the comparison method in PlayerSystem since its currently using doubles

Browse Source
This commit is contained in:
verysecrethero
2016-01-11 14:37:43 +01:00
parent 8f92de3683
commit 2cd0e94a60
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/PlayerSystem.cpp
+6 -6
View File
@@ -30,27 +30,27 @@ void PlayerSystem::UpdateComponent(World * world, ComponentWrapper & player, dou
double currentAmmo = (double)0; double currentAmmo = (double)0;
double currentCoolDownTimer = (double)0; double currentCoolDownTimer = (double)0;
if ((double)player["EquippedItem"] == (double)1) { if (fabs((double)player["EquippedItem"] - (double)1) < (double) 0.0001f) {
ComponentWrapper& currentItem = world->GetComponent(player.EntityID, "PrimaryItem"); ComponentWrapper& currentItem = world->GetComponent(player.EntityID, "PrimaryItem");
currentAmmo = currentItem["Ammo"]; currentAmmo = (double)currentItem["Ammo"];
currentCoolDownTimer = (double)currentItem["CoolDownTimer"]; currentCoolDownTimer = (double)currentItem["CoolDownTimer"];
} }
if ((double)player["EquippedItem"] == (double)2) { if (fabs((double)player["EquippedItem"] - (double)2) < (double) 0.0001f) {
ComponentWrapper& currentItem = world->GetComponent(player.EntityID, "SecondaryItem"); ComponentWrapper& currentItem = world->GetComponent(player.EntityID, "SecondaryItem");
currentAmmo = currentItem["Ammo"]; currentAmmo = (double)currentItem["Ammo"];
currentCoolDownTimer = (double)currentItem["CoolDownTimer"]; currentCoolDownTimer = (double)currentItem["CoolDownTimer"];
} }
if (currentHealth > (double)0.0f && currentAmmo > (double)0.0f && currentCoolDownTimer < (double)0.001f) { if (currentHealth > (double)0.0f && currentAmmo > (double)0.0f && currentCoolDownTimer < (double)0.001f) {
//decrease ammo count //decrease ammo count
//TODO: temp, set the cooldowntimer - probably done in some other system (itemSystem?) later //TODO: temp, set the cooldowntimer - probably done in some other system (itemSystem?) later
if ((double)player["EquippedItem"] == (double)1) { if (fabs((double)player["EquippedItem"] - (double)1) < (double) 0.0001f) {
ComponentWrapper& currentItem = world->GetComponent(player.EntityID, "PrimaryItem"); ComponentWrapper& currentItem = world->GetComponent(player.EntityID, "PrimaryItem");
int currentAmmoInt = (int)((double)currentItem["Ammo"]); int currentAmmoInt = (int)((double)currentItem["Ammo"]);
currentItem["Ammo"] = (double)(currentAmmoInt - 1); currentItem["Ammo"] = (double)(currentAmmoInt - 1);
currentItem["CoolDownTimer"] = (double)2; currentItem["CoolDownTimer"] = (double)2;
} }
if ((double)player["EquippedItem"] == (double)2) { if (fabs((double)player["EquippedItem"] - (double)2) < (double) 0.0001f) {
ComponentWrapper& currentItem = world->GetComponent(player.EntityID, "SecondaryItem"); ComponentWrapper& currentItem = world->GetComponent(player.EntityID, "SecondaryItem");
int currentAmmoInt = (int)((double)currentItem["Ammo"]); int currentAmmoInt = (int)((double)currentItem["Ammo"]);
currentItem["Ammo"] = (double)(currentAmmoInt - 1); currentItem["Ammo"] = (double)(currentAmmoInt - 1);