Skip to content

Commit 6ae1612

Browse files
committed
Remove SceneMan include in header
1 parent df86690 commit 6ae1612

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

Source/Entities/ADSensor.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "ADSensor.h"
22
#include "Actor.h"
3+
#include "SceneMan.h"
34

45
namespace RTE {
56

Source/Entities/Actor.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,12 @@ float Actor::GetInventoryMass() const {
526526

527527
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
528528

529+
float Actor::GetMass() const {
530+
return MOSRotating::GetMass() + GetInventoryMass() + (m_GoldCarried * g_SceneMan.GetKgPerOz());
531+
}
532+
533+
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
534+
529535
float Actor::GetBaseMass() {
530536
if (m_BaseMass == std::numeric_limits<float>::infinity()) {
531537
if (const Actor* presetActor = static_cast<const Actor*>(GetPreset())) {

Source/Entities/Actor.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "MOSRotating.h"
1818
#include "PieMenu.h"
1919
#include "PathFinder.h"
20-
#include "SceneMan.h"
2120

2221
namespace RTE
2322
{
@@ -173,7 +172,7 @@ ClassInfoGetters;
173172
/// Gets the mass of this Actor, including the mass of its Attachables, wounds and inventory.
174173
/// </summary>
175174
/// <returns>The mass of this Actor, its inventory and all its Attachables and wounds in Kilograms (kg).</returns>
176-
float GetMass() const override { return MOSRotating::GetMass() + GetInventoryMass() + (m_GoldCarried * g_SceneMan.GetKgPerOz()); }
175+
float GetMass() const override;
177176

178177
/// <summary>
179178
/// Gets the mass that this actor had upon spawning, i.e with ini-defined inventory, gold and holding no items

Source/Menus/ScenarioActivityConfigGUI.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
#include "PresetMan.h"
44
#include "UInputMan.h"
5+
#include "FrameMan.h"
6+
#include "SceneMan.h"
57

68
#include "DataModule.h"
79
#include "GameActivity.h"
810
#include "Scene.h"
9-
#include "FrameMan.h"
1011

1112
#include "GUI.h"
1213
#include "AllegroBitmap.h"

0 commit comments

Comments
 (0)