Skip to content

Commit

Permalink
Fixed compilation error
Browse files Browse the repository at this point in the history
  • Loading branch information
@emd4600
emd4600 committed Aug 30, 2022
1 parent 0dc62f3 commit 0a13a82
Show file tree
Hide file tree
Showing 18 changed files with 33 additions and 32 deletions.
32 changes: 16 additions & 16 deletions Spore ModAPI/SourceCode/Simulator/Tools.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ namespace Simulator
void cToolStrategy::OnMouseDown(cSpaceToolData* pTool, const Vector3& arg1) {}

auto_METHOD_VIRTUAL_VOID(cToolStrategy, cToolStrategy, SelectedUpdate, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
auto_METHOD_VIRTUAL(cToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C),
auto_METHOD_VIRTUAL(cToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C),
Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cToolStrategy, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));
auto_METHOD_VIRTUAL(cToolStrategy, cToolStrategy, bool, OnMouseUp, Args(cSpaceToolData* pTool), Args(pTool));
Expand All @@ -114,27 +114,27 @@ namespace Simulator
//// cRepairToolStrategy ////

auto_METHOD_VIRTUAL(cRepairToolStrategy, cToolStrategy, bool, Update, Args(cSpaceToolData* pTool, bool arg1, const char16_t** arg2), Args(pTool, arg1, arg2));
auto_METHOD_VIRTUAL(cRepairToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cRepairToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cRepairToolStrategy, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));


//// cEnergyRepairToolStrategy ////

auto_METHOD_VIRTUAL(cEnergyRepairToolStrategy, cToolStrategy, bool, Update, Args(cSpaceToolData* pTool, bool arg1, const char16_t** arg2), Args(pTool, arg1, arg2));
auto_METHOD_VIRTUAL(cEnergyRepairToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cEnergyRepairToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));


//// cGetOutOfUFOToolStrategy ////

auto_METHOD_VIRTUAL(cGetOutOfUFOToolStrategy, cToolStrategy, bool, OnSelect, Args(cSpaceToolData* pTool), Args(pTool));
auto_METHOD_VIRTUAL(cGetOutOfUFOToolStrategy, cToolStrategy, bool, Update, Args(cSpaceToolData* pTool, bool arg1, const char16_t** arg2), Args(pTool, arg1, arg2));
auto_METHOD_VIRTUAL(cGetOutOfUFOToolStrategy, cToolStrategy, bool, WhileAiming, Args(cSpaceToolData* pTool, const Vector3& arg1, bool arg2), Args(pTool, arg1, arg2));
auto_METHOD_VIRTUAL(cGetOutOfUFOToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cGetOutOfUFOToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));


//// cDefaultProjectileWeapon ////

auto_METHOD_VIRTUAL(cDefaultProjectileWeapon, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cDefaultProjectileWeapon, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cDefaultProjectileWeapon, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));


Expand All @@ -160,23 +160,23 @@ namespace Simulator
auto_METHOD_VIRTUAL(cPlaceObjectToolStrategy, cToolStrategy, bool, Update, Args(cSpaceToolData* pTool, bool arg1, const char16_t** arg2), Args(pTool, arg1, arg2));
auto_METHOD_VIRTUAL(cPlaceObjectToolStrategy, cToolStrategy, bool, WhileAiming, Args(cSpaceToolData* pTool, const Vector3& arg1, bool arg2), Args(pTool, arg1, arg2));
auto_METHOD_VIRTUAL_VOID(cPlaceObjectToolStrategy, cToolStrategy, SelectedUpdate, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
auto_METHOD_VIRTUAL(cPlaceObjectToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cPlaceObjectToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));


//// cCropCirclesToolStrategy ////

auto_METHOD_VIRTUAL(cCropCirclesToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cCropCirclesToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));


//// cGenesisDeviceToolStrategy ////

auto_METHOD_VIRTUAL(cGenesisDeviceToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cGenesisDeviceToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));


//// cDefaultBeamTool ////

