Fixing a minor logic bug and cleaning up warnings.

ValyriaTear · Mar 20, 2016 · dc86630 · dc86630
1 parent df80e3a
commit dc86630
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/common/global/global_actors.cpp b/src/common/global/global_actors.cpp
@@ -845,11 +845,14 @@ GlobalCharacter::GlobalCharacter(uint32_t id, bool initial) :
 
 GlobalCharacter::~GlobalCharacter()
 {
+    //
     // Delete all equipment.
+    //
+
     _weapon_equipped = nullptr;
 
     for (uint32_t i = 0; i < _armor_equipped.size(); ++i) {
-        _armor_equipped[i] != nullptr;
+        _armor_equipped[i] = nullptr;
     }
     _armor_equipped.clear();
 }

diff --git a/src/common/gui/option.h b/src/common/gui/option.h
@@ -273,6 +273,7 @@ class OptionBox : public private_gui::GUIControl
     *** because it is silly to try to represent a structure of 2 columns and 2 rows in a layout of 4 columns and 4 rows. Failure
     *** to observe this requirement will result in no changes being made by this function.
     **/
+    using private_gui::GUIControl::SetDimensions;
     virtual void SetDimensions(float width, float height, uint8_t num_cols, uint8_t num_rows, uint8_t cell_cols, uint8_t cell_rows);
 
     /** \brief Sets the options to display in this option box