Skip to content

Commit 0a13a82

Browse files
emd4600emd4600
committed
Fixed compilation error
1 parent 0dc62f3 commit 0a13a82

18 files changed

+33
-32
lines changed

‎Spore ModAPI/SourceCode/Simulator/Tools.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ namespace Simulator
9292
void cToolStrategy::OnMouseDown(cSpaceToolData* pTool, const Vector3& arg1) {}
9393

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

116116
auto_METHOD_VIRTUAL(cRepairToolStrategy, cToolStrategy, bool, Update, Args(cSpaceToolData* pTool, bool arg1, const char16_t** arg2), Args(pTool, arg1, arg2));
117-
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));
117+
auto_METHOD_VIRTUAL(cRepairToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
118118
auto_METHOD_VIRTUAL(cRepairToolStrategy, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));
119119

120120

121121
//// cEnergyRepairToolStrategy ////
122122

123123
auto_METHOD_VIRTUAL(cEnergyRepairToolStrategy, cToolStrategy, bool, Update, Args(cSpaceToolData* pTool, bool arg1, const char16_t** arg2), Args(pTool, arg1, arg2));
124-
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));
124+
auto_METHOD_VIRTUAL(cEnergyRepairToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
125125

126126

127127
//// cGetOutOfUFOToolStrategy ////
128128

129129
auto_METHOD_VIRTUAL(cGetOutOfUFOToolStrategy, cToolStrategy, bool, OnSelect, Args(cSpaceToolData* pTool), Args(pTool));
130130
auto_METHOD_VIRTUAL(cGetOutOfUFOToolStrategy, cToolStrategy, bool, Update, Args(cSpaceToolData* pTool, bool arg1, const char16_t** arg2), Args(pTool, arg1, arg2));
131131
auto_METHOD_VIRTUAL(cGetOutOfUFOToolStrategy, cToolStrategy, bool, WhileAiming, Args(cSpaceToolData* pTool, const Vector3& arg1, bool arg2), Args(pTool, arg1, arg2));
132-
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));
132+
auto_METHOD_VIRTUAL(cGetOutOfUFOToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
133133

134134

135135
//// cDefaultProjectileWeapon ////
136136

137-
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));
137+
auto_METHOD_VIRTUAL(cDefaultProjectileWeapon, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
138138
auto_METHOD_VIRTUAL(cDefaultProjectileWeapon, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));
139139

140140

