File tree Expand file tree Collapse file tree 4 files changed +10
-3
lines changed Expand file tree Collapse file tree 4 files changed +10
-3
lines changed Original file line number Diff line number Diff line change 1
1
#include " ADSensor.h"
2
2
#include " Actor.h"
3
+ #include " SceneMan.h"
3
4
4
5
namespace RTE {
5
6
Original file line number Diff line number Diff line change @@ -526,6 +526,12 @@ float Actor::GetInventoryMass() const {
526
526
527
527
// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
528
528
529
+ float Actor::GetMass () const {
530
+ return MOSRotating::GetMass () + GetInventoryMass () + (m_GoldCarried * g_SceneMan.GetKgPerOz ());
531
+ }
532
+
533
+ // ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
534
+
529
535
float Actor::GetBaseMass () {
530
536
if (m_BaseMass == std::numeric_limits<float >::infinity ()) {
531
537
if (const Actor* presetActor = static_cast <const Actor*>(GetPreset ())) {
Original file line number Diff line number Diff line change 17
17
#include " MOSRotating.h"
18
18
#include " PieMenu.h"
19
19
#include " PathFinder.h"
20
- #include " SceneMan.h"
21
20
22
21
namespace RTE
23
22
{
@@ -173,7 +172,7 @@ ClassInfoGetters;
173
172
// / Gets the mass of this Actor, including the mass of its Attachables, wounds and inventory.
174
173
// / </summary>
175
174
// / <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 ;
177
176
178
177
// / <summary>
179
178
// / Gets the mass that this actor had upon spawning, i.e with ini-defined inventory, gold and holding no items
Original file line number Diff line number Diff line change 2
2
3
3
#include " PresetMan.h"
4
4
#include " UInputMan.h"
5
+ #include " FrameMan.h"
6
+ #include " SceneMan.h"
5
7
6
8
#include " DataModule.h"
7
9
#include " GameActivity.h"
8
10
#include " Scene.h"
9
- #include " FrameMan.h"
10
11
11
12
#include " GUI.h"
12
13
#include " AllegroBitmap.h"
You can’t perform that action at this time.
0 commit comments