Fixed bug when shooting weapon and run out of energy

If when you run out of energy you can no longer fire a weapon. There was a bug that caused the weapon sound to still play even though no projectile was created. This is fixed now.
hakase-labs · Apr 14, 2014 · 8b1b4fd · 8b1b4fd
1 parent 57c5fb9
commit 8b1b4fd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/engine/include/hikari/client/game/objects/Hero.hpp b/engine/include/hikari/client/game/objects/Hero.hpp
@@ -45,6 +45,7 @@ namespace hikari {
 
         bool isUnderWater;
         bool wasUnderWaterLastFrame;
+        bool hasAvailableWeaponEnergy;
 
 #ifdef HIKARI_DEBUG_HERO_PHYSICS
         int countAscendingFrames;
@@ -219,6 +220,7 @@ namespace hikari {
         bool isVulnerable();
         bool isNowShooting();
         bool isOnGround();
+        void setHasAvailableWeaponEnergy(bool hasEnergy);
 
         virtual void update(float dt);
         virtual void render(sf::RenderTarget &target);

diff --git a/engine/src/hikari/client/game/GamePlayState.cpp b/engine/src/hikari/client/game/GamePlayState.cpp
@@ -1245,7 +1245,7 @@ namespace hikari {
                             if(auto sound = audioService.lock()) {
                                 sound->playSample(weapon->getUsageSound());
                             }
-                
+
                             HIKARI_LOG(debug4) << "Hero's shot count: " << hero->getActiveShotCount();
                         }
                     }
@@ -1882,6 +1882,11 @@ namespace hikari {
                     index++;
                 }
 
+                if(auto gp = gamePlayState.gameProgress.lock()) {
+                    int currentWeaponEnergy = gp->getWeaponEnergy(gp->getCurrentWeapon());
+                    gamePlayState.hero->setHasAvailableWeaponEnergy(currentWeaponEnergy);
+                }
+
                 gamePlayState.hero->update(dt);
 
                 //

diff --git a/engine/src/hikari/client/game/objects/Hero.cpp b/engine/src/hikari/client/game/objects/Hero.cpp
@@ -39,6 +39,7 @@ namespace hikari {
         , isInvincible(false)
         , isUnderWater(false)
         , wasUnderWaterLastFrame(false)
+        , hasAvailableWeaponEnergy(true)
         , climbableRegion(0, 0, 0, 0)
         , actionController(nullptr)
         , mobilityState(nullptr)
@@ -241,6 +242,10 @@ namespace hikari {
         return body.isOnGround();
     }
 
+    void Hero::setHasAvailableWeaponEnergy(bool hasEnergy) {
+        hasAvailableWeaponEnergy = hasEnergy;
+    }
+
     void Hero::playAnimation(float dt) {
         const auto & animSprite = getAnimatedSprite();
 
@@ -527,7 +532,7 @@ namespace hikari {
             auto const * controller = hero.actionController.get();
 
             // TODO: Actually fix this to use a real cooldown
-            if(controller->shouldShootWeapon()) {
+            if(controller->shouldShootWeapon() && hero.hasAvailableWeaponEnergy) {
                 cooldownTimer = cooldown;
                 hero.fireWeapon();
             }
@@ -565,7 +570,7 @@ namespace hikari {
         if(hero.actionController) {
             auto const * controller = hero.actionController.get();
 
-            if(controller->shouldShootWeapon() && hero.canFireWeapon() && !hero.isSliding) {
+            if(controller->shouldShootWeapon() && hero.canFireWeapon() && !hero.isSliding && hero.hasAvailableWeaponEnergy) {
                 hero.requestShootingStateChange(std::unique_ptr<ShootingState>(new IsShootingState(hero)));
                 return ShootingState::NEXT;
             }