@@ -160,23 +160,23 @@ namespace Simulator
160160
auto_METHOD_VIRTUAL(cPlaceObjectToolStrategy, cToolStrategy, bool, Update, Args(cSpaceToolData* pTool, bool arg1, const char16_t** arg2), Args(pTool, arg1, arg2));
161161
auto_METHOD_VIRTUAL(cPlaceObjectToolStrategy, cToolStrategy, bool, WhileAiming, Args(cSpaceToolData* pTool, const Vector3& arg1, bool arg2), Args(pTool, arg1, arg2));
162162
auto_METHOD_VIRTUAL_VOID(cPlaceObjectToolStrategy, cToolStrategy, SelectedUpdate, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
163-
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));
163+
auto_METHOD_VIRTUAL(cPlaceObjectToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
164164

165165

166166
//// cCropCirclesToolStrategy ////
167167

168-
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));
168+
auto_METHOD_VIRTUAL(cCropCirclesToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
169169

170170

171171
//// cGenesisDeviceToolStrategy ////
172172

173-
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));
173+
auto_METHOD_VIRTUAL(cGenesisDeviceToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
174174

175175

176176
//// cDefaultBeamTool ////
177177

178178
auto_METHOD_VIRTUAL_VOID(cDefaultBeamTool, cToolStrategy, OnMouseDown, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
179-
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));
179+
auto_METHOD_VIRTUAL(cDefaultBeamTool, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
180180
auto_METHOD_VIRTUAL(cDefaultBeamTool, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));
181181
auto_METHOD_VIRTUAL(cDefaultBeamTool, cToolStrategy, bool, OnMouseUp, Args(cSpaceToolData* pTool), Args(pTool));
182182
auto_METHOD_VIRTUAL(cDefaultBeamTool, cToolStrategy, bool, func48h, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
@@ -186,15 +186,15 @@ namespace Simulator
186186
//// cDefaultAoETool ////
187187

188188
auto_METHOD_VIRTUAL_VOID(cDefaultAoETool, cToolStrategy, OnMouseDown, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
189-
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));
189+
auto_METHOD_VIRTUAL(cDefaultAoETool, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
190190
auto_METHOD_VIRTUAL(cDefaultAoETool, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));
191191
auto_METHOD_VIRTUAL(cDefaultAoETool, cToolStrategy, bool, OnMouseUp, Args(cSpaceToolData* pTool), Args(pTool));
192192
auto_METHOD_VIRTUAL(cDefaultAoETool, cToolStrategy, bool, func48h, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
193193
auto_METHOD_VIRTUAL(cDefaultAoETool, cToolStrategy, bool, func4Ch, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
194194

195195
//// cAbductToolStrategy ////
196196

197-
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));
197+
auto_METHOD_VIRTUAL(cAbductToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
198198
auto_METHOD_VIRTUAL(cAbductToolStrategy, cToolStrategy, bool, OnMouseUp, Args(cSpaceToolData* pTool), Args(pTool));
199199
Vector3 cAbductToolStrategy::GetAimPoint() {
200200
Vector3 dst;
@@ -206,7 +206,7 @@ namespace Simulator
206206
//// cScanToolStrategy ////
207207

208208
auto_METHOD_VIRTUAL(cScanToolStrategy, cToolStrategy, bool, OnSelect, Args(cSpaceToolData* pTool), Args(pTool));
209-
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));
209+
auto_METHOD_VIRTUAL(cScanToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
210210

211211

212212
//// cDropCargoToolStrategy ////
@@ -220,19 +220,19 @@ namespace Simulator
220220
//// cDragInputProjectileToolStrategy ////
221221

222222
auto_METHOD_VIRTUAL_VOID(cDragInputProjectileToolStrategy, cToolStrategy, OnMouseDown, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
223-
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));
223+
auto_METHOD_VIRTUAL(cDragInputProjectileToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
224224
auto_METHOD_VIRTUAL(cDragInputProjectileToolStrategy, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));
225225

226226

227227
//// cArtilleryWeaponStrategy ////
228228

229-
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));
229+
auto_METHOD_VIRTUAL(cArtilleryWeaponStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
230230
auto_METHOD_VIRTUAL(cArtilleryWeaponStrategy, cToolStrategy, bool, WhileFiring, Args(cSpaceToolData* pTool, const Vector3& arg1, int arg2), Args(pTool, arg1, arg2));
231231

232232

233233
//// cMindEraseToolStrategy ////
234234

235-
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));
235+
auto_METHOD_VIRTUAL(cMindEraseToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
236236

237237

238238
//// cGlobalMindEraseToolStrategy ////
@@ -264,6 +264,6 @@ namespace Simulator
264264
auto_METHOD_VIRTUAL(cPlaceColonyToolStrategy, cToolStrategy, bool, Update, Args(cSpaceToolData* pTool, bool arg1, const char16_t** arg2), Args(pTool, arg1, arg2));
265265
auto_METHOD_VIRTUAL(cPlaceColonyToolStrategy, cToolStrategy, bool, WhileAiming, Args(cSpaceToolData* pTool, const Vector3& arg1, bool arg2), Args(pTool, arg1, arg2));
266266
auto_METHOD_VIRTUAL_VOID(cPlaceColonyToolStrategy, cToolStrategy, SelectedUpdate, Args(cSpaceToolData* pTool, const Vector3& arg1), Args(pTool, arg1));
267-
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));
267+
auto_METHOD_VIRTUAL(cPlaceColonyToolStrategy, cToolStrategy, bool, OnHit, Args(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int arg_C), Args(pTool, position, hitType, arg_C));
268268
}
269269
#endif

