From ad04376054f9734d81099b36b013478498364cb3 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 22 May 2016 00:43:46 +0200
Subject: SCUMM HE: Cleanup

---
 engines/scumm/he/moonbase/ai_defenseunit.cpp | 16 ++++-----
 engines/scumm/he/moonbase/ai_defenseunit.h   | 50 ++++++++++++++--------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/engines/scumm/he/moonbase/ai_defenseunit.cpp b/engines/scumm/he/moonbase/ai_defenseunit.cpp
index 43223dda9b..f1f0251dc6 100644
--- a/engines/scumm/he/moonbase/ai_defenseunit.cpp
+++ b/engines/scumm/he/moonbase/ai_defenseunit.cpp
@@ -29,17 +29,17 @@
 namespace Scumm {
 
 DefenseUnit::DefenseUnit() {
-	m_state = DUS_ON;
+	_state = DUS_ON;
 }
 
 DefenseUnit::DefenseUnit(DefenseUnit *inUnit) {
-	m_ID = inUnit->getID();
-	m_pos.x = inUnit->getPosX();
-	m_pos.y = inUnit->getPosY();
-	m_distanceTo = inUnit->getDistanceTo();
-	m_state = inUnit->getState();
-	m_radius = inUnit->getRadius();
-	m_armor = inUnit->getArmor();
+	_id = inUnit->getID();
+	_pos.x = inUnit->getPosX();
+	_pos.y = inUnit->getPosY();
+	_distanceTo = inUnit->getDistanceTo();
+	_state = inUnit->getState();
+	_radius = inUnit->getRadius();
+	_armor = inUnit->getArmor();
 }
 
 DefenseUnit::~DefenseUnit() {
diff --git a/engines/scumm/he/moonbase/ai_defenseunit.h b/engines/scumm/he/moonbase/ai_defenseunit.h
index bc4c79a6b5..e658fc31ab 100644
--- a/engines/scumm/he/moonbase/ai_defenseunit.h
+++ b/engines/scumm/he/moonbase/ai_defenseunit.h
@@ -45,13 +45,13 @@ enum {
 
 class DefenseUnit {
 private:
-	int m_ID;
-	Common::Point m_pos;
-	int m_distanceTo;
-	int m_state;
-	int m_radius;
-	int m_armor;
-	int m_cost;
+	int _id;
+	Common::Point _pos;
+	int _distanceTo;
+	int _state;
+	int _radius;
+	int _armor;
+	int _cost;
 
 public:
 	DefenseUnit();
@@ -59,26 +59,26 @@ public:
 
 	virtual ~DefenseUnit();
 
-	void setID(int id) { m_ID = id; }
-	void setDistanceTo(int distanceTo) { m_distanceTo = distanceTo; }
-	void setState(int state) { m_state = state; }
-	void setRadius(int radius) { m_radius = radius; }
-	void setArmor(int armor) { m_armor = armor; }
-	void setDamage(int damage) { m_armor -= damage; }
+	void setID(int id) { _id = id; }
+	void setDistanceTo(int distanceTo) { _distanceTo = distanceTo; }
+	void setState(int state) { _state = state; }
+	void setRadius(int radius) { _radius = radius; }
+	void setArmor(int armor) { _armor = armor; }
+	void setDamage(int damage) { _armor -= damage; }
 	void setPos(int x, int y) {
-		m_pos.x = x;
-		m_pos.y = y;
+		_pos.x = x;
+		_pos.y = y;
 	}
-	void setCost(int cost) { m_cost = cost; }
-
-	int getID() const { return m_ID; }
-	int getDistanceTo() const { return m_distanceTo; }
-	int getState() const { return m_state; }
-	int getRadius() const { return m_radius; }
-	int getArmor() const { return m_armor; }
-	int getPosX() const { return m_pos.x; }
-	int getPosY() const { return m_pos.y; }
-	int getCost() const { return m_cost; }
+	void setCost(int cost) { _cost = cost; }
+
+	int getID() const { return _id; }
+	int getDistanceTo() const { return _distanceTo; }
+	int getState() const { return _state; }
+	int getRadius() const { return _radius; }
+	int getArmor() const { return _armor; }
+	int getPosX() const { return _pos.x; }
+	int getPosY() const { return _pos.y; }
+	int getCost() const { return _cost; }
 
 	virtual int getType() const = 0;
 
-- 
cgit v1.2.3