auto_METHOD_VIRTUAL_VOID(cDefaultBeamTool, cToolStrategy, OnMouseDown, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
auto_METHOD_VIRTUAL(cDefaultBeamTool, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cDefaultBeamTool, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cDefaultBeamTool, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));
auto_METHOD_VIRTUAL(cDefaultBeamTool, cToolStrategy, bool, OnMouseUp, Args(cSpaceToolData* pTool), Args(pTool));
auto_METHOD_VIRTUAL(cDefaultBeamTool, cToolStrategy, bool, func48h, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
Expand All @@ -186,15 +186,15 @@ namespace Simulator
//// cDefaultAoETool ////

auto_METHOD_VIRTUAL_VOID(cDefaultAoETool, cToolStrategy, OnMouseDown, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
auto_METHOD_VIRTUAL(cDefaultAoETool, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cDefaultAoETool, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cDefaultAoETool, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));
auto_METHOD_VIRTUAL(cDefaultAoETool, cToolStrategy, bool, OnMouseUp, Args(cSpaceToolData* pTool), Args(pTool));
auto_METHOD_VIRTUAL(cDefaultAoETool, cToolStrategy, bool, func48h, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
auto_METHOD_VIRTUAL(cDefaultAoETool, cToolStrategy, bool, func4Ch, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));

//// cAbductToolStrategy ////

auto_METHOD_VIRTUAL(cAbductToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cAbductToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cAbductToolStrategy, cToolStrategy, bool, OnMouseUp, Args(cSpaceToolData* pTool), Args(pTool));
Vector3 cAbductToolStrategy::GetAimPoint() {
Vector3 dst;
Expand All @@ -206,7 +206,7 @@ namespace Simulator
//// cScanToolStrategy ////

auto_METHOD_VIRTUAL(cScanToolStrategy, cToolStrategy, bool, OnSelect, Args(cSpaceToolData* pTool), Args(pTool));
auto_METHOD_VIRTUAL(cScanToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cScanToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));


//// cDropCargoToolStrategy ////
Expand All @@ -220,19 +220,19 @@ namespace Simulator
//// cDragInputProjectileToolStrategy ////

auto_METHOD_VIRTUAL_VOID(cDragInputProjectileToolStrategy, cToolStrategy, OnMouseDown, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
auto_METHOD_VIRTUAL(cDragInputProjectileToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cDragInputProjectileToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cDragInputProjectileToolStrategy, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));


//// cArtilleryWeaponStrategy ////

auto_METHOD_VIRTUAL(cArtilleryWeaponStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cArtilleryWeaponStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cArtilleryWeaponStrategy, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));


//// cMindEraseToolStrategy ////

auto_METHOD_VIRTUAL(cMindEraseToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cMindEraseToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));


//// cGlobalMindEraseToolStrategy ////
Expand Down Expand Up @@ -264,6 +264,6 @@ namespace Simulator
auto_METHOD_VIRTUAL(cPlaceColonyToolStrategy, cToolStrategy, bool, Update, Args(cSpaceToolData* pTool, bool arg1, const char16_t** arg2), Args(pTool, arg1, arg2));
auto_METHOD_VIRTUAL(cPlaceColonyToolStrategy, cToolStrategy, bool, WhileAiming, Args(cSpaceToolData* pTool, const Vector3& arg1, bool arg2), Args(pTool, arg1, arg2));
auto_METHOD_VIRTUAL_VOID(cPlaceColonyToolStrategy, cToolStrategy, SelectedUpdate, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
auto_METHOD_VIRTUAL(cPlaceColonyToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
auto_METHOD_VIRTUAL(cPlaceColonyToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
}
#endif
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cAbductToolStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace Simulator
public:
static const uint32_t STRATEGY_ID = 0xF58C1654;

virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
virtual bool OnMouseUp(cSpaceToolData* pTool) override;
virtual Vector3 GetAimPoint() override;
};
Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cArtilleryWeaponStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace Simulator
public:
static const uint32_t STRATEGY_ID = 0x8A8B6F35;

virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
virtual bool WhileFiring(cSpaceToolData* pTool, const Vector3& aimPoint, int) override;
};

Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cCropCirclesToolStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace Simulator
public:
static const uint32_t STRATEGY_ID = 0xC0B1AE6A;

virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
};

namespace Addresses(cCropCirclesToolStrategy)
Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cDefaultAoETool.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace Simulator
static const uint32_t STRATEGY_ID = 0x6CB0B689;

virtual void OnMouseDown(cSpaceToolData* pTool, const Vector3& playerPosition) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
virtual bool WhileFiring(cSpaceToolData* pTool, const Vector3& aimPoint, int) override;
virtual bool OnMouseUp(cSpaceToolData* pTool) override;

Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cDefaultBeamTool.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace Simulator
static const uint32_t TYPE = 0x60079DE;