‎Spore ModAPI/Spore/Simulator/cAbductToolStrategy.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Simulator
3030
public:
3131
static const uint32_t STRATEGY_ID = 0xF58C1654;
3232

33-
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
33+
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
3434
virtual bool OnMouseUp(cSpaceToolData* pTool) override;
3535
virtual Vector3 GetAimPoint() override;
3636
};

‎Spore ModAPI/Spore/Simulator/cArtilleryWeaponStrategy.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Simulator
3030
public:
3131
static const uint32_t STRATEGY_ID = 0x8A8B6F35;
3232

33-
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
33+
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
3434
virtual bool WhileFiring(cSpaceToolData* pTool, const Vector3& aimPoint, int) override;
3535
};
3636

‎Spore ModAPI/Spore/Simulator/cCropCirclesToolStrategy.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Simulator
3030
public:
3131
static const uint32_t STRATEGY_ID = 0xC0B1AE6A;
3232

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

3636
namespace Addresses(cCropCirclesToolStrategy)

‎Spore ModAPI/Spore/Simulator/cDefaultAoETool.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace Simulator
3131
static const uint32_t STRATEGY_ID = 0x6CB0B689;
3232

3333
virtual void OnMouseDown(cSpaceToolData* pTool, const Vector3& playerPosition) override;
34-
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
34+
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
3535
virtual bool WhileFiring(cSpaceToolData* pTool, const Vector3& aimPoint, int) override;
3636
virtual bool OnMouseUp(cSpaceToolData* pTool) override;
3737

‎Spore ModAPI/Spore/Simulator/cDefaultBeamTool.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace Simulator
3232
static const uint32_t TYPE = 0x60079DE;
3333

3434
virtual void OnMouseDown(cSpaceToolData* pTool, const Vector3& playerPosition) override;
35-
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
35+
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
3636
virtual bool WhileFiring(cSpaceToolData* pTool, const Vector3& aimPoint, int) override;
3737
virtual bool OnMouseUp(cSpaceToolData* pTool) override;
3838

‎Spore ModAPI/Spore/Simulator/cDefaultProjectileWeapon.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Simulator
3030
public:
3131
static const uint32_t STRATEGY_ID = 0x2FD3EB55;
3232

33-
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
33+
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
3434
virtual bool WhileFiring(cSpaceToolData* pTool, const Vector3& aimPoint, int) override;
3535
};
3636

‎Spore ModAPI/Spore/Simulator/cDragInputProjectileToolStrategy.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace Simulator
3131
static const uint32_t STRATEGY_ID = 0x0EB54070;
3232

3333
virtual void OnMouseDown(cSpaceToolData* pTool, const Vector3& playerPosition) override;
34-
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, cSpaceToolData::SpaceToolHit hitType, int) override;
34+
virtual bool OnHit(cSpaceToolData* pTool, const Vector3& position, SpaceToolHit hitType, int) override;
3535
virtual bool WhileFiring(cSpaceToolData* pTool, const Vector3& aimPoint, int) override;
3636
virtual int ProcessCost(int useCost) override;
3737
};

‎Spore ModAPI/Spore/Simulator/cEnergyRepairToolStrategy.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace Simulator
3131
static const uint32_t STRATEGY_ID = 0x28AE31DE;
3232

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

‎Spore ModAPI/Spore/Simulator/cGenesisDeviceToolStrategy.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Simulator
3030
public:
3131
static const uint32_t STRATEGY_ID = 0x72E076A7;
3232

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

3636
namespace Addresses(cGenesisDeviceToolStrategy)

0 commit comments

Comments
 (0)