Merge pull request #537 from Wargus/clean-up

Clean up
Wargus · Oct 11, 2023 · c1d1e0b · c1d1e0b
2 parents e5d77df + d6e2d6d
commit c1d1e0b
Show file tree

Hide file tree

Showing 23 changed files with 124 additions and 72 deletions.
diff --git a/src/action/action_attack.cpp b/src/action/action_attack.cpp
@@ -835,7 +835,7 @@ void COrder_Attack::AttackTarget(CUnit &unit)
 **
 **  @param unit  Unit, for that the attack is handled.
 */
-/* virtual */ void COrder_Attack::Execute(CUnit &unit)
+void COrder_Attack::Execute(CUnit &unit) /* override */
 {
 	Assert(this->HasGoal() || Map.Info.IsPointOnMap(this->goalPos));
 

diff --git a/src/animation/animation_attack.cpp b/src/animation/animation_attack.cpp
@@ -40,7 +40,7 @@
 #include "actions.h"
 #include "unit.h"
 
-/* virtual */ void CAnimation_Attack::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_Attack::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 	unit.CurrentOrder()->OnAnimationAttack(unit);

diff --git a/src/animation/animation_die.cpp b/src/animation/animation_die.cpp
@@ -41,7 +41,7 @@
 
 #include <stdio.h>
 
-/* virtual */ void CAnimation_Die::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_Die::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 	if (unit.Anim.Unbreakable) {

diff --git a/src/animation/animation_goto.cpp b/src/animation/animation_goto.cpp
@@ -39,7 +39,7 @@
 
 #include "unit.h"
 
-/* virtual */ void CAnimation_Goto::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_Goto::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 

diff --git a/src/animation/animation_ifvar.cpp b/src/animation/animation_ifvar.cpp
@@ -67,7 +67,7 @@ static bool binOpXor(int lhs, int rhs) { return (bool)(lhs ^ rhs); }
 static bool binOpNot(int lhs, int rhs = 0) { return (bool)(!lhs); }
 static bool returnFalse(int, int) { return false; }
 
-/* virtual */ void CAnimation_IfVar::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_IfVar::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 

diff --git a/src/animation/animation_label.cpp b/src/animation/animation_label.cpp
@@ -39,7 +39,7 @@
 
 #include "unit.h"
 
-/* virtual */ void CAnimation_Label::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_Label::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 }

diff --git a/src/animation/animation_luacallback.cpp b/src/animation/animation_luacallback.cpp
@@ -43,7 +43,7 @@
 #include <iterator>
 #include <sstream>
 
-/* virtual */ void CAnimation_LuaCallback::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_LuaCallback::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 	Assert(cb);
@@ -59,13 +59,13 @@
 /*
 ** s = "cbName cbArg1 [cbArgN ...]"
 */
-/* virtual */ void CAnimation_LuaCallback::Init(std::string_view s, lua_State *l)
+void CAnimation_LuaCallback::Init(std::string_view s, lua_State *l) /* override */
 {
 	const auto space_pos = s.find(' ');
 	this->cbName = s.substr(0, space_pos);
 
 	lua_getglobal(l, cbName.c_str());
-	cb = new LuaCallback(l, -1);
+	cb = std::make_unique<LuaCallback>(l, -1);
 	lua_pop(l, 1);
 
 	if (space_pos == std::string_view::npos) {

diff --git a/src/animation/animation_move.cpp b/src/animation/animation_move.cpp
@@ -39,7 +39,7 @@
 
 #include "unit.h"
 
-/* virtual */ void CAnimation_Move::Action(CUnit &unit, int &move, int /*scale*/) const
+void CAnimation_Move::Action(CUnit &unit, int &move, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 	Assert(!move);

diff --git a/src/animation/animation_randomgoto.cpp b/src/animation/animation_randomgoto.cpp
@@ -41,7 +41,7 @@
 
 #include <sstream>
 
-/* virtual */ void CAnimation_RandomGoto::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_RandomGoto::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 

diff --git a/src/animation/animation_randomrotate.cpp b/src/animation/animation_randomrotate.cpp
@@ -40,7 +40,9 @@
 #include "animation/animation_rotate.h"
 #include "unit.h"
 
-/* virtual */ void CAnimation_RandomRotate::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_RandomRotate::Action(CUnit &unit,
+                                     int & /*move*/,
+                                     int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 

diff --git a/src/animation/animation_randomsound.cpp b/src/animation/animation_randomsound.cpp
@@ -44,7 +44,7 @@
 #include <iterator>
 #include <sstream>
 
-/* virtual */ void CAnimation_RandomSound::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_RandomSound::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 

diff --git a/src/animation/animation_randomwait.cpp b/src/animation/animation_randomwait.cpp
@@ -41,7 +41,7 @@
 
 #include <sstream>
 
-/* virtual */ void CAnimation_RandomWait::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_RandomWait::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 

diff --git a/src/animation/animation_rotate.cpp b/src/animation/animation_rotate.cpp
@@ -54,7 +54,7 @@ void UnitRotate(CUnit &unit, int rotate)
 	UnitUpdateHeading(unit);
 }
 
-/* virtual */ void CAnimation_Rotate::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_Rotate::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 

diff --git a/src/animation/animation_setplayervar.cpp b/src/animation/animation_setplayervar.cpp
@@ -178,8 +178,9 @@ static void SetPlayerData(const int player, std::string_view prop, std::string_v
 	}
 }
 
-
-/* virtual */ void CAnimation_SetPlayerVar::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_SetPlayerVar::Action(CUnit &unit,
+                                     int & /*move*/,
+                                     int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 

diff --git a/src/animation/animation_setvar.cpp b/src/animation/animation_setvar.cpp
@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <sstream>
 
-/* virtual */ void CAnimation_SetVar::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_SetVar::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 

diff --git a/src/animation/animation_sound.cpp b/src/animation/animation_sound.cpp
@@ -41,7 +41,7 @@
 #include "sound.h"
 #include "unit.h"
 
-/* virtual */ void CAnimation_Sound::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_Sound::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 	if (unit.IsVisible(*ThisPlayer) || ReplayRevealMap) {

diff --git a/src/animation/animation_unbreakable.cpp b/src/animation/animation_unbreakable.cpp
@@ -39,7 +39,7 @@
 
 #include "unit.h"
 
-/* virtual */ void CAnimation_Unbreakable::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_Unbreakable::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 	Assert(unit.Anim.Unbreakable ^ this->state);

diff --git a/src/animation/animation_wait.cpp b/src/animation/animation_wait.cpp
@@ -39,7 +39,7 @@
 
 #include "unit.h"
 
-/* virtual */ void CAnimation_Wait::Action(CUnit &unit, int &/*move*/, int scale) const
+void CAnimation_Wait::Action(CUnit &unit, int & /*move*/, int scale) const /* override */
 {
 	Assert(unit.Anim.Anim == this);
 	unit.Anim.Wait = ParseAnimInt(unit, this->wait) << scale >> 8;

diff --git a/src/animation/animation_wiggle.cpp b/src/animation/animation_wiggle.cpp
@@ -43,7 +43,7 @@
 
 #include <sstream>
 
-/* virtual */ void CAnimation_Wiggle::Action(CUnit &unit, int &/*move*/, int /*scale*/) const
+void CAnimation_Wiggle::Action(CUnit &unit, int & /*move*/, int /*scale*/) const /* override */
 {
 	int x = ParseAnimInt(unit, this->x);
 	int y = ParseAnimInt(unit, this->y);

diff --git a/src/include/animation/animation_luacallback.h b/src/include/animation/animation_luacallback.h
@@ -40,13 +40,13 @@
 class CAnimation_LuaCallback : public CAnimation
 {
 public:
-	~CAnimation_LuaCallback() { delete cb; }
+	~CAnimation_LuaCallback() = default;
 
 	void Action(CUnit &unit, int &move, int scale) const override;
 	void Init(std::string_view s, lua_State *l) override;
 
 private:
-	LuaCallback *cb = nullptr;
+	std::unique_ptr<LuaCallback> cb;
 	std::string cbName;
 	std::vector<std::string> cbArgs;
 };

diff --git a/src/include/ui/popup.h b/src/include/ui/popup.h
@@ -111,12 +111,17 @@ class CPopupContentTypeButtonInfo : public CPopupContentType
 {
 public:
 	CPopupContentTypeButtonInfo() = default;
-	virtual ~CPopupContentTypeButtonInfo() = default;
+	~CPopupContentTypeButtonInfo() override = default;
 
-	virtual void Draw(int x, int y, const CPopup &popup, const unsigned int popupWidth, const ButtonAction &button, int *Costs) const;
+	void Draw(int x,
+	          int y,
+	          const CPopup &popup,
+	          const unsigned int popupWidth,
+	          const ButtonAction &button,
+	          int *Costs) const override;
 
-	virtual int GetWidth(const ButtonAction &button, int *Costs) const;
-	virtual int GetHeight(const ButtonAction &button, int *Costs) const;
+	int GetWidth(const ButtonAction &button, int *Costs) const override;
+	int GetHeight(const ButtonAction &button, int *Costs) const override;
 
 	virtual void Parse(lua_State *l);
 
@@ -130,14 +135,19 @@ class CPopupContentTypeText : public CPopupContentType
 {
 public:
 	CPopupContentTypeText() = default;
-	virtual ~CPopupContentTypeText() = default;
+	~CPopupContentTypeText() override = default;
 
-	virtual void Draw(int x, int y, const CPopup &popup, const unsigned int popupWidth, const ButtonAction &button, int *Costs) const;
+	void Draw(int x,
+	          int y,
+	          const CPopup &popup,
+	          const unsigned int popupWidth,
+	          const ButtonAction &button,
+	          int *Costs) const override;
 
-	virtual int GetWidth(const ButtonAction &button, int *Costs) const;
-	virtual int GetHeight(const ButtonAction &button, int *Costs) const;
+	int GetWidth(const ButtonAction &button, int *Costs) const override;
+	int GetHeight(const ButtonAction &button, int *Costs) const override;
 
-	virtual void Parse(lua_State *l);
+	void Parse(lua_State *l) override;
 
 private:
 	std::string Text;          /// Text to display
@@ -149,14 +159,19 @@ class CPopupContentTypeCosts : public CPopupContentType
 {
 public:
 	CPopupContentTypeCosts() = default;
-	virtual ~CPopupContentTypeCosts() = default;
+	~CPopupContentTypeCosts() override = default;
 
-	virtual void Draw(int x, int y, const CPopup &popup, const unsigned int popupWidth, const ButtonAction &button, int *Costs) const;
+	void Draw(int x,
+	          int y,
+	          const CPopup &popup,
+	          const unsigned int popupWidth,
+	          const ButtonAction &button,
+	          int *Costs) const override;
 
-	virtual int GetWidth(const ButtonAction &button, int *Costs) const;
-	virtual int GetHeight(const ButtonAction &button, int *Costs) const;
+	int GetWidth(const ButtonAction &button, int *Costs) const override;
+	int GetHeight(const ButtonAction &button, int *Costs) const override;
 
-	virtual void Parse(lua_State *l);
+	void Parse(lua_State *l) override;
 
 private:
 	CFont *Font = nullptr; /// Font to use.
@@ -167,14 +182,19 @@ class CPopupContentTypeLine : public CPopupContentType
 {
 public:
 	CPopupContentTypeLine() = default;
-	virtual ~CPopupContentTypeLine() = default;
+	~CPopupContentTypeLine() override = default;
 
-	virtual void Draw(int x, int y, const CPopup &popup, const unsigned int popupWidth, const ButtonAction &button, int *Costs) const;
+	void Draw(int x,
+	          int y,
+	          const CPopup &popup,
+	          const unsigned int popupWidth,
+	          const ButtonAction &button,
+	          int *Costs) const override;
 
-	virtual int GetWidth(const ButtonAction &button, int *Costs) const;
-	virtual int GetHeight(const ButtonAction &button, int *Costs) const;
+	int GetWidth(const ButtonAction &button, int *Costs) const override;
+	int GetHeight(const ButtonAction &button, int *Costs) const override;
 
-	virtual void Parse(lua_State *l);
+	void Parse(lua_State *l) override;
 
 private:
 	IntColor Color = ColorWhite; /// Color used for line.
@@ -187,12 +207,17 @@ class CPopupContentTypeVariable : public CPopupContentType
 public:
 	CPopupContentTypeVariable() = default;
 
-	virtual void Draw(int x, int y, const CPopup &popup, const unsigned int popupWidth, const ButtonAction &button, int *Costs) const;
+	void Draw(int x,
+	          int y,
+	          const CPopup &popup,
+	          const unsigned int popupWidth,
+	          const ButtonAction &button,
+	          int *Costs) const override;
 
-	virtual int GetWidth(const ButtonAction &button, int *Costs) const;
-	virtual int GetHeight(const ButtonAction &button, int *Costs) const;
+	int GetWidth(const ButtonAction &button, int *Costs) const override;
+	int GetHeight(const ButtonAction &button, int *Costs) const override;
 
-	virtual void Parse(lua_State *l);
+	void Parse(lua_State *l) override;
 
 private:
 	std::unique_ptr<IStringDesc> Text; /// Text to display.

diff --git a/src/sound/sound_server.cpp b/src/sound/sound_server.cpp
@@ -237,7 +237,7 @@ static bool External_Volume(int volume, int oldVolume) {
 
 /// Channels for sound effects and unit speech
 struct SoundChannel {
-	Origin *Unit = nullptr;          /// pointer to unit, who plays the sound, if any
+	std::unique_ptr<Origin> Unit;          /// pointer to unit, who plays the sound, if any
 	void (*FinishedCallback)(int channel) = nullptr; /// Callback for when a sample finishes playing
 };
 
@@ -288,7 +288,6 @@ static void ChannelFinished(int channel)
 		event.user.data1 = (void*) Channels[channel].FinishedCallback;
 		SDL_PeepEvents(&event, 1, SDL_ADDEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
 	}
-	delete Channels[channel].Unit;
 	Channels[channel].Unit = nullptr;
 }
 
@@ -496,10 +495,10 @@ static int PlaySample(Mix_Chunk *sample, Origin *origin, void (*callback)(int ch
 		if (channel >= 0 && channel < MaxChannels) {
 			Channels[channel].FinishedCallback = callback;
 			if (origin && origin->Base) {
-				Origin *source = new Origin;
+				auto source = std::make_unique<Origin>();
 				source->Base = origin->Base;
 				source->Id = origin->Id;
-				Channels[channel].Unit = source;
+				Channels[channel].Unit = std::move(source);
 			}
 		}
 	}
@@ -675,7 +674,7 @@ bool SoundEnabled()
 **
 **  @return      false if failure, true if everything ok.
 */
-static int InitSdlSound()
+static bool InitSdlSound()
 {
 	fs::path timidityCfg(StratagusLibPath);
 	timidityCfg = timidityCfg / "timidity" / "timidity.cfg";