virtual void OnMouseDown(cSpaceToolData* pTool, const Vector3& playerPosition) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
virtual bool WhileFiring(cSpaceToolData* pTool, const Vector3& aimPoint, int) override;
virtual bool OnMouseUp(cSpaceToolData* pTool) override;

Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cDefaultProjectileWeapon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace Simulator
public:
static const uint32_t STRATEGY_ID = 0x2FD3EB55;

virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
virtual bool WhileFiring(cSpaceToolData* pTool, const Vector3& aimPoint, int) override;
};

Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cDragInputProjectileToolStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace Simulator
static const uint32_t STRATEGY_ID = 0x0EB54070;

virtual void OnMouseDown(cSpaceToolData* pTool, const Vector3& playerPosition) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
virtual bool WhileFiring(cSpaceToolData* pTool, const Vector3& aimPoint, int) override;
virtual int ProcessCost(int useCost) override;
};
Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cEnergyRepairToolStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace Simulator
static const uint32_t STRATEGY_ID = 0x28AE31DE;

virtual bool Update(cSpaceToolData* pTool, bool showErrors, const char16_t** ppFailText = nullptr) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
virtual int ProcessCost(int useCost) override;
};

Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cGenesisDeviceToolStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace Simulator
public:
static const uint32_t STRATEGY_ID = 0x72E076A7;

virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
};

namespace Addresses(cGenesisDeviceToolStrategy)
Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cGetOutOfUFOToolStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace Simulator
virtual bool OnSelect(cSpaceToolData* pTool) override;
virtual bool Update(cSpaceToolData* pTool, bool showErrors, const char16_t** ppFailText = nullptr) override;
virtual bool WhileAiming(cSpaceToolData* pTool, const Vector3& aimPoint, bool showErrors) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
};

namespace Addresses(cGetOutOfUFOToolStrategy)
Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cMindEraseToolStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace Simulator
public:
static const uint32_t STRATEGY_ID = 0x3E5E4A39;

virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
};

namespace Addresses(cMindEraseToolStrategy)
Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cPlaceColonyToolStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace Simulator
virtual bool Update(cSpaceToolData* pTool, bool showErrors, const char16_t** ppFailText = nullptr) override;
virtual bool WhileAiming(cSpaceToolData* pTool, const Vector3& aimPoint, bool showErrors) override;
virtual void SelectedUpdate(cSpaceToolData* pTool, const Vector3& position) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
};

namespace Addresses(cPlaceColonyToolStrategy)
Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cPlaceObjectToolStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace Simulator
virtual bool Update(cSpaceToolData* pTool, bool showErrors, const char16_t** ppFailText = nullptr) override;
virtual bool WhileAiming(cSpaceToolData* pTool, const Vector3& aimPoint, bool showErrors) override;
virtual void SelectedUpdate(cSpaceToolData* pTool, const Vector3& position) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
};

namespace Addresses(cPlaceObjectToolStrategy)
Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cRepairToolStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace Simulator
static const uint32_t STRATEGY_ID = 0x7D4F4D72;

virtual bool Update(cSpaceToolData* pTool, bool showErrors, const char16_t** ppFailText = nullptr) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
virtual bool WhileFiring(cSpaceToolData* pTool, const Vector3& aimPoint, int) override;
virtual int ProcessCost(int useCost) override;
};
Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/Simulator/cScanToolStrategy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace Simulator
static const uint32_t STRATEGY_ID = 0xFE8FA3D3;

virtual bool OnSelect(cSpaceToolData* pTool) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
};

namespace Addresses(cScanToolStrategy)
Expand Down
1 change: 1 addition & 0 deletions Spore ModAPI/Spore/Simulator/cSpaceInventoryItem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <Spore\App\Propertylist.h>
#include <Spore\App\IMessageListener.h>
#include <Spore\App\IMessageManager.h>
#include <Spore\Simulator\SimulatorEnums.h>
#include <Spore\Simulator\ISimulatorSerializable.h>

#define cSpaceInventoryItemPtr intrusive_ptr<Simulator::cSpaceInventoryItem>
Expand Down
Loading

0 comments on commit 0a13a82

Please sign in to comment.