From a656a648302cfe8520a12e6fe6b65e76da6c6e5d Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Fri, 28 Nov 2014 16:53:30 -0800 Subject: [PATCH] - corrected some uninitialized vars identified by cppcheck --- data/glest_game | 2 +- source/glest_game/types/unit_type.cpp | 2 ++ source/glest_game/types/upgrade_type.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/data/glest_game b/data/glest_game index f674bb74..929c6bac 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit f674bb7461ea1ada93c96a7c3167daa4d2dc1ef3 +Subproject commit 929c6bac3c2654aa549aaecd589cdc15a0abdd61 diff --git a/source/glest_game/types/unit_type.cpp b/source/glest_game/types/unit_type.cpp index f0f905d5..5e1b65e6 100644 --- a/source/glest_game/types/unit_type.cpp +++ b/source/glest_game/types/unit_type.cpp @@ -141,6 +141,8 @@ UnitType::UnitType() : ProducibleType() { size=0; renderSize=0; height=0; + burnHeight=0; + targetHeight=0; addItemToVault(&(this->maxHp),this->maxHp); addItemToVault(&(this->hpRegeneration),this->hpRegeneration); diff --git a/source/glest_game/types/upgrade_type.h b/source/glest_game/types/upgrade_type.h index 5db3218d..29679d18 100644 --- a/source/glest_game/types/upgrade_type.h +++ b/source/glest_game/types/upgrade_type.h @@ -120,6 +120,8 @@ public: moveSpeedIsMultiplier = false; prodSpeed = 0; prodSpeedIsMultiplier = false; + attackSpeed = 0; + attackSpeedIsMultiplier = false; } virtual ~UpgradeTypeBase() {}