diff --git a/ArmyClasses/AlienArmy.h b/ArmyClasses/AlienArmy.h index 0d4830d..3c055b5 100644 --- a/ArmyClasses/AlienArmy.h +++ b/ArmyClasses/AlienArmy.h @@ -13,7 +13,7 @@ class AlienArmy: public Army { private: - LinkedQueue soliders; + LinkedQueue soldiers; // Array monsters; Deque drones; diff --git a/Containers/PriorityNode.h b/Containers/PriorityNode.h index b11f4e4..47faa61 100644 --- a/Containers/PriorityNode.h +++ b/Containers/PriorityNode.h @@ -9,28 +9,28 @@ class PriorityNode PriorityNode* next; // Pointer to next node public: - PriorityNode(const T& _item, int _priority); + PriorityNode(const T& item, int priority); - void setItem(const T& _item, int _priority); + void setItem(const T& item, int priority); void setNext(PriorityNode* nextNodePtr); - T getItem(int& _priority) const; + T getItem(int& priority) const; PriorityNode* getNext() const; int getPriority() const; }; template -inline PriorityNode::PriorityNode(const T& _item, int _priority) +inline PriorityNode::PriorityNode(const T& item, int priority) { - setItem(_item, _priority); + setItem(item, priority); next = nullptr; } template -inline void PriorityNode::setItem(const T& _item, int _priority) +inline void PriorityNode::setItem(const T& item, int priority) { - item = _item; - priority = _priority; + this->item = item; + this->priority = priority; } template @@ -40,9 +40,9 @@ void PriorityNode::setNext(PriorityNode* nextNodePtr) } template -inline T PriorityNode::getItem(int& _priority) const +inline T PriorityNode::getItem(int& priority) const { - _priority = priority; + priority = this->priority; return